diff options
author | Mark Michelson <mmichelson@digium.com> | 2007-11-26 23:15:53 +0000 |
---|---|---|
committer | Mark Michelson <mmichelson@digium.com> | 2007-11-26 23:15:53 +0000 |
commit | 180c3fb60e5681bb5e676bd13d15222dd878997a (patch) | |
tree | c377ea63ba01f411187aea74d3dda80b7378e119 /pbx/ael/ael-test/ael-test7 | |
parent | 5f3a28e5881ec6595d3aa119a523aa3d6bd26470 (diff) |
Change all instances of "CALLERID(number)" to "CALLERID(num)" for
consistency's sake
(closes issue #11381, reported and patched by jon)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@89621 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'pbx/ael/ael-test/ael-test7')
-rw-r--r-- | pbx/ael/ael-test/ael-test7/extensions.ael | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/pbx/ael/ael-test/ael-test7/extensions.ael b/pbx/ael/ael-test/ael-test7/extensions.ael index 52f9a077a..27ed374f5 100644 --- a/pbx/ael/ael-test/ael-test7/extensions.ael +++ b/pbx/ael/ael-test/ael-test7/extensions.ael @@ -89,10 +89,10 @@ macro checkanddial(prov,proto,ext,arg1,arg2,arg3,arg4) { }; macro trunkdial(ext) { // Dial sunrocket and set correct collerid - if("${CALLERID(number)}" = "1") { - Set(CALLERID(number)=7322271653); + if("${CALLERID(num)}" = "1") { + Set(CALLERID(num)=7322271653); } else { - Set(CALLERID(number)=7326260100); + Set(CALLERID(num)=7326260100); }; Set(CALLERID(name)=Sergey Okhapkin); &checkanddial(${TRUNK},${TRUNCPROTO},${ext},60,T); @@ -174,7 +174,7 @@ repeat: goto s|start; }; 101 => { // Voicemail - VoicemailMain(${CALLERID(number)}); + VoicemailMain(${CALLERID(num)}); Hangup; }; 102 => MusicOnHold(); @@ -189,7 +189,7 @@ repeat: 7312 => { ForkCDR; Set(CALLERID(name)=Sergey Okhapkin); - Set(CALLERID(number)=7326260100); + Set(CALLERID(num)=7326260100); DISA(1111|home); }; }; @@ -267,17 +267,17 @@ context outbound { }; _014. => { //TARIO by SIP ID Set(CALLERID(name)=Sergey Okhapkin); - Set(CALLERID(number)=1400898); + Set(CALLERID(num)=1400898); Dial(${TARIOPROTO}/${EXTEN:3}@${TARIO},60,T); }; _0157. => { //TARIO outbound Russia Set(CALLERID(name)=Sergey Okhapkin); - Set(CALLERID(number)=1400898); + Set(CALLERID(num)=1400898); Dial(${TARIOPROTO}/8${EXTEN:4}@${TARIO},60,T); }; // _015. => { //TARIO outbound international // CALLERID(name)="Sergey Okhapkin"; -// CALLERID(number)=1400898; +// CALLERID(num)=1400898; // Dial(${TARIOPROTO}/810${EXTEN:3}@${TARIO},60,T); // }; _0161NXXNXXXXXX => { //Callpacket outbound USA/Canada @@ -305,8 +305,8 @@ context sunrocket-in { 7322271653 => jump s; 7326260100 => jump 2@default; s => { - if("${CALLERID(number)}" = "sunrocketcom") - Set(CALLERID(number)=); + if("${CALLERID(num)}" = "sunrocketcom") + Set(CALLERID(num)=); switch(${CALLERID(RDNIS)}) { case 7326260100: jump 2@default; @@ -323,8 +323,8 @@ context sunrocket-in { context pstn-in { 3 => { - if ("${CALLERID(number)}" = "7322271677") - Set(CALLERID(number)=); + if ("${CALLERID(num)}" = "7322271677") + Set(CALLERID(num)=); jump 3@default; }; }; @@ -332,8 +332,8 @@ context pstn-in { context tario.net-in { _X. => { Set(CALLERID(name)=); - if("${CALLERID(number):-11:1}" = "8") - Set(CALLERID(number)=7${CALLERID(number):1}); + if("${CALLERID(num):-11:1}" = "8") + Set(CALLERID(num)=7${CALLERID(num):1}); if("${SIP_HEADER(To)}" = "<sip:2271677@sipnet.ru>") { jump 3@default; } else if("${SIP_HEADER(To)}" = "<sip:2271653@sipnet.ru>") { @@ -370,7 +370,7 @@ context fromfwdOUT-isgood { _17322271677 => jump 3@default; _1NXXNXXXXXX => { Set(CALLERID(name)=Sergey Okhapkin); -// Set(CALLERID(number)=7326260100); +// Set(CALLERID(num)=7326260100); // Dial(${TRUNCPROTO}/*67${EXTEN:${TRUNKMSD}}@${TRUNK},60,,L(1800000:60000)); Dial(${CPPROTO}/${EXTEN}@${CPACKET2},60,,L(1800000:60000)); }; |