Changeset 4094

Timestamp:

06/20/07 15:24:09 (1 year ago)

Author:

p_lindheimer

Message:

Merged revisions 4089,4092 via svnmerge from
https://amportal.svn.sourceforge.net/svnroot/amportal/modules/branches/2.2

........

r4089 | p_lindheimer | 2007-06-20 15:00:11 -0700 (Wed, 20 Jun 2007) | 1 line

fixed case where chained use of CID prefix was resulting in valid portions of CID being chopped off

........

r4092 | p_lindheimer | 2007-06-20 15:17:44 -0700 (Wed, 20 Jun 2007) | 1 line

Changed chained CID prefixes to be handled the same as ringgroup and followme, also fixed #1965

........

Files:

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

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

@@ -89 +89 @@
-                                        // deal with group CID prefix
-                                        $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, 'REPCID', new ext_noop('CALLERID(name) is ${CALLERID(name)}'));
-                                        if ($grppre != '') {
-
+_
-                                                $ext->add($contextname, $grpnum, '', new ext_setvar('CALLERID(name)','${RGPREFIX}${CALLERID(name)}'));
-                                        }

modules/branches/2.3/findmefollow/module.xml

@@ -2 +2 @@
-        <rawname>findmefollow</rawname>
-        <name>Follow Me</name>
-1.1
+2
-        <changelog>
+                *2.4.12* Fixed bug where nested CID prefixes ends up removing part of the valid CID info
-                *2.4.11.1* Fixed ALERT_INFO bug, if previously set it should not set - it was clearing it
-                *2.4.11* added option to have follow-me always be used in place of extension, or only when explicitly used as a destination, useful in conjunction with VmX

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

@@ -34 +34 @@
-                                        $exten = $item[0];
-                                        $q = queues_get($exten);
+
+                                        $grppre = (isset($q['prefix'])?$q['prefix']:'');
-                                        
+                                        $ext->add('ext-queues', $exten, '', new ext_macro('user-callerid'));
-                                        $ext->add('ext-queues', $exten, '', new ext_answer(''));
-
@@ -49 +52 @@
-                                        $ext->add('ext-queues', $exten, '', new ext_setvar('__NODEST', '${EXTEN}'));
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                                        $ext->add('ext-queues', $exten, '', new ext_setvar('MONITOR_FILENAME','/var/spool/asterisk/monitor/q${EXTEN}-${STRFTIME(${EPOCH},,%Y%m%d-%H%M%S)}-${UNIQUEID}'));
-                                        $joinannounce = (isset($q['joinannounce'])?$q['joinannounce']:'');

modules/branches/2.3/queues/module.xml

@@ -2 +2 @@
-        <rawname>queues</rawname>
-        <name>Queues</name>
-9
+10
-        <type>setup</type>
-        <category>Inbound Call Control</category>
@@ -9 +9 @@
-        </description>
-        <changelog>
+                *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
-                *2.2.8.1* Updated tootip to warn about agents.conf (unsupported and know issues) and warn about penalties (broken in asterisk)

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

@@ -80 +80 @@
-                                        // deal with group CID prefix
-                                        $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, 'REPCID', new ext_noop('CALLERID(name) is ${CALLERID(name)}'));
-                                        if ($grppre != '') {
-
+_
-                                                $ext->add($contextname, $grpnum, '', new ext_setvar('CALLERID(name)','${RGPREFIX}${CALLERID(name)}'));
-                                        }

modules/branches/2.3/ringgroups/module.xml

@@ -2 +2 @@
-        <rawname>ringgroups</rawname>
-        <name>Ring Groups</name>
-3
+4
-        <type>setup</type>
-        <category>Inbound Call Control</category>
@@ -9 +9 @@
-        </description>
-        <changelog>
+                *2.2.14* Fixed bug where nested CID prefixes ends up removing part of the valid CID info
-                *2.2.13* introduction of firstavailable firstnotonphone strategy that only rings one extension and optionally skips callwaiting REQUIRE CORE r3652
-                *2.2.12* never allow group to include itself as nnn# and create infinite loop