Changeset 8221

Timestamp:

08/27/09 19:30:40 (2 years ago)

Author:

p_lindheimer

Message:

fixes #3609 move macro ARGs to channel variables in macro-vm due to corner case transfers that result in odd behavior from call transfers

Files:

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

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

@@ -2259 +2259 @@
-      // also - if not message (no-msg) is requested, straight to voicemail
-      //
-
-
-
+
+
+
+
+
+
+
+
-      $ext->add('macro-vm','vmx', '', new ext_setvar("MODE", '${IF($["${REGEX("[b]" ${VM_DDTYPE})}" = "1"]?busy:${MODE})}'));
-ARG1} is enabled: ${DB(AMPUSER/${ARG1
-ARG1}/vmx/${MODE}/state)}" != "enabled"]','s-${ARG2
+MEXTEN} is enabled: ${DB(AMPUSER/${MEXTEN
+MEXTEN}/vmx/${MODE}/state)}" != "enabled"]','s-${MMODE
-
-      // If the required voicemail file does not exist, then abort and go to normal voicemail behavior
@@ -2271 +2276 @@
-      // in the past had errors.
-      //
-ARG1
-ARG1
+MEXTEN
+MEXTEN
-      if ($ast_ge_14) {
-ARG1}/temp.wav)} = 1) || (${STAT(f,${ASTSPOOLDIR}/voicemail/${VMCONTEXT}/${ARG1
-ARG1}/${MODE}.wav)} = 0) && (${STAT(f,${ASTSPOOLDIR}/voicemail/${VMCONTEXT}/${ARG1
+MEXTEN}/temp.wav)} = 1) || (${STAT(f,${ASTSPOOLDIR}/voicemail/${VMCONTEXT}/${MEXTEN
+MEXTEN}/${MODE}.wav)} = 0) && (${STAT(f,${ASTSPOOLDIR}/voicemail/${VMCONTEXT}/${MEXTEN
-      } else {
-ARG1
+MEXTEN
-        $ext->add('macro-vm','vmx', '', new ext_gotoif('$["${SYSTEMSTATUS}" = "SUCCESS"]','tmpgreet'));
-ARG1
+MEXTEN
-        $ext->add('macro-vm','vmx', '', new ext_gotoif('$["${SYSTEMSTATUS}" != "SUCCESS"]','nofile'));
-      }
-
-      $ext->add('macro-vm','vmx', '', new ext_setvar("LOOPCOUNT", '0'));      
-ARG1
+MEXTEN
-      $ext->add('macro-vm','vmx', '', new ext_setvar("VMX_REPEAT", '${DB_RESULT}'));
-ARG1
+MEXTEN
-      $ext->add('macro-vm','vmx', '', new ext_setvar("VMX_TIMEOUT", '${DB_RESULT}'));
-ARG1
+MEXTEN
-      $ext->add('macro-vm','vmx', '', new ext_setvar("VMX_LOOPS", '${DB_RESULT}'));
-      $ext->add('macro-vm','vmx','vmxanswer',new ext_answer(''));
@@ -2295 +2300 @@
-      // then we go to the timeout. Otherwise handle invalid options by looping until the limit until a valid option is played.
-      //
-ARG1
+MEXTEN
-      $ext->add('macro-vm','vmx', '', new ext_gotoif('$["${EXISTS(${ACTION})}" = "1"]','checkopt'));
-
@@ -2302 +2307 @@
-      $ext->add('macro-vm','vmx', 'noopt', new ext_NoOp('Timeout: going to timeout dest'));     
-      $ext->add('macro-vm','vmx', '', new ext_setvar("VMX_OPTS", '${VMX_OPTS_TIMEOUT}'));
-ARG1
+MEXTEN
-      $ext->add('macro-vm','vmx', '', new ext_setvar("VMX_OPTS", '${DB_RESULT}'));
-ARG1
+MEXTEN
-      $ext->add('macro-vm','vmx', '', new ext_setvar("VMX_TIMEDEST_EXT",'${DB_RESULT}')); 
-ARG1
+MEXTEN
-      $ext->add('macro-vm','vmx', '', new ext_setvar("VMX_TIMEDEST_CONTEXT",'${DB_RESULT}'));
-ARG1
+MEXTEN
-      $ext->add('macro-vm','vmx', '', new ext_setvar("VMX_TIMEDEST_PRI",'${DB_RESULT}'));
-      $ext->add('macro-vm','vmx','dotime',new ext_goto('${VMX_TIMEDEST_PRI}', '${VMX_TIMEDEST_EXT}', '${VMX_TIMEDEST_CONTEXT}'));
@@ -2314 +2319 @@
-      // We got an option, check if the option is defined, or one of the system defaults
-      //
-ARG1
+MEXTEN
-      $ext->add('macro-vm','vmx', '', new ext_gotoif('$["${ACTION}" = "0"]','o,1'));
-      $ext->add('macro-vm','vmx', '', new ext_gotoif('$["${ACTION}" = "*"]','adef,1'));
@@ -2329 +2334 @@
-      $ext->add('macro-vm','vmx', 'toomany', new ext_NoOp('Too Many invalid entries, got to invalid dest'));      
-      $ext->add('macro-vm','vmx', '', new ext_setvar("VMX_OPTS",'${VMX_OPTS_LOOPS}'));
-ARG1
+MEXTEN
-      $ext->add('macro-vm','vmx', '', new ext_setvar("VMX_OPTS",'${DB_RESULT}'));
-ARG1
+MEXTEN
-      $ext->add('macro-vm','vmx', '', new ext_setvar("VMX_LOOPDEST_EXT",'${DB_RESULT}'));
-ARG1
+MEXTEN
-      $ext->add('macro-vm','vmx', '', new ext_setvar("VMX_LOOPDEST_CONTEXT",'${DB_RESULT}'));
-ARG1
+MEXTEN
-      $ext->add('macro-vm','vmx', '', new ext_setvar("VMX_LOOPDEST_PRI",'${DB_RESULT}'));
-      $ext->add('macro-vm','vmx','doloop',new ext_goto('${VMX_LOOPDEST_PRI}','${VMX_LOOPDEST_EXT}','${VMX_LOOPDEST_CONTEXT}'));
@@ -2348 +2353 @@
-      $ext->add('macro-vm','vmx', '', new ext_gotoif('$["${VMX_EXT}" != "dovm"]','getdest'));
-      $ext->add('macro-vm','vmx', 'vmxopts', new ext_setvar("VMX_OPTS",'${VMX_OPTS_DOVM}'));
-ARG1
+MEXTEN
-      $ext->add('macro-vm','vmx', 'vmxopts', new ext_setvar("VMX_OPTS",'${DB_RESULT}'));
-      $ext->add('macro-vm','vmx','vmxdovm',new ext_goto('1','dovm'));     
@@ -2355 +2360 @@
-      // reasonable values
-      //
-ARG1
+MEXTEN
-      $ext->add('macro-vm','vmx', '', new ext_setvar("VMX_CONTEXT",'${DB_RESULT}'));
-ARG1
+MEXTEN
-      $ext->add('macro-vm','vmx', '', new ext_setvar("VMX_PRI",'${DB_RESULT}'));
-      $ext->add('macro-vm','vmx','vmxgoto',new ext_goto('${VMX_PRI}','${VMX_EXT}','${VMX_CONTEXT}'));
@@ -2365 +2370 @@
-      //
-      $ext->add('macro-vm','vmx', 'nofile', new ext_NoOp('File for mode: ${MODE} does not exist, SYSTEMSTATUS: ${SYSTEMSTATUS}, going to normal voicemail'));
-ARG2
+MMODE
-      $ext->add('macro-vm','vmx', 'tmpgreet', new ext_NoOp('Temporary Greeting Detected, going to normal voicemail'));
-ARG2
+MMODE
-
-      // Drop into voicemail either as a direct destination (in which case VMX_OPTS might be set to something) or
@@ -2374 +2379 @@
-      //
-      $ext->add('macro-vm','dovm', '', new ext_NoOp('VMX Timeout - go to voicemail'));
-ARG1
+MEXTEN
-      $ext->add('macro-vm','dovm', '',new ext_goto('1','exit-${VMSTATUS}'));
-
-      $ext->add('macro-vm','s-BUSY','',new ext_NoOp('BUSY voicemail'));
-ARG1
-ARG1
+MEXTEN
+MEXTEN
-      $ext->add('macro-vm','s-BUSY', '',new ext_goto('1','exit-${VMSTATUS}'));
-
-      $ext->add('macro-vm','s-NOMESSAGE','',new ext_NoOp('NOMESSAGE (beeb only) voicemail'));
-ARG1
-ARG1
+MEXTEN
+MEXTEN
-      $ext->add('macro-vm','s-NOMESSAGE','',new ext_goto('1','exit-${VMSTATUS}'));
-
-      $ext->add('macro-vm','s-DIRECTDIAL','',new ext_NoOp('DIRECTDIAL voicemail'));
-ARG1
-ARG1
+MEXTEN
+MEXTEN
-      $ext->add('macro-vm','s-DIRECTDIAL','',new ext_goto('1','exit-${VMSTATUS}'));
-
-ARG1
-ARG1
+MEXTEN
+MEXTEN
-      $ext->add('macro-vm','_s-.','',new ext_goto('1','exit-${VMSTATUS}'));
-
@@ -2400 +2405 @@
-      //
-      $ext->add('macro-vm','o','',new ext_background('one-moment-please'));
-ARG1
+MEXTEN
-      $ext->add('macro-vm','o','',new ext_setvar("VMX_OPDEST_EXT",'${DB_RESULT}'));
-ARG1
+MEXTEN
-      $ext->add('macro-vm','o','',new ext_setvar("DB_RESULT",'${VMX_CONTEXT}'));
-      $ext->add('macro-vm','o','opcontext',new ext_setvar("VMX_OPDEST_CONTEXT",'${DB_RESULT}'));
-ARG1
+MEXTEN
-      $ext->add('macro-vm','o','',new ext_setvar("DB_RESULT",'${VMX_PRI}'));
-      $ext->add('macro-vm','o','oppri',new ext_setvar("VMX_OPDEST_PRI",'${DB_RESULT}'));
@@ -2419 +2424 @@
-      // as well to keep it consistant with the menu structure
-      //
-ARG1
-ARG1
+MEXTEN
+MEXTEN
-      $ext->add('macro-vm','a','',new ext_setvar("VMX_ADEST_EXT",'${DB_RESULT}'));
-ARG1
+MEXTEN
-      $ext->add('macro-vm','a','',new ext_setvar("DB_RESULT",'${VMX_CONTEXT}'));
-      $ext->add('macro-vm','a','acontext',new ext_setvar("VMX_ADEST_CONTEXT",'${DB_RESULT}'));
-
-ARG1
+MEXTEN
-      $ext->add('macro-vm','a','',new ext_setvar("DB_RESULT",'${VMX_PRI}'));
-      $ext->add('macro-vm','a','apri',new ext_setvar("VMX_ADEST_PRI",'${DB_RESULT}'));
-      $ext->add('macro-vm','a','',new ext_goto('${VMX_ADEST_PRI}','${VMX_ADEST_EXT}','${VMX_ADEST_CONTEXT}'));
-ARG1
-ARG3
+MEXTEN
+RETVM
-      $ext->add('macro-vm','adef','',new ext_hangup(''));
-
-      $ext->add('macro-vm','exit-FAILED','',new ext_playback('im-sorry&an-error-has-occured'));
-ARG3
+RETVM
-      $ext->add('macro-vm','exit-FAILED','',new ext_hangup(''));
-
-ARG3
+RETVM
-      $ext->add('macro-vm','exit-SUCCESS','',new ext_playback('goodbye'));
-      $ext->add('macro-vm','exit-SUCCESS','',new ext_hangup(''));
-
-ARG3
+RETVM
-      $ext->add('macro-vm','exit-USEREXIT','',new ext_playback('goodbye'));
-      $ext->add('macro-vm','exit-USEREXIT','',new ext_hangup(''));

modules/branches/2.6/core/module.xml

@@ -10 +10 @@
-  <canuninstall>no</canuninstall>
-  <changelog>
-
+, #3609
-    *2.6.0beta1.4* #3075, #3501, #3636, #3581, #3266, #3701, #3545, #3430
-    *2.6.0beta1.3* trunk tab improvements