Changeset 4316

Timestamp:

07/07/07 11:18:24 (6 years ago)

Author:

p_lindheimer

Message:

Merged revisions 4312 via svnmerge from
https://amportal.svn.sourceforge.net/svnroot/amportal/modules/branches/2.3

........

r4312 | p_lindheimer | 2007-07-07 08:11:18 -0700 (Sat, 07 Jul 2007) | 1 line

#2057 don't strip CID prefix if no prefix is being added

........

Files:

• modules/branches/2.2 (modified) (1 prop)
• modules/branches/2.2/findmefollow/functions.inc.php (modified) (1 diff)
• modules/branches/2.2/findmefollow/module.xml (modified) (1 diff)
• modules/branches/2.2/queues/functions.inc.php (modified) (1 diff)
• modules/branches/2.2/queues/module.xml (modified) (2 diffs)
• modules/branches/2.2/ringgroups/functions.inc.php (modified) (1 diff)
• modules/branches/2.2/ringgroups/module.xml (modified) (2 diffs)

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

@@ -78 +78 @@
-
-          // deal with group CID prefix
-
-
-
-
-
-
+
-          if ($grppre != '') {
+            $ext->add($contextname, $grpnum, '', new ext_gotoif('$["foo${RGPREFIX}" = "foo"]', 'REPCID'));
+            $ext->add($contextname, $grpnum, '', new ext_gotoif('$["${RGPREFIX}" != "${CALLERID(name):0:${LEN(${RGPREFIX})}}"]', 'REPCID'));
+            $ext->add($contextname, $grpnum, '', new ext_noop('Current RGPREFIX is ${RGPREFIX}....stripping from Caller ID'));
+            $ext->add($contextname, $grpnum, '', new ext_setvar('CALLERID(name)', '${CALLERID(name):${LEN(${RGPREFIX})}}'));
+            $ext->add($contextname, $grpnum, '', new ext_setvar('_RGPREFIX', ''));
+            $ext->add($contextname, $grpnum, 'REPCID', new ext_noop('CALLERID(name) is ${CALLERID(name)}'));
-            $ext->add($contextname, $grpnum, '', new ext_setvar('_RGPREFIX', $grppre));
-            $ext->add($contextname, $grpnum, '', new ext_setvar('CALLERID(name)','${RGPREFIX}${CALLERID(name)}'));

modules/branches/2.2/findmefollow/module.xml

@@ -2 +2 @@
-  <rawname>findmefollow</rawname>
-  <name>Follow Me</name>
-1
+2
-  <changelog>
+    *2.4.10.2* #2057 don't strip CID prefix if no prefix is being added
-    *2.4.10.1* #2002 IF() statement can't handle : in the string and can't escape them anyhow
-    *2.4.10* Fixed bug where nested CID prefixes ends up removing part of the valid CID info

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

@@ -54 +54 @@
-          // 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
-          //
-          $ext->add('ext-queues', $exten, '', new ext_gotoif('$["foo${RGPREFIX}" = "foo"]', 'REPCID'));
-          $ext->add('ext-queues', $exten, '', new ext_gotoif('$["${RGPREFIX}" != "${CALLERID(name):0:${LEN(${RGPREFIX})}}"]', 'REPCID'));
-          $ext->add('ext-queues', $exten, '', new ext_noop('Current RGPREFIX is ${RGPREFIX}....stripping from Caller ID'));
-          $ext->add('ext-queues', $exten, '', new ext_setvar('CALLERID(name)', '${CALLERID(name):${LEN(${RGPREFIX})}}'));
-          $ext->add('ext-queues', $exten, '', new ext_setvar('_RGPREFIX', ''));
-          $ext->add('ext-queues', $exten, 'REPCID', new ext_noop('CALLERID(name) is ${CALLERID(name)}'));
-          if ($grppre != '') {
+            $ext->add('ext-queues', $exten, '', new ext_gotoif('$["foo${RGPREFIX}" = "foo"]', 'REPCID'));
+            $ext->add('ext-queues', $exten, '', new ext_gotoif('$["${RGPREFIX}" != "${CALLERID(name):0:${LEN(${RGPREFIX})}}"]', 'REPCID'));
+            $ext->add('ext-queues', $exten, '', new ext_noop('Current RGPREFIX is ${RGPREFIX}....stripping from Caller ID'));
+            $ext->add('ext-queues', $exten, '', new ext_setvar('CALLERID(name)', '${CALLERID(name):${LEN(${RGPREFIX})}}'));
+            $ext->add('ext-queues', $exten, '', new ext_setvar('_RGPREFIX', ''));
+            $ext->add('ext-queues', $exten, 'REPCID', new ext_noop('CALLERID(name) is ${CALLERID(name)}'));
-            $ext->add('ext-queues', $exten, '', new ext_setvar('_RGPREFIX', $grppre));
-            $ext->add('ext-queues', $exten, '', new ext_setvar('CALLERID(name)','${RGPREFIX}${CALLERID(name)}'));

modules/branches/2.2/queues/module.xml

@@ -2 +2 @@
-  <rawname>queues</rawname>
-  <name>Queues</name>
-
+.2
-  <type>setup</type>
-  <category>Inbound Call Control</category>
@@ -9 +9 @@
-  </description>
-  <changelog>
+    *2.2.10.2* #2057 don't strip CID prefix if no prefix is being added
-    *2.2.10* Changed chained CID prefixes to be handled the same as ringgroup and followme, also fixed #1965
-    *2.2.9* Replaced deprecated CALLERIDNAME and TIMSTAMP variables with the current and future supported versions

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

@@ -79 +79 @@
-          
-          // deal with group CID prefix
-
-
-
-
-
-
+
-          if ($grppre != '') {
+            $ext->add($contextname, $grpnum, '', new ext_gotoif('$["foo${RGPREFIX}" = "foo"]', 'REPCID'));
+            $ext->add($contextname, $grpnum, '', new ext_gotoif('$["${RGPREFIX}" != "${CALLERID(name):0:${LEN(${RGPREFIX})}}"]', 'REPCID'));
+            $ext->add($contextname, $grpnum, '', new ext_noop('Current RGPREFIX is ${RGPREFIX}....stripping from Caller ID'));
+            $ext->add($contextname, $grpnum, '', new ext_setvar('CALLERID(name)', '${CALLERID(name):${LEN(${RGPREFIX})}}'));
+            $ext->add($contextname, $grpnum, '', new ext_setvar('_RGPREFIX', ''));
+            $ext->add($contextname, $grpnum, 'REPCID', new ext_noop('CALLERID(name) is ${CALLERID(name)}'));
-            $ext->add($contextname, $grpnum, '', new ext_setvar('_RGPREFIX', $grppre));
-            $ext->add($contextname, $grpnum, '', new ext_setvar('CALLERID(name)','${RGPREFIX}${CALLERID(name)}'));

modules/branches/2.2/ringgroups/module.xml

@@ -2 +2 @@
-  <rawname>ringgroups</rawname>
-  <name>Ring Groups</name>
-
+.1
-  <type>setup</type>
-  <category>Inbound Call Control</category>
@@ -9 +9 @@
-  </description>
-  <changelog>
+    *2.2.15.1* #2057 don't strip CID prefix if no prefix is being added
-    *2.2.15* #2024 provide alert when adding duplicate group number
-    *2.2.14* Fixed bug where nested CID prefixes ends up removing part of the valid CID info