Changeset 8700

Timestamp:

01/28/10 02:28:31 (3 years ago)

Author:

p_lindheimer

Message:

fixes #3923 add fax exten to ivr and annoucement from fax module, remove from ivr re #4007

Files:

• modules/branches/2.7/fax/functions.inc.php (modified) (2 diffs)
• modules/branches/2.7/ivr/functions.inc.php (modified) (1 diff)

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

@@ -198 +198 @@
-    $ext->add('ext-did-0001', 'fax', '', new ext_goto('${FAX_DEST}'));
-    $ext->add('ext-did-0002', 'fax', '', new ext_goto('${FAX_DEST}'));
+
+    // Add fax extension to ivr and announcement as inbound controle may be passed quickly to them and still detection is desired
+    if (function_exists('ivr_list')) {
+      $ivrlist = ivr_list();
+      if(is_array($ivrlist)) foreach($ivrlist as $item) {
+        $ext->add("ivr-".$item['ivr_id'], 'fax', '', new ext_goto('${FAX_DEST}'));
+      }
+    }
+    if (function_exists('announcement_list')) foreach (announcement_list() as $row) {
+      $ext->add('app-announcement-'.$row['announcement_id'], 'fax', '', new ext_goto('${FAX_DEST}'));
+    }
+
-    //write out res_fax.conf and res_fax_digium.conf
-    fax_write_conf();
@@ -204 +216 @@
-    $context='ext-fax-legacy';
-    $exten = 's';
+    $ext->add($context, $exten, '', new ext_macro('user-callerid')); // $cmd,n,Macro(user-callerid)
-    $ext->add($context, $exten, '', new ext_noop('Receiving Fax for: ${FAX_RX_EMAIL} , From: ${CALLERID(all)}'));
-    if ($fax['module'] == 'spandsp') {

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

@@ -314 +314 @@
-            $ext->add($id, 'return', '', new ext_goto($id.',s,begin'));
-          }
-          $ext->add($id, 'fax', '', new ext_goto('ext-fax,in_fax,1'));
-        }
-      }