Changeset 11823 for modules/branches/2.9

Timestamp:

03/16/11 20:28:31 (2 years ago)

Author:

p_lindheimer

Message:

closes #4977 use new macro to prepend cid and allow it to be configured

Files:

• modules/branches/2.9/core/functions.inc.php (modified) (3 diffs)
• modules/branches/2.9/findmefollow/functions.inc.php (modified) (1 diff)
• modules/branches/2.9/queues/functions.inc.php (modified) (1 diff)
• modules/branches/2.9/ringgroups/functions.inc.php (modified) (1 diff)

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

@@ -1239 +1239 @@
-            $ext->add($context, $exten, '', new ext_setvar("__ALERT_INFO", str_replace(';', '\;', $item['alertinfo'])));
-          }
-          // Add CID prefix, no need to do checks for existing pre-pends, this is an incoming did so this should
-          // be the first time the CID is manipulated. We set _RGPREFIX which is the same used throughout the different
-          // modules.
-          //
-          // TODO: If/When RGPREFIX is added to trunks, then see code in ringgroups to strip prefix if added here.
-          //
-          // TODO: core FreePBX documentation about this standard. (and probably rename from RGPREFIX to CIDPREFIX)
-          //
-          if (!empty($item['grppre'])) {
-
-
+
-          }
-          
@@ -1779 +1770 @@
-        $ext->add($context, $exten, '', new ext_macroexit());
-      }
+
+      /* macro-prepend-cid */
+      // prepend a cid and if set to replace previous prepends, do so, otherwise stack them
+      //
+      $mcontext = 'macro-prepend-cid';
+      $exten = 's';
+
+      if ($amp_conf['CID_PREPEND_REPLACE']) {
+        $ext->add($mcontext, $exten, '', new ext_gotoif('$["${RGPREFIX}" = ""]', 'REPCID'));
+        $ext->add($mcontext, $exten, '', new ext_gotoif('$["${RGPREFIX}" != "${CALLERID(name):0:${LEN(${RGPREFIX})}}"]', 'REPCID'));
+        $ext->add($mcontext, $exten, '', new ext_noop_trace('Current RGPREFIX is ${RGPREFIX}....stripping from Caller ID'));
+        $ext->add($mcontext, $exten, '', new ext_set('CALLERID(name)', '${CALLERID(name):${LEN(${RGPREFIX})}}'));
+        $ext->add($mcontext, $exten, '', new ext_set('_RGPREFIX', ''));
+      }
+      $ext->add($mcontext, $exten, 'REPCID', new ext_set('_RGPREFIX', '${ARG1}'));
+      $ext->add($mcontext, $exten, '', new ext_set('CALLERID(name)','${RGPREFIX}${CALLERID(name)}'));
+
+
-
-      /* outbound routes */
@@ -3204 +3213 @@
-      $ext->add($mcontext,$exten,'', new ext_set("__EXTTOCALL", '${ARG2}'));
-      $ext->add($mcontext,$exten,'', new ext_set("__PICKUPMARK", '${ARG2}'));
-
+ | ${ARG3} | ${ARG4} | ${ARG5}
-      $ext->add($mcontext,$exten,'checkrecord', new ext_macro('record-enable','${EXTTOCALL},IN'));
-

modules/branches/2.9/findmefollow/functions.inc.php

@@ -123 +123 @@
-
-          // deal with group CID prefix
-          // but strip only if you plan on setting a new one
-          if ($grppre != '') {
-
-
-
-
-
-
-
-
+
-          }
-          // recording stuff

modules/branches/2.9/queues/functions.inc.php

@@ -393 +393 @@
-
-          // deal with group CID prefix
-          // Use the same variable as ringgroups/followme so that we can manage chaines of calls
-          // but strip only if you plan on setting a new one
-          //
-          if ($grppre != '') {
-
-
-
-
-
-
-
-
+
-          }
-

modules/branches/2.9/ringgroups/functions.inc.php

@@ -119 +119 @@
-          
-          // deal with group CID prefix
-          // but strip only if you plan on setting a new one
-          if ($grppre != '') {
-
-
-
-
-
-
-
-
+
-          }
-