Changeset 8930

Timestamp:

02/25/10 09:45:36 (6 months ago)

Author:

p_lindheimer

Message:

closes #4053 and updated macro-dialout-enum to be consistent with new format of macro-dialout-trunk

Files:

• modules/branches/2.7/core/functions.inc.php (modified) (3 diffs)
• modules/branches/2.7/core/module.xml (modified) (1 diff)

modules/branches/2.7/core/functions.inc.php

@@ -1815 +1815 @@
-                        $ext->add($context, $exten, '', new ext_playtones('busy'));
-                        $ext->add($context, $exten, '', new ext_busy(20));
+
+                        /*
+                        * There are reported bugs in Asterisk Blind Trasfers that result in Dial() returning and continuing
+      * execution with a status of ANSWER. So we hangup at this point
+                        */
+                        $exten = 's-ANSWER';
+                        $ext->add($context, $exten, '', new ext_noop('Call successfully answered - Hanging up now'));
+                        $ext->add($context, $exten, '', new ext_macro('hangupcall'));
-                
-                        $exten = 's-NOANSWER';
@@ -1928 +1936 @@
-                        $ext->add($context, $exten, '', new ext_playtones('busy'));
-                        $ext->add($context, $exten, '', new ext_busy(20));
+
+                        /*
+                        * There are reported bugs in Asterisk Blind Trasfers that result in Dial() returning and continuing
+      * execution with a status of ANSWER. So we hangup at this point
+                        */
+                        $exten = 's-ANSWER';
+                        $ext->add($context, $exten, '', new ext_noop('Call successfully answered - Hanging up now'));
+                        $ext->add($context, $exten, '', new ext_macro('hangupcall'));
-                
-                        $exten = 's-NOANSWER';
@@ -2067 +2083 @@
-                        // Now we have the variable DIALARR set to a list of URI's that can be called, in order of priority
-                        // Loop through them trying them in order.
-end
+s-${DIALSTATUS},1
-                        $ext->add($context, $exten, '', new ext_set('TRYDIAL', '${CUT(DIALARR,%,1)}'));
-                        $ext->add($context, $exten, '', new ext_set('DIALARR', '${CUT(DIALARR,%,2-)}'));
-                        $ext->add($context, $exten, '', new ext_dial('${TRYDIAL}', ''));
-                        $ext->add($context, $exten, '', new ext_noop('Dial exited in macro-enum-dialout with ${DIALSTATUS}'));
-                        // Now, if we're still here, that means the Dial failed for some reason. 
-                        // If it's CONGESTION or CHANUNAVAIL we want to try again on a different
-                        // different channel. If there's no more left, the dialloop tag will exit.
-
-
-
+
-                        // Here are the exit points for the macro.
-                        $ext->add($context, $exten, 'nochans', new ext_noop('max channels used up'));
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                        
-                        /*

modules/branches/2.7/core/module.xml

@@ -10 +10 @@
-        <canuninstall>no</canuninstall>
-        <changelog>
-
+, #4053
-                *2.7.0RC1.4* #4072
-                *2.7.0RC1.3* #4068, (#4069 available but not used)