Changeset 3168

Timestamp:

11/22/06 22:04:17 (7 years ago)

Author:

p_lindheimer

Message:

add NODEST to queues, ringgroups and findmefollow, this allows ringgroups and queues to tell its children not to go to voicemail or other destination-if-no-answer which is often voicemail or other undesirable places. Ringgroups can be both a parent and a child of such

Files:

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

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

@@ -58 +58 @@
-          $ext->add($contextname, $grpnum, '', new ext_macro('user-callerid'));
-
+          // Remember if NODEST was set later, but clear it in case the call is answered so that subsequent
+          // transfers work.
+          //
+          $ext->add($contextname, $grpnum, '', new ext_setvar('RRNODEST', '${NODEST}'));
+          $ext->add($contextname, $grpnum, '', new ext_setvar('NODEST', ''));
+
-          // deal with group CID prefix
-          $ext->add($contextname, $grpnum, '', new ext_gotoif('$["foo${RGPREFIX}" = "foo"]', 'REPCID'));
@@ -113 +119 @@
-          $ext->add($contextname, $grpnum, 'nextstep', new ext_setvar('RingGroupMethod',''));
-
+          // Did the call come from a queue or ringgroup, if so, don't go to the destination, just end and let
+          // the queue or ringgroup decide what to do next
+          //
+          $ext->add($contextname, $grpnum, '', new ext_gotoif('$["foo${RRNODEST}" != "foo"]', 'nodest'));
+
-          // where next?
-          if ((isset($postdest) ? $postdest : '') != '') {
@@ -119 +130 @@
-            $ext->add($contextname, $grpnum, '', new ext_hangup(''));
-          }
+          $ext->add($contextname, $grpnum, 'nodest', new ext_noop('SKIPPING DEST, CALL CAME FROM Q/RG: ${RRNODEST}'));
-        }
-      }

modules/branches/2.2/findmefollow/module.xml

@@ -4 +4 @@
-  <version>2.4.3</version>
-  <changelog>
+    *2.4.4* Add NODEST so that destination (often vm) is not taken if called from queue or ringgroup
-    *2.4.3* Sanity check for prefing that if not set or there, it won't ring the extension forever (should not happen)
-    *2.4.2* Modified flyover help - since moh works with confirmation now

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

@@ -36 +36 @@
-          
-          $ext->add('ext-queues', $exten, '', new ext_answer(''));
+
+          // Inform all the children NOT to send calls to destinations or voicemail
+          //
+          $ext->add('ext-queues', $exten, '', new ext_setvar('_NODEST', '${EXTEN}'));
+
-          $ext->add('ext-queues', $exten, '', new ext_gotoif('$["${CONTEXT}"="from-internal"]','USERCID','SETCID'));
-          $ext->add('ext-queues', $exten, 'USERCID', new ext_macro('user-callerid'));
@@ -49 +54 @@
-          $agentannounce = (isset($q['agentannounce'])?$q['agentannounce']:'');
-          $ext->add('ext-queues', $exten, '', new ext_queue($exten,$options,'',$agentannounce,$q['maxwait']));
+ 
+          // If we are here, disable the NODEST as we want things to resume as normal
+          //
+          $ext->add('ext-queues', $exten, '', new ext_setvar('_NODEST', ''));
-  
-          // destination field in 'incoming' database is backwards from what ext_goto expects

modules/branches/2.2/queues/module.xml

@@ -8 +8 @@
-    Creates a queue where calls are placed on hold and answered on a first-in, first-out basis. Many options are available, including ring strategy for agents, caller announcements, max wait times, etc. 
-  </description>
-
+
+
+
-  <menuitems>
-    <queues>Queues</queues>

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

@@ -58 +58 @@
-
-          $ext->add($contextname, $grpnum, '', new ext_macro('user-callerid'));
+
+          // Remember if we should go to our own destination (in case we are a child) and then tell all our
+          // children not to go to their destinations
+          //
+          $ext->add($contextname, $grpnum, '', new ext_setvar('RRNODEST', '${NODEST}'));
+          $ext->add($contextname, $grpnum, '', new ext_setvar('NODEST', '${EXTEN}'));
-          
-          // deal with group CID prefix
@@ -96 +102 @@
-          $ext->add($contextname, $grpnum, '', new ext_setvar('RingGroupMethod',''));
-
+
+          // Now if we were told to skip the destination, do so now. Otherwise reset NODEST and proceed to our destination.
+          //
+          $ext->add($contextname, $grpnum, '', new ext_gotoif('$["foo${RRNODEST}" != "foo"]', 'nodest'));
+          $ext->add($contextname, $grpnum, '', new ext_setvar('_NODEST', ''));
+
-          // where next?
-          if ((isset($postdest) ? $postdest : '') != '') {
@@ -102 +114 @@
-            $ext->add($contextname, $grpnum, '', new ext_hangup(''));
-          }
+          $ext->add($contextname, $grpnum, 'nodest', new ext_noop('SKIPPING DEST, CALL CAME FROM Q/RG: ${RRNODEST}'));
-        }
-      }

modules/branches/2.2/ringgroups/module.xml

@@ -9 +9 @@
-  </description>
-  <changelog>
-
-
-
-
-
-
+
+
+
+
+
+
+
-  <menuitems>
-    <ringgroups>Ring Groups</ringgroups>