Skip to content

Fix for issue 1041 Call Waiting Tone Missing #191

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
julien-celya wants to merge 1 commit into
base: release/17.0
Choose a base branch
from
Open

Fix for issue 1041 Call Waiting Tone Missing #191

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Dialplan/macroDial.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ static function add($ext){
// Mixed ringall: one Dial() shares headers; B-legs need per-leg P/S adjustment (inherits to all legs).
$ext->add($c,$s,'', new \ext_execif('$["${IS_PPHONE_ANY}"="1"]', 'Set', '__RG_SHARED_RVOL=1'));
$ext->add($c,$s,'', new \ext_macro('dial-ringall-predial-hook'));
$ext->add($c,$s,'', new \ext_execif('$["${DB(AMPUSER/${EXTTOCALL}/cwtone)}" = "enabled" & "${EXTENSION_STATE(${EXTTOCALL})}" = "INUSE"]', 'Set','CWRING=r(callwaiting)','Set','CWRING='));
$ext->add($c,$s,'', new \ext_execif('$["${DB(AMPUSER/${EXTTOCALL}/cwtone)}" = "enabled" & "${EXTENSION_STATE(${EXTTOCALL})}" =~ "^(RING|HOLD)?INUSE$" ]', 'Set','CWRING=r(callwaiting)','Set','CWRING='));
// Ring groups and follow-me use macro-dial instead of macro-exten-vm, so sub-record-check was
// never run per extension when inbound/ring-group recording was dontcare. Apply extension
// recording policy before Dial(); use the first member for ringall (one Dial() to all).
Expand Down Expand Up @@ -119,7 +119,7 @@ static function add($ext){
$ext->add($c,$s,'', new \ext_gosub('1','s','sub-check-pseries','${EXTTOCALL}'));
$ext->add($c,$s,'', new \ext_gosub('1','s','sub-set-rvol-headers','single'));
$ext->add($c,$s,'', new \ext_macro('dial-hunt-predial-hook'));
$ext->add($c,$s,'', new \ext_execif('$["${DB(AMPUSER/${EXTTOCALL}/cwtone)}" = "enabled" & "${EXTENSION_STATE(${EXTTOCALL})}" = "INUSE"]', 'Set','CWRING=r(callwaiting)','Set','CWRING='));
$ext->add($c,$s,'', new \ext_execif('$["${DB(AMPUSER/${EXTTOCALL}/cwtone)}" = "enabled" & "${EXTENSION_STATE(${EXTTOCALL})}" =~ "^(RING|HOLD)?INUSE$" ]', 'Set','CWRING=r(callwaiting)','Set','CWRING='));
$ext->add($c,$s,'', new \ext_gosub(1,'s','sub-record-check','exten,${EXTTOCALL},dontcare'));
/*********************************************************/
$ext->add($c,$s,'', new \ext_execif('$["${FMFM}" = "TRUE"]','Set','RGFMDIAL=${EXTTOCALL}','Set','RGFMDIAL=${NODEST}'));
Expand Down
2 changes: 1 addition & 1 deletion Dialplan/macroDialone.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ static function add($ext){

//dont allow inbound callers to transfer around inside the system
$ext->add($mcontext,$exten,'', new \ext_execif('$["${DIRECTION}" = "INBOUND"]', 'Set', 'D_OPTIONS=${STRREPLACE(D_OPTIONS,T)}I'));
$ext->add($mcontext,$exten,'', new \ext_execif('$["${DB(AMPUSER/${DEXTEN}/cwtone)}" = "enabled" & "${EXTENSION_STATE(${DEXTEN}@ext-local)}" = "INUSE"]', 'Set','CWRING=r(callwaiting)','Set','CWRING='));
$ext->add($mcontext,$exten,'', new \ext_execif('$["${DB(AMPUSER/${DEXTEN}/cwtone)}" = "enabled" & "${EXTENSION_STATE(${DEXTEN}@ext-local)}" =~ "^(RING|HOLD)?INUSE$" ]', 'Set','CWRING=r(callwaiting)','Set','CWRING='));
$ext->add($mcontext,$exten,'dialapp', new \ext_noop(''));
$ext->add($mcontext,$exten,'', new \ext_execif('$["${FROMQ}" = "true"]', 'Set', 'D_OPTIONS=${STRREPLACE(D_OPTIONS,T)}'));
/* dail using different context */
Expand Down