Changeset 8688 for modules/branches/2.7/fax

Timestamp:

01/26/10 21:46:19 (3 years ago)

Author:

p_lindheimer

Message:

fix some of the fax detection logic, and fix so legacy mode settings can be saved as they were getting deleted re #4007

Files:

• modules/branches/2.7/fax/functions.inc.php (modified) (12 diffs)

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

@@ -57 +57 @@
-
-function fax_dahdi_faxdetect(){
-  return true;
-
-  //TODO Get this right
-  /*
-   * kepping this always set to true for freepbx 2.7 as we cant currently properly detect this - MB
-   * 
-   */
-
-
-
-
+
-}
-
@@ -94 +88 @@
-    //check for fax modules
-    $app = $astman->send_request('Command', array('Command' => 'module show like res_fax'));
-1
+[1-9]
-      $fax['module']='res_fax';
-    } else {
-      $recive = $astman->send_request('Command', array('Command' => 'module show like app_fax'));
-1
+[1-9]
-    }
-    //TODO: verify this is the right test, no system to check it on yet
-    if (!isset($fax['module'])) {
-      $app = $astman->send_request('Command', array('Command' => 'module show like app_rxfax.so'));
-1
+[1-9]
-    }
-    $response = $astman->send_request('Command', array('Command' => 'module show like app_nv_faxdetect'));
-1
+[1-9]
-
-    //get license count
@@ -137 +130 @@
-      foreach ($dests as $row) {
-        $exten=$row['user'];
-iving Fax for Fax Recipient
+eiving Fax for
-        $ext->add($context, $exten, '', new ext_set('TO', '"'.$row['faxemail'].'"'));     
-        if ($fax['module'] == 'spandsp') {
@@ -151 +144 @@
-    //write out res_fax.conf and res_fax_digium.conf
-    fax_write_conf();
-
-// generate ext-fax-legacy used for both legacy mode and app-fax feature code
-//
-$context='ext-fax-legacy
-$exten = 's'
-$ext->add($context, $exten, '', new ext_noop('Reciving Fax for Fax Recipient: ${FAX_RX_EMAIL} , From: ${CALLERID(all)}'));
-if ($fax['module'] == 'spandsp') {
-$ext->add($context, $exten, 'receivefax', new ext_rxfax('${ASTSPOOLDIR}/fax/${UNIQUEID}.tif')); //recive fax, then email it on
-} else {
-$ext->add($context, $exten, 'receivefax', new ext_receivefax('${ASTSPOOLDIR}/fax/${UNIQUEID}.tif')); //recive fax, then email it on
-}
-$ext->add($context, 'h', '', new ext_execif('$["${FAX_RX_EMAIL}" != ""]','system','\'${ASTVARLIBDIR}/bin/fax-process.pl --to ${FAX_RX_EMAIL} --from "'.$sender_address['0'].'" --dest "${FROM_DID}" --subject "New fax from ${URIENCODE(${CALLERID(all)})}" --attachment fax_${URIENCODE(${CALLERID(number)})}.pdf --type application/pdf --file ${ASTSPOOLDIR}/fax/${UNIQUEID}.tif\''));
-
-$modulename = 'fax'
-$fcc = new featurecode($modulename, 'simu_fax'
-$fc_simu_fax = $fcc->getCodeActive(
-unset($fcc);
-
-if ($fc_simu_fax != '') {
-$default_address = sql('SELECT value FROM fax_details WHERE `key` = \'FAX_RX_EMAIL\'','getRow');
-$ext->addInclude('from-internal-additional', 'app-fax'); // Add the include from from-internal
-$ext->add('app-fax', $fc_simu_fax, '', new ext_setvar('FAX_RX_EMAIL', $default_address[0]
-$ext->add('app-fax', $fc_simu_fax, '', new ext_goto('1', 's', 'ext-fax-legacy
-$ext->add('app-fax', 'h', '', new ext_macro('hangupcall'));
-  
+
+  //
+  $context='ext-fax-legacy';
+  $exten = 's
+  $ext->add($context, $exten, '', new ext_noop('Receiving Fax for: ${FAX_RX_EMAIL} , From: ${CALLERID(all)}'))
+  if ($fax['module'] == 'spandsp') {
+    $ext->add($context, $exten, 'receivefax', new ext_rxfax('${ASTSPOOLDIR}/fax/${UNIQUEID}.tif')); //recive fax, then email it on
+} else {
+    $ext->add($context, $exten, 'receivefax', new ext_receivefax('${ASTSPOOLDIR}/fax/${UNIQUEID}.tif')); //recive fax, then email it on
+}
+  $ext->add($context, 'h', '', new ext_execif('$["${FAX_RX_EMAIL}" != ""]','system','\'${ASTVARLIBDIR}/bin/fax-process.pl --to ${FAX_RX_EMAIL} --from "'.$sender_address['0'].'" --dest "${FROM_DID}" --subject "New fax from ${URIENCODE(${CALLERID(all)})}" --attachment fax_${URIENCODE(${CALLERID(number)})}.pdf --type application/pdf --file ${ASTSPOOLDIR}/fax/${UNIQUEID}.tif\''));
+
+
+  $fcc = new featurecode($modulename, 'simu_fax')
+  $fc_simu_fax = $fcc->getCodeActive(
+  unset($fcc
+
+
+    $default_address = sql('SELECT value FROM fax_details WHERE `key` = \'FAX_RX_EMAIL\'','getRow');
+  $ext->addInclude('from-internal-additional', 'app-fax'); // Add the include from from-internal
+  $ext->add('app-fax', $fc_simu_fax, '', new ext_setvar('FAX_RX_EMAIL', $default_address[0]));
+  $ext->add('app-fax', $fc_simu_fax, '', new ext_goto('1', 's', 'ext-fax-legacy'
+  $ext->add('app-fax', 'h', '', new ext_macro('hangupcall
+}
+ 
-}
-
@@ -291 +284 @@
-    
-    //dont allow detection to be set if we have no valid detection types
-&&!$fax_sip_faxdetect
+ && !$fax_sip_faxdetect && !$fax_detect['nvfax']
-      $js="if ($(this).val() == 'true'){alert('"._('No fax detection methods found or no valid licences. Faxing cannot be enabled.')."');return false;}";
-      $html.='<td><input type="radio" name="faxenabled" value="false" CHECKED />No';
@@ -336 +329 @@
-      $html.='<table class="legacyemail" >';
-      $html.='<tr ><td><a href="#" class="info">'._("Fax Email Destination").'<span>'._('Address to email faxes to on fax detection.<br />PLEASE NOTE: In this version of FreePBX, you can now set the fax destination from a list of destinations. Extensions/Users can be fax enabled in the user/extension screen and set an email address there. This will create a new destination type that can be selected. To upgrade this option to the full destination list, select YES to Detect Faxes and select a destination. After clicking submit, this route will be upgraded. This Legacy option will no longer be available after the change, it is provided to handle legacy migrations from previous versions of FreePBX only.').'.</span></a>:</td>';
-faxlegacy
+legacy_
-      $html.='</table>';
-      $html.='<table class="faxdest27 faxdetect" style="display: none" >';
@@ -349 +342 @@
-}
-
-//TODO: modify to check for nvfaxdetect before iserting it and nothing if not there.
-//TODO: if not too lazy, put an error into notification panel
-function fax_hookGet_config($engine){
-  $fax=fax_detect();
@@ -359 +350 @@
-    foreach($routes as $current => $route){
-      if ($route['detection'] == 'nvfax' && !$fax['nvfax']) {
+        //TODO: add notificatoin to notification panel that this was skipped because NVFaxdetec not present
-        continue; // skip this one if there is no NVFaxdetect installed on this system
-      }
@@ -380 +372 @@
-        } else {
-          if (!isset($default_fax_rx_email)) {
-            //TODO Need to add error checking
-            //
-            $default_address = sql('SELECT value FROM fax_details WHERE `key` = \'fax_rx_email\'','getRow');
-            $default_fax_rx_email = $default_address[0];
@@ -403 +393 @@
-  $display=isset($_REQUEST['display'])?$_REQUEST['display']:'';
-  $action=isset($_REQUEST['action'])?$_REQUEST['action']:'';
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    fax_delete_incoming($extdisplay); //remove mature entry on edit or delete
-||$action == 'addIncoming')&& $enabled=='tru
+ || $action == 'addIncoming') && $enabled != 'fals
-      fax_save_incoming($cidnum,$extension,$enabled,$detection,$detectionwait,$dest,$legacy_email);
-    }
@@ -425 +418 @@
-function fax_save_incoming($cidnum,$extension,$enabled,$detection,$detectionwait,$dest,$legacy_email){
-  global $db;
-quoteSmart
+escapeSimple
-}
-
@@ -446 +439 @@
-  global $asterisk_conf;
-  return true;
-  //TODO Fix This Later
-    /*
-   * kepping this always set to true for freepbx 2.7 as we cant currently properly detect this - MB
-   * 
-   */
-  //these files probobly shouldnt be hardcoded
-  $files=array('sip_general_additional.conf','sip_general_custom.conf','sip_custom.conf');
-  foreach($files as $file){$set.=parse_ini_file($file);}//read setting from files
-  return ($set['faxdetect'] == 'yes');
-}
-