Changeset 7687

Timestamp:

05/07/09 19:08:12 (4 years ago)

Author:

p_lindheimer

Message:

fixes #3664 reset CWIGNORE before going to destination, also CFIGNORE reset to from-internal in ringgroups and this fix is also being applied to ringgroups

Files:

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

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

@@ -341 +341 @@
-          //
-          $ext->add('ext-queues', $exten, '', new ext_setvar('__NODEST', ''));
+          if ($q['cwignore']) {
+            $ext->add('ext-queues', $exten, '', new ext_setvar('__CWIGNORE', '')); 
+          }
-  
-          // destination field in 'incoming' database is backwards from what ext_goto expects

modules/branches/2.5/queues/module.xml

@@ -2 +2 @@
-  <rawname>queues</rawname>
-  <name>Queues</name>
-7
+8
-  <type>setup</type>
-  <category>Inbound Call Control</category>
@@ -9 +9 @@
-  </description>
-  <changelog>
+    *2.5.4.8* #3664
-    *2.5.4.7* #3618, localization udpates
-    *2.5.4.6* localization updates

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

@@ -173 +173 @@
-          //
-          $ext->add($contextname, $grpnum, '', new ext_gotoif('$["foo${RRNODEST}" != "foo"]', 'nodest'));
+          if ($cwignore != '') {
+            $ext->add($contextname, $grpnum, '', new ext_setvar('__CWIGNORE', ''));
+          }
+          // TODO: Asterisk uses a blank FORWARD_CONTEXT as a literal at the time of this change. A better solution would be
+          //       if it would ignore blank, since it is possible in a customcontext setup you would not want this set to
+          //       from-internal
+          //
+          if ($cfignore != '') {
+            $ext->add($contextname, $grpnum, '', new ext_setvar('_CFIGNORE', ''));
+            $ext->add($contextname, $grpnum, '', new ext_setvar('_FORWARD_CONTEXT', 'from-internal'));
+          }
-          $ext->add($contextname, $grpnum, '', new ext_setvar('__NODEST', ''));
-

modules/branches/2.5/ringgroups/module.xml

@@ -2 +2 @@
-  <rawname>ringgroups</rawname>
-  <name>Ring Groups</name>
-8
+9
-  <type>setup</type>
-  <category>Inbound Call Control</category>
@@ -9 +9 @@
-  </description>
-  <changelog>
+    *2.5.1.9* #3664
-    *2.5.1.8* #3580, localization updates
-    *2.5.1.7* #3380, localization updates