Changeset 10711 for modules/branches/2.9/core

Timestamp:

12/18/10 14:39:47 (2 years ago)

Author:

p_lindheimer

Message:

- adds logic so FORCE_CONFRIM calls will force any outbound call to user confirmation

in this mode there is some reduced functionality. There is no detection for a call
answered by someone else. As always the first will win, others will get dead air
instead of a friendly (you got beat) message. (Same if they hangup). Modifying to not
get dead air will probably come when we switch form DB variables to SHARED() where
channels can share variables and we don't have the cleanup issues of DB(), re #4701

- fixes a couple of instances of deprecated SetMusicOnHold? re #4697
- fixes an instance of deprecated DbDel?
- untested fixes #4702 macro-dialout-enum missing logic

Files:

• modules/branches/2.9/core/etc/extensions.conf (modified) (3 diffs)
• modules/branches/2.9/core/functions.inc.php (modified) (8 diffs)

modules/branches/2.9/core/etc/extensions.conf

@@ -485 +485 @@
-[macro-setmusic]
-exten => s,1,NoOp(Setting Outbound Route MoH To: ${ARG1})
-MusicOnHold(${ARG1})
+(CHANNEL(musicclass)=${ARG1}) ; this won't work in 1.2 anymore, could fix in auto-generate if we wanted...
-;------------------------------------------------------------------------
-
@@ -528 +528 @@
-exten => s,n,Set(USE_CONFIRMATION=TRUE)
-exten => s,n,Set(RINGGROUP_INDEX=${ARG4})
+exten => s,n,Set(FORCE_CONFIRM=) ; remove option if set so it is not duplicated in outbound route
-exten => s,n,Set(ARG4=) ; otherwise it gets passed to dialparties.agi which processes it (prob bug) 
-
@@ -534 +535 @@
-; delete the variable, if we are here, we are done trying to dial and it may have been left around
-;
-DBDel(RG/${RINGGROUP_INDEX}/${CHANNEL
+Noop(DELETE KEY: RG/${RINGGROUP_INDEX}/${CHANNEL}: ${DB_DELETE(RG/${RINGGROUP_INDEX}/${CHANNEL})
-exten => s,n,Set(USE_CONFIRMATION=)
-exten => s,n,Set(RINGGROUP_INDEX=)

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

@@ -1902 +1902 @@
-
-      $exten = '1';
+      $ext->add($context, $exten, '', new ext_gotoif('$["${FORCE_CONFIRM}" = "ENABLED"]', 'skip'));
-      $ext->add($context, $exten, '', new ext_gotoif('$["${DB_EXISTS(RG/${ARG3}/${UNIQCHAN})}" = "0"]', 'toolate,1'));
-      $ext->add($context, $exten, '', new ext_dbdel('RG/${ARG3}/${UNIQCHAN}'));
-      $ext->add($context, $exten, '', new ext_dbdel('${BLKVM_OVERRIDE}'));
-
+
+
-      $ext->add($context, $exten, 'exitopt1', new ext_macroexit());
-
@@ -1913 +1915 @@
-      $exten = '3';
-      $ext->add($context, $exten, '', new ext_saydigits('${CALLCONFIRMCID}'));
- = "0
+="0" & "${FORCE_CONFIRM}"!="ENABLED
-
-      $exten = 't';
- = "0
+="0" & "${FORCE_CONFIRM}"!="ENABLED
-      $ext->add($context, $exten, '', new ext_setvar('LOOPCOUNT','$[ ${LOOPCOUNT} + 1 ]'));
-      $ext->add($context, $exten, '', new ext_gotoif('$[ ${LOOPCOUNT} < 5 ]', 's,start','noanswer,1'));
@@ -1926 +1928 @@
-        $ext->add($context, $exten, '', new ext_background('invalid,m,${LANGUAGE},macro-confirm'));
-      }
- = "0
+="0" & "${FORCE_CONFIRM}"!="ENABLED
-      $ext->add($context, $exten, '', new ext_setvar('LOOPCOUNT','$[ ${LOOPCOUNT} + 1 ]'));
-      $ext->add($context, $exten, '', new ext_gotoif('$[ ${LOOPCOUNT} < 5 ]', 's,start','noanswer,1'));
@@ -2040 +2042 @@
-      // Back to normal processing, whether intracompany or not.
-      // But add the macro-setmusic if we don't want music on this outbound call
-
+
+
+
-    
-      // This macro call will always be blank and is provided as a hook for customization required prior to making a call
@@ -2172 +2176 @@
-      // Back to normal processing, whether intracompany or not.
-      // But add the macro-setmusic if we don't want music on this outbound call
-
+
+
-    
-      // This macro call will always be blank and is provided as a hook for customization required prior to making a call
@@ -2330 +2335 @@
-  
-      $ext->add($context, $exten, '', new ext_gosubif('$[$["${ARG3}" != ""] & $["${DB(AMPUSER/${AMPUSER}/pinless)}" != "NOPASSWD"]]','sub-pincheck,s,1'));
-
+
+
-      $ext->add($context, $exten, '', new ext_set('OUTBOUND_GROUP', 'OUT_${ARG1}'));
-      $ext->add($context, $exten, '', new ext_gotoif('$["${OUTMAXCHANS_${ARG1}}foo" = "foo"]', 'nomax'));
@@ -2336 +2342 @@
-      $ext->add($context, $exten, 'nomax', new ext_set('DIAL_NUMBER', '${ARG2}'));
-      $ext->add($context, $exten, '', new ext_set('DIAL_TRUNK', '${ARG1}'));
-
+
+
+
+
-      //  Replacement for asterisk's ENUMLOOKUP function
-      $ext->add($context, $exten, '', new ext_agi('enumlookup.agi'));
@@ -2342 +2351 @@
-      // Loop through them trying them in order.
-      $ext->add($context, $exten, 'dialloop', new ext_gotoif('$["foo${DIALARR}"="foo"]', 's-${DIALSTATUS},1'));
+      $ext->add($context, $exten, '', new ext_execif('$["${MOHCLASS}"!="default" & "${MOHCLASS}"!="" & "${FORCE_CONFIRM}"!="ENABLED" ]', 'Set', 'DIAL_TRUNK_OPTIONS=M(setmusic^${MOHCLASS})${DIAL_TRUNK_OPTIONS}'));
+      $ext->add($context, $exten, '', new ext_execif('$["${FORCE_CONFIRM}"="ENABLED" ]', 'Set', 'DIAL_TRUNK_OPTIONS=M(confirm)${DIAL_TRUNK_OPTIONS}'));
-      $ext->add($context, $exten, '', new ext_set('TRYDIAL', '${CUT(DIALARR,%,1)}'));
-      $ext->add($context, $exten, '', new ext_set('DIALARR', '${CUT(DIALARR,%,2-)}'));
-
+${DIAL_TRUNK_OPTIONS}
-      // 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