Skip to content

Commit e603339

Browse files
committed
FREEPBX17-29- changes be reverted and ignore the warnings
1 parent aa15827 commit e603339

File tree

2 files changed

+19
-19
lines changed

2 files changed

+19
-19
lines changed

etc/extensions.conf

+7-7
Original file line numberDiff line numberDiff line change
@@ -124,13 +124,13 @@ exten => s,1,Goto(from-pstn,${EXTEN},1)
124124
; So the DID must be extracted between the sip: and the @, which this does
125125
;
126126
[from-pstn-toheader]
127-
exten => _X.,1,NoOp(Attempting to extract DID from SIP To header)
128-
exten => _X.,n,gotoif($["${CHANNEL(channeltype)}"="SIP"]?SIP)
129-
exten => _X.,n,gotoif($["${CHANNEL(channeltype)}"="PJSIP"]?PJSIP)
130-
exten => _X.,n,NoOp(Unable to determine SIP channel type)
131-
exten => _X.,n,goto(from-pstn,${EXTEN},1))
132-
exten => _X.,n(SIP),Goto(from-pstn,${CUT(CUT(SIP_HEADER(To),@,1),:,2)},1)
133-
exten => _X.,n(PJSIP),Goto(from-pstn,${CUT(CUT(PJSIP_HEADER(read,To),@,1),:,2)},1)
127+
exten => _.,1,NoOp(Attempting to extract DID from SIP To header)
128+
exten => _.,n,gotoif($["${CHANNEL(channeltype)}"="SIP"]?SIP)
129+
exten => _.,n,gotoif($["${CHANNEL(channeltype)}"="PJSIP"]?PJSIP)
130+
exten => _.,n,NoOp(Unable to determine SIP channel type)
131+
exten => _.,n,goto(from-pstn,${EXTEN},1))
132+
exten => _.,n(SIP),Goto(from-pstn,${CUT(CUT(SIP_HEADER(To),@,1),:,2)},1)
133+
exten => _.,n(PJSIP),Goto(from-pstn,${CUT(CUT(PJSIP_HEADER(read,To),@,1),:,2)},1)
134134
;-------------------------------------------------------------------------------
135135

136136
;-------------------------------------------------------------------------------

functions.inc.php

+12-12
Original file line numberDiff line numberDiff line change
@@ -1511,7 +1511,7 @@ function core_do_get_config($engine) {
15111511
//
15121512
$cidroute = false;
15131513
if ($cidnum != '' && $exten == '') {
1514-
$exten = '_X.';
1514+
$exten = '_.';
15151515
$pricid = ($item['pricid']) ? true:false;
15161516
$cidroute = true;
15171517
} else if (($cidnum != '' && $exten != '') || ($cidnum == '' && $exten == '')) {
@@ -1634,9 +1634,9 @@ function core_do_get_config($engine) {
16341634
$ext->add($catchall_context, 's', '', new ext_playback('ss-noservice'));
16351635
$ext->add($catchall_context, 's', '', new ext_sayalpha('${FROM_DID}'));
16361636
$ext->add($catchall_context, 's', '', new ext_hangup(''));
1637-
$ext->add($catchall_context, '_X.', '', new ext_setvar('__FROM_DID', '${EXTEN}'));
1638-
$ext->add($catchall_context, '_X.', '', new ext_noop('Received an unknown call with DID set to ${EXTEN}'));
1639-
$ext->add($catchall_context, '_X.', '', new ext_goto('a2','s'));
1637+
$ext->add($catchall_context, '_.', '', new ext_setvar('__FROM_DID', '${EXTEN}'));
1638+
$ext->add($catchall_context, '_.', '', new ext_noop('Received an unknown call with DID set to ${EXTEN}'));
1639+
$ext->add($catchall_context, '_.', '', new ext_goto('a2','s'));
16401640
$ext->add($catchall_context, 'h', '', new ext_hangup(''));
16411641
}
16421642

@@ -1768,10 +1768,10 @@ function core_do_get_config($engine) {
17681768
// works.
17691769
//
17701770
$ivr_context = 'from-did-direct-ivr';
1771-
$ext->add($ivr_context, '_X.','', new ext_gotoif('$[${DIALPLAN_EXISTS(from-did-direct,${EXTEN},1)} = 0]','i,1'));
1772-
$ext->add($ivr_context, '_X.','', new ext_macro('blkvm-clr'));
1773-
$ext->add($ivr_context, '_X.','', new ext_setvar('__NODEST', ''));
1774-
$ext->add($ivr_context, '_X.','', new ext_goto('1','${EXTEN}','from-did-direct'));
1771+
$ext->add($ivr_context, '_.','', new ext_gotoif('$[${DIALPLAN_EXISTS(from-did-direct,${EXTEN},1)} = 0]','i,1'));
1772+
$ext->add($ivr_context, '_.','', new ext_macro('blkvm-clr'));
1773+
$ext->add($ivr_context, '_.','', new ext_setvar('__NODEST', ''));
1774+
$ext->add($ivr_context, '_.','', new ext_goto('1','${EXTEN}','from-did-direct'));
17751775

17761776
$ext->add('ext-local', 'vmret', '', new ext_gotoif('$["${IVR_RETVM}" = "RETURN" & "${IVR_CONTEXT}" != ""]','playret'));
17771777
$ext->add('ext-local', 'vmret', '', new ext_hangup(''));
@@ -1811,8 +1811,8 @@ function core_do_get_config($engine) {
18111811
$ext->add($macro_name, 's', '', new ext_goto('1','${ARG1}'));
18121812

18131813
$trunkcontext = "from-trunk-".$trunkprops['tech']."-".$trunkprops['channelid'];
1814-
$ext->add($trunkcontext, '_X.', '', new ext_set('GROUP()',$trunkgroup));
1815-
$ext->add($trunkcontext, '_X.', '', new ext_goto('1','${EXTEN}','from-trunk'));
1814+
$ext->add($trunkcontext, '_.', '', new ext_set('GROUP()',$trunkgroup));
1815+
$ext->add($trunkcontext, '_.', '', new ext_goto('1','${EXTEN}','from-trunk'));
18161816

18171817
$ext->add($tcontext,$trunkprops['trunkid'],'',new ext_set('OUTBOUND_GROUP', $trunkgroup));
18181818
$ext->add($tcontext,$trunkprops['trunkid'],'',new ext_gotoif('$["${OUTMAXCHANS_'.$trunkprops['trunkid'].'}" = ""]', 'nomax'));
@@ -1850,8 +1850,8 @@ function core_do_get_config($engine) {
18501850
case 'iax2':
18511851
case 'sip':
18521852
$trunkcontext = "from-trunk-".$trunkprops['tech']."-".$trunkprops['channelid'];
1853-
$ext->add($trunkcontext, '_X.', '', new ext_set('GROUP()',$trunkgroup));
1854-
$ext->add($trunkcontext, '_X.', '', new ext_goto('1','${EXTEN}','from-trunk'));
1853+
$ext->add($trunkcontext, '_.', '', new ext_set('GROUP()',$trunkgroup));
1854+
$ext->add($trunkcontext, '_.', '', new ext_goto('1','${EXTEN}','from-trunk'));
18551855
// fall-through
18561856
case 'zap':
18571857
case 'dahdi':

0 commit comments

Comments
 (0)