Changeset 6540

Timestamp:

09/02/08 21:42:41 (3 months ago)

Author:

p_lindheimer

Message:

some tweaks to streamline macro-outbound-callerid and macro-dialout-trunk

Files:

• modules/branches/2.5/core/functions.inc.php (modified) (4 diffs)

modules/branches/2.5/core/functions.inc.php

@@ -1409 +1409 @@
-                        // Back to normal processing, whether intracompany or not.
-                        // But add the macro-setmusic if we don't want music on this outbound call
-
-
+
-                
-                        // This macro call will always be blank and is provided as a hook for customization required prior to making a call
@@ -1487 +1486 @@
-                        // Back to normal processing, whether intracompany or not.
-                        // But add the macro-setmusic if we don't want music on this outbound call
-
-
+
-                
-                        // This macro call will always be blank and is provided as a hook for customization required prior to making a call
@@ -1631 +1629 @@
-
-                        // Keep the original CallerID number, for failover to the next trunk.
-
-
-
-
+
+
-                        // 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
-
-
-
+
-                        $ext->add($context, $exten, '', new ext_set('USEROUTCID', '${REALCALLERIDNUM}'));
-                        //$ext->add($context, $exten, '', new ext_set('REALCALLERIDNAME', '${CALLERID(name)}'));
@@ -1651 +1645 @@
-                        // 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.
-, 'normcid'
+
-
-                        $ext->add($context, $exten, 'normcid', new ext_set('USEROUTCID', '${DB(AMPUSER/${REALCALLERIDNUM}/outboundcid)}'));
-                        $ext->add($context, $exten, 'bypass', new ext_set('EMERGENCYCID', '${DB(DEVICE/${REALCALLERIDNUM}/emergency_cid)}'));
-                        $ext->add($context, $exten, '', new ext_set('TRUNKOUTCID', '${OUTCID_${ARG1}}'));
-
-
+
-                        $ext->add($context, $exten, '', new ext_set('CALLERID(all)', '${EMERGENCYCID}'));  // emergency cid for device
-
-
-
-
+
+
+
+
+
+
-                        $ext->add($context, $exten, '', new ext_set('CALLERID(all)', '${USEROUTCID}'));
-                        //$ext->add($context, $exten, '', new ext_gotoif('$["x${CALLERID(name)}"!="xhidden"]', 'checkname', 'hidecid'));  // check CID blocking for extension
-
-
+
+
+
+
+
-                        //$ext->add($context, $exten, 'checkname', new ext_execif('$[ $[ "${CALLERID(number)}" = "${REALCALLERIDNUM}" ] & $[ "${CALLERID(name)}" = "" ] ]', 'Set', 'CALLERID(name)=${REALCALLERIDNAME}'));
-                        $ext->add($context, $exten, 'report', new ext_noop('CallerID set to ${CALLERID(all)}'));                        
-
-