Changeset 10374 for modules/branches/2.9/core

Timestamp:

10/07/10 20:06:13 (3 years ago)

Author:

p_lindheimer

Message:

closes #4580 adds a Diversion Header to outbound calls that resulted in a forwarding situation if they came in with a DID, if the DID is not valid (3,4,7 digit PRI DIDs then the Diversion header will only include that DID

Files:

• modules/branches/2.9/core/agi-bin/dialparties.agi (modified) (1 diff)
• modules/branches/2.9/core/functions.inc.php (modified) (5 diffs)
• modules/branches/2.9/core/module.xml (modified) (1 diff)

modules/branches/2.9/core/agi-bin/dialparties.agi

@@ -302 +302 @@
-        } else {
-          $ext[$count] = $cf.'#';  
+          // This only really needs to be set if we are setting Diversion Headers, but it's not worth the hassle of
+          // checking the amportal.conf settings here and there is no harm done in setting it other than minor overhead
+          //
+          $AGI->set_variable('__DIVERSION_REASON','unconditional');
-          debug("Extension $k has call forward set to $cf", 1);
-        }

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

@@ -1764 +1764 @@
-          $ext->add($context, $exten, '', new ext_noop(sprintf(_('Calling Out Route: %s'),$route['name']))); 
-
+          // Conditionally Add Divesion Header if the call was diverted
+          if ($amp_conf['DIVERSIONHEADER']) {
+            $ext->add($context, $exten, '', new ext_gosubif('$[${LEN(${FROM_DID})}>0 & "${FROM_DID}"!="s"','sub-diversion-header,s,1'));
+          }
+
-          if ($route['emergency_route'] != '') {
-            $ext->add($context, $exten, '', new ext_set("EMERGENCYROUTE",$route['emergency_route']));
@@ -1971 +1976 @@
-      $ext->add($context, $exten, '', new ext_return(''));
-
+      // Subroutine to add diversion header with reason code "no-answer" unless provided differently elsewhere in the dialplan to indicate
+      // the reason for the diversion (e.g. CFB could set it to busy)
+      //
+      if ($amp_conf['DIVERSIONHEADER']) {
+          $context = 'sub-diversion-header';
+          $exten = 's';
+          $ext->add($context, $exten, '', new ext_set('DIVERSION_REASON', '${IF($[${LEN(${DIVERSION_REASON})}=0]?no-answer:${DIVERSION_REASON})}'));
+          $ext->add($context, $exten, '', new ext_sipaddheader('Diversion', '<tel:+${FROM_DID}>\;reason=${DIVERSION_REASON}\;screen=no\;privacy=off'));
+          $ext->add($context, $exten, '', new ext_return(''));
+      }
-      
-      /*
@@ -2916 +2931 @@
-      $exten = 'docfu';
-      $ext->add($mcontext,$exten,'docfu', new ext_set("RTCFU", '${IF($["${VMBOX}"!="novm"]?${RINGTIMER}:"")}'));
+      if ($amp_conf['DIVERSIONHEADER']) $ext->add($mcontext,$exten,'', new ext_set('__DIVERSION_REASON', 'unavailable'));
-      $ext->add($mcontext,$exten,'', new ext_dial('Local/${CFUEXT}@from-internal/n', '${RTCFU},${DIAL_OPTIONS}'));
+      if ($amp_conf['DIVERSIONHEADER']) $ext->add($mcontext,$exten,'', new ext_set('__DIVERSION_REASON', ''));
-      $ext->add($mcontext,$exten,'', new ext_return(''));
-
-      $exten = 'docfb';
-      $ext->add($mcontext,$exten,'docfb', new ext_set("RTCFB", '${IF($["${VMBOX}"!="novm"]?${RINGTIMER}:"")}'));
+      if ($amp_conf['DIVERSIONHEADER']) $ext->add($mcontext,$exten,'', new ext_set('__DIVERSION_REASON', 'user-busy'));
-      $ext->add($mcontext,$exten,'', new ext_dial('Local/${CFBEXT}@from-internal/n', '${RTCFB},${DIAL_OPTIONS}'));
+      if ($amp_conf['DIVERSIONHEADER']) $ext->add($mcontext,$exten,'', new ext_set('__DIVERSION_REASON', ''));
-      $ext->add($mcontext,$exten,'', new ext_return(''));
-
@@ -3111 +3130 @@
-        $ext->add($mcontext,$exten,'', new ext_execif('$["${DB(CF/${DEXTEN})}"="${CFAMPUSER}" | "${DB(CF/${DEXTEN})}"="${REALCALLERIDNUM}" | "${CUT(CUT(BLINDTRANSFER,-,1),/,1)}" = "${DB(CF/${DEXTEN})}" | "${DEXTEN}"="${DB(CF/${DEXTEN})}"]', 'Return'));
-        $ext->add($mcontext,$exten,'', new ext_set('DEXTEN', '${IF($["${CFIGNORE}"=""]?"${DB(CF/${DEXTEN})}#":"")}'));
+        if ($amp_conf['DIVERSIONHEADER']) $ext->add($mcontext,$exten,'', new ext_set('__DIVERSION_REASON', '${IF($["${DEXTEN}"!=""]?"unconditional":"")}'));
-        $ext->add($mcontext,$exten,'', new ext_execif('$["${DEXTEN}"!=""]', 'Return'));
-        $ext->add($mcontext,$exten,'', new ext_set('DIALSTATUS', 'NOANSWER'));
@@ -5897 +5917 @@
-function core_devices_configpageinit($dispnum) {
-  global $currentcomponent, $amp_conf;
-  global $amp_conf;
-
-  if ( $dispnum == 'devices' || $dispnum == 'extensions' ) {

modules/branches/2.9/core/module.xml

@@ -10 +10 @@
-  <canuninstall>no</canuninstall>
-  <changelog>
+    *2.9.0alpha1.3* #4580
-    *2.9.0alpha1.2* #4401, #4525, #4507, #4499, #4574, #4572, #4575, #4527, #4469
-    *2.9.0alpha1.1* #4443, #4444, #4460, #4414