From 3d682ee9e4593f8b65f938239b8da23c5da96b27 Mon Sep 17 00:00:00 2001 From: mmichelson Date: Mon, 26 Nov 2007 23:15:53 +0000 Subject: Change all instances of "CALLERID(number)" to "CALLERID(num)" for consistency's sake (closes issue #11381, reported and patched by jon) git-svn-id: http://svn.digium.com/svn/asterisk/trunk@89621 f38db490-d61c-443f-a65b-d21fe96a405b --- pbx/ael/ael-test/ael-test19/extensions.ael | 4 ++-- pbx/ael/ael-test/ael-test3/extensions.ael | 4 ++-- pbx/ael/ael-test/ael-test7/extensions.ael | 30 ++++++++++++++--------------- pbx/ael/ael-test/ael-vtest13/extensions.ael | 4 ++-- pbx/ael/ael-test/ref.ael-vtest13 | 4 ++-- 5 files changed, 23 insertions(+), 23 deletions(-) (limited to 'pbx') diff --git a/pbx/ael/ael-test/ael-test19/extensions.ael b/pbx/ael/ael-test/ael-test19/extensions.ael index 5218c52aa..07af91482 100644 --- a/pbx/ael/ael-test/ael-test19/extensions.ael +++ b/pbx/ael/ael-test/ael-test19/extensions.ael @@ -291,10 +291,10 @@ context extension } 873 => { NOOP(this is a forkcdr test); - Set(CALLERID(number)=1234567890); + Set(CALLERID(num)=1234567890); Set(CALLERID(name)=before fork); Forkcdr(v); - Set(CALLERID(number)=0987654321); + Set(CALLERID(num)=0987654321); Set(CALLERID(name)=after fork); Answer(); Echo(); diff --git a/pbx/ael/ael-test/ael-test3/extensions.ael b/pbx/ael/ael-test/ael-test3/extensions.ael index 14b24ce51..ff1f6aea5 100755 --- a/pbx/ael/ael-test/ael-test3/extensions.ael +++ b/pbx/ael/ael-test/ael-test3/extensions.ael @@ -1958,7 +1958,7 @@ macro std-priv-exten( dev, ext , timeout, opts, torcont, dontcont ) macro fillcidname() { - if( "${CALLERID(number)}" = "" ) // nothing to work with, quit!!! + if( "${CALLERID(num)}" = "" ) // nothing to work with, quit!!! return; Set(cidn=${DB(cidname/${CALLERID(num)})}); if( "${CALLERID(name)}" != "" ) @@ -1966,7 +1966,7 @@ macro fillcidname() if( ("${cidn}" = "Privacy Manager" & "${CALLERID(name)}" != "Privacy Manager") | "${cidn}" = "" ) // if the entry isn't in the database, // or if an entry exists, and it's "Privacy Manager", empty, (or add other useless possibilities). { - Set(DB(cidname/${CALLERID(number)})=${CALLERID(name)}); // then set or override what's in the DB + Set(DB(cidname/${CALLERID(num)})=${CALLERID(name)}); // then set or override what's in the DB } } // Now, we fill in the callerid info from the incoming entry, if it's stuff worth using 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)}" = "") { jump 3@default; } else if("${SIP_HEADER(To)}" = "") { @@ -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)); }; diff --git a/pbx/ael/ael-test/ael-vtest13/extensions.ael b/pbx/ael/ael-test/ael-vtest13/extensions.ael index dd77c0531..b7e953e62 100755 --- a/pbx/ael/ael-test/ael-vtest13/extensions.ael +++ b/pbx/ael/ael-test/ael-vtest13/extensions.ael @@ -1957,7 +1957,7 @@ macro std-priv-exten( dev, ext , timeout, opts, torcont, dontcont ) macro fillcidname() { - if( "${CALLERID(number)}" = "" ) // nothing to work with, quit!!! + if( "${CALLERID(num)}" = "" ) // nothing to work with, quit!!! return; Set(cidn=${DB(cidname/${CALLERID(num)})}); if( "${CALLERID(name)}" != "" ) @@ -1965,7 +1965,7 @@ macro fillcidname() if( ("${cidn}" = "Privacy Manager" & "${CALLERID(name)}" != "Privacy Manager") | "${cidn}" = "" ) // if the entry isn't in the database, // or if an entry exists, and it's "Privacy Manager", empty, (or add other useless possibilities). { - Set(DB(cidname/${CALLERID(number)})=${CALLERID(name)}); // then set or override what's in the DB + Set(DB(cidname/${CALLERID(num)})=${CALLERID(name)}); // then set or override what's in the DB } } // Now, we fill in the callerid info from the incoming entry, if it's stuff worth using diff --git a/pbx/ael/ael-test/ref.ael-vtest13 b/pbx/ael/ael-test/ref.ael-vtest13 index 6d4781f13..989a18258 100644 --- a/pbx/ael/ael-test/ref.ael-vtest13 +++ b/pbx/ael/ael-test/ref.ael-vtest13 @@ -1953,13 +1953,13 @@ exten => sw-76-TORTURE,11,Goto(s\,10) [fillcidname] -exten => s,1,GotoIf($["${CALLERID(number)}" = "" ]?2:3) +exten => s,1,GotoIf($["${CALLERID(num)}" = "" ]?2:3) exten => s,2,Return() exten => s,3,NoOp(Finish if-fillcidname-77) exten => s,4,Set(cidn=${DB(cidname/${CALLERID(num)})}) exten => s,5,GotoIf($["${CALLERID(name)}" != "" ]?6:9) exten => s,6,GotoIf($[("${cidn}" = "Privacy Manager" & "${CALLERID(name)}" != "Privacy Manager") | "${cidn}" = "" ]?7:8) -exten => s,7,Set(DB(cidname/${CALLERID(number)})=${CALLERID(name)}) +exten => s,7,Set(DB(cidname/${CALLERID(num)})=${CALLERID(name)}) exten => s,8,NoOp(Finish if-if-fillcidname-78-79) exten => s,9,NoOp(Finish if-fillcidname-78) exten => s,10,GotoIf($[( "${cidn}" != "" ) & ( "${CALLERID(name)}" = "" | "${CALLERID(name)}" = "CODY\,WY " | "${CALLERID(name)}" = "POWELL\,WY " | "${CALLERID(name)}" = "WIRELESS CALLER" | "${CALLERID(name)}" = "SUBSCRIBER\,WIRE" | "${CALLERID(name)}" = "CELLULAR ONE" | "${CALLERID(name)}" = "Cellular One Customer" | "${CALLERID(name)}" = "CELLULAR ONE " | "${CALLERID(name)}" = "Privacy Manager" | "${CALLERID(name)}" = "RIVERTON\,WY " | "${CALLERID(name)}" = "BASIN\,WY " | "${CALLERID(name)}" = "BILLINGS\,MT " | "${CALLERID(name)}" = "PROVO\,UT " | "${CALLERID(name)}" = "TOLL FREE " ) ]?11:12) -- cgit v1.2.3