Changeset 5200

Timestamp:

11/03/07 13:48:47 (6 years ago)

Author:

p_lindheimer

Message:

#2191 transmit original cidname as well as number on CF, followme and similar

Files:

• modules/branches/2.4/core/etc/extensions.conf (modified) (3 diffs)

modules/branches/2.4/core/etc/extensions.conf

@@ -993 +993 @@
-; If this came through a ringgroup or CF, then we want to retain original CID unless
-; OUTKEEPCID_${trunknum} is set.
+; Save then CIDNAME while it is still intact in case we end up sending out this same CID
-;
-exten => s,n,GotoIf($["${KEEPCID}" != "TRUE"]?normcid) ;Set to TRUE if coming from ringgroups, CF, etc.
@@ -998 +999 @@
-exten => s,n,GotoIf($["foo${REALCALLERIDNUM}" = "foo"]?normcid) ;if not set to anything, go through normal processing
-exten => s,n,Set(USEROUTCID=${REALCALLERIDNUM})
+exten => s,n,Set(REALCALLERIDNAME=${CALLERID(name)})
-
-; We now have to make sure the CID is valid. If we find an AMPUSER with the same CID, we assume it is an internal 
-; call (would be quite a conincidence if not) and go through the normal processing to get that CID. If a device 
-; is set for this CID, then it must be internal 
+; If we end up using USEROUTCID at the end, it may still be the REALCALLERIDNUM we saved above. That is determined
+; if the two are equal, AND there is no CALLERID(name) present since it has been removed by the CALLERID(all)=${USEROUTCID}
+; setting. If this is the case, then we put the orignal name back in to send out. Although the CNAME is not honored by most
+; carriers, there are cases where it is so this preserves that information to be used by those carriers who do honor it.
-; 
-exten => s,n,GotoIf($["foo${DB(AMPUSER/${REALCALLERIDNUM}/device)}" = "foo"]?bypass:normcid) 
@@ -1016 +1022 @@
-exten => s,n(usercid),GotoIf($["${USEROUTCID:1:2}" = ""]?report) ; check CID override for extension
-exten => s,n,Set(CALLERID(all)=${USEROUTCID})
-report
+checkname
-exten => s,n(hidecid),SetCallerPres(prohib_passed_screen) ; Only works with ISDN (T1/E1/BRI)
+exten => s,n(checkname),ExecIf($[ $[ "${CALLERID(number)}" = "${REALCALLERIDNUM}" ] & $[ "${CALLERID(name)}" = "" ] ],Set,CALLERID(name)=${REALCALLERIDNAME})
-exten => s,n(report),NoOp(CallerID set to ${CALLERID(all)})
-