Changeset 3317

Timestamp:

12/13/06 23:58:21 (5 years ago)

Author:

p_lindheimer

Message:

Hopefully the final fix to get all modes of transfering a received call that came in from a queue, ringgroup or followme to subsequent users or direct to their voicemail. Finally able to get rid of dolocaldial, meaning the queue transfers in particular won't ring forever. These change REQUIRE core changed to be checked in right after this

Files:

• modules/branches/2.3/findmefollow/functions.inc.php (modified) (3 diffs)
• 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) (3 diffs)
• modules/branches/2.3/ringgroups/module.xml (modified) (2 diffs)

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

@@ -59 +59 @@
-          $ext->add($contextname, $grpnum, '', new ext_macro('user-callerid'));
-
+          // block voicemail until phone is answered at which point a macro should be called on the answering
+          // line to clear this flag so that subsequent transfers can occur, if already set by a the caller
+          // then don't change.
+          //
+          $ext->add($contextname, $grpnum, '', new ext_gotoif('$["foo${BLKVM_OVERRIDE}" = "foo"]', 'skipdb'));
+          $ext->add($contextname, $grpnum, '', new ext_gotoif('$["${DB(${BLKVM_OVERRIDE})}" = "TRUE"]', 'skipov'));
+
+          $ext->add($contextname, $grpnum, 'skipdb', new ext_setvar('__NODEST', ''));
+          $ext->add($contextname, $grpnum, '', new ext_setvar('__BLKVM_OVERRIDE', 'BLKVM/${EXTEN}/${CHANNEL}'));
+          $ext->add($contextname, $grpnum, '', new ext_setvar('__BLKVM_BASE', '${EXTEN}'));
+          $ext->add($contextname, $grpnum, '', new ext_setvar('DB(${BLKVM_OVERRIDE})', 'TRUE'));
+
-          // Remember if NODEST was set later, but clear it in case the call is answered so that subsequent
-          // transfers work.
-          //
-
-
-
+
-          $ext->add($contextname, $grpnum, 'skipvmblk', new ext_setvar('__NODEST', '${EXTEN}'));
-
@@ -112 +122 @@
-
-          // Normal call
-          $ext->add($contextname, $grpnum, '', new ext_setvar('RECALL', '${NODEST}'));
-          $ext->add($contextname, $grpnum, '', new ext_setvar('__BLKVM', '${EXTEN}'));
-          $ext->add($contextname, $grpnum, '', new ext_setvar('__NODEST', ''));
-          $ext->add($contextname, $grpnum, '', new 
-              ext_macro('dial','${DB(AMPUSER/'."$grpnum/followme/grptime)},$dialopts,".'${DB(AMPUSER/'."$grpnum/followme/grplist)}"));
-          $ext->add($contextname, $grpnum, '', new ext_setvar('__NODEST', '${RECALL}'));
-          $ext->add($contextname, $grpnum, '', new ext_setvar('__BLKVM', ''));
-          $ext->add($contextname, $grpnum, '', new ext_goto('nextstep'));
-
@@ -132 +137 @@
-          $ext->add($contextname, $grpnum, '', new ext_gotoif('$["foo${RRNODEST}" != "foo"]', 'nodest'));
-          $ext->add($contextname, $grpnum, '', new ext_setvar('__NODEST', ''));
+
+          $ext->add($contextname, $grpnum, '', new ext_dbdel('${BLKVM_OVERRIDE}'));
-
-          // where next?

modules/branches/2.3/findmefollow/module.xml

@@ -2 +2 @@
-  <rawname>findmefollow</rawname>
-  <name>Follow Me</name>
-5
+6
-  <changelog>
+    *2.2.6* Added BLKVM DB tree to fix inability to transfer a received call to another user, and make NODEST stuff work overall
-    *2.4.5* Modified NODEST stuff to improve some cases where it was still failing, and improve '#' transfer scenarios
-    *2.4.4* Add NODEST so that destination (often vm) is not taken if called from queue or ringgroup

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

@@ -36 +36 @@
-          
-          $ext->add('ext-queues', $exten, '', new ext_answer(''));
+
+          // block voicemail until phone is answered at which point a macro should be called on the answering
+          // line to clear this flag so that subsequent transfers can occur.
+          //
+          $ext->add('ext-queues', $exten, '', new ext_setvar('__BLKVM_OVERRIDE', 'BLKVM/${EXTEN}/${CHANNEL}'));
+          $ext->add('ext-queues', $exten, '', new ext_setvar('__BLKVM_BASE', '${EXTEN}'));
+          $ext->add('ext-queues', $exten, '', new ext_setvar('DB(${BLKVM_OVERRIDE})', 'TRUE'));
+          $ext->add('ext-queues', $exten, '', new ext_setvar('_DIAL_OPTIONS', '${DIAL_OPTIONS}M(auto-blkvm)'));
-
-          // Inform all the children NOT to send calls to destinations or voicemail
@@ -55 +63 @@
-          $ext->add('ext-queues', $exten, '', new ext_queue($exten,$options,'',$agentannounce,$q['maxwait']));
- 
+          $ext->add('ext-queues', $exten, '', new ext_dbdel('${BLKVM_OVERRIDE}'));
-          // If we are here, disable the NODEST as we want things to resume as normal
-          //

modules/branches/2.3/queues/module.xml

@@ -2 +2 @@
-  <rawname>queues</rawname>
-  <name>Queues</name>
-3
+4
-  <type>setup</type>
-  <category>Inbound Call Control</category>
@@ -9 +9 @@
-  </description>
-  <changelog>
+    *2.2.4* Added BLKVM DB tree to fix inability to transfer a received call to another user, and make NODEST stuff work overall
-    *2.2.3* Change _NODEST to __NODEST for some scenarios that require infinite inheritance
-    *2.2.2* Disallow Queue 0 (#1487)

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

@@ -60 +60 @@
-          $ext->add($contextname, $grpnum, '', new ext_macro('user-callerid'));
-
-
-
+
+
+
-          //
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-          $ext->add($contextname, $grpnum, 'skipvmblk', new ext_setvar('__NODEST', '${EXTEN}'));
-          
@@ -102 +112 @@
-            $ext->add($contextname, $grpnum, 'DIALGRP', new ext_macro('dial-confirm',"$grptime,$dialopts,$grplist,$grpnum"));
-          } else {
-            $ext->add($contextname, $grpnum, '', new ext_setvar('RECALL', '${NODEST}'));
-            $ext->add($contextname, $grpnum, '', new ext_setvar('__BLKVM', '${EXTEN}'));
-            $ext->add($contextname, $grpnum, '', new ext_setvar('__NODEST', ''));
-            $ext->add($contextname, $grpnum, 'DIALGRP', new ext_macro('dial',$grptime.",$dialopts,".$grplist));
-            $ext->add($contextname, $grpnum, '', new ext_setvar('__NODEST', '${RECALL}'));
-            $ext->add($contextname, $grpnum, '', new ext_setvar('__BLKVM', ''));
-          }
-          $ext->add($contextname, $grpnum, '', new ext_setvar('RingGroupMethod',''));
@@ -116 +121 @@
-          $ext->add($contextname, $grpnum, '', new ext_gotoif('$["foo${RRNODEST}" != "foo"]', 'nodest'));
-          $ext->add($contextname, $grpnum, '', new ext_setvar('__NODEST', ''));
+
+          $ext->add($contextname, $grpnum, '', new ext_dbdel('${BLKVM_OVERRIDE}'));
-
-          // where next?

modules/branches/2.3/ringgroups/module.xml

@@ -2 +2 @@
-  <rawname>ringgroups</rawname>
-  <name>Ring Groups</name>
-9
+10
-  <type>setup</type>
-  <category>Inbound Call Control</category>
@@ -9 +9 @@
-  </description>
-  <changelog>
+    *2.2.10* Added BLKVM DB tree to fix inability to transfer a received call to another user, and make NODEST stuff work overall
-    *2.2.9* Modified NODEST stuff to improve some cases where it was still failing, and improve '#' transfer scenarios
-    *2.2.8* Allow ringall-prim as well as ringall for strategies with confirmation (#1408)