Changeset 8685

Timestamp:

01/25/10 23:41:45 (3 years ago)

Author:

p_lindheimer

Message:

add rxfax/spandsp option and skip nvfax if not installed re #4007

Files:

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

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

@@ -93 +93 @@
-  if ($amp_conf['AMPENGINE'] == 'asterisk' && isset($astman) && $astman->connected()) {
-    //check for fax modules
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-    $response = $astman->send_request('Command', array('Command' => 'module show like app_nv_faxdetect.so'));
-
-
-
+
+
-    //get license count
-    $lic = $astman->send_request('Command', array('Command' => 'fax show stats'));
@@ -111 +120 @@
-
-function fax_get_config($engine){
+
-  $fax=fax_detect();
- == 'app_fax' || $fax['module'] == 'res_fax'
+
-    global $ext;
-    global $amp_conf;
+    global $core_conf;
+    global $version;
+
+    if (version_compare($version, '1.6', 'ge') && isset($core_conf) && is_a($core_conf, "core_conf")) {
+      $core_conf->addSipGeneral('faxdetect','yes');
+    }
-    $dests=fax_get_destinations();
-    $sender_address=sql('SELECT value FROM fax_details WHERE `key` = \'sender_address\'','getRow');
@@ -123 +139 @@
-        $ext->add($context, $exten, '', new ext_noop('Reciving Fax for Fax Recipient: '.$row['name'].' ('.$row['user'].'), From: ${CALLERID(all)}'));
-        $ext->add($context, $exten, '', new ext_set('TO', '"'.$row['faxemail'].'"'));     
-
+
+
+
+
+
-      }
-      $ext->add($context, 'h', '', new ext_execif('$["${TO}" != ""]','system','\'${ASTVARLIBDIR}/bin/fax-process.pl --to ${TO} --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\''));
@@ -137 +157 @@
-  $exten = 's';
-  $ext->add($context, $exten, '', new ext_noop('Reciving Fax for Fax Recipient: ${FAX_RX_EMAIL} , From: ${CALLERID(all)}'));
-
+
+
+
+
+
-  $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\''));
-
@@ -297 +321 @@
-    //$html.='<option value="Auto"'.($faxdetection == 'auto' ? 'SELECTED' : '').'>'. _("Auto").'</option>';<li>Auto: allow the system to chose the best fax detection method</li>   
-    $html.='<option value="dahdi" '.($fax['detection'] == 'dahdi' ? 'SELECTED' : '').' '.($fax_dahdi_faxdetect?'':'disabled').'>'.$dahdi.'</option>';
-ahdi['module']=='nv_fax'
+etect['nvfax']
-    $html.='<option value="sip" '.($fax['detection'] == 'sip' ? 'SELECTED' : '').' '.((($info['version'] >= "1.6.2") && $fax_sip_faxdetect)?'':'disabled').'>'. _("Sip").'</option>';
-    $html.='</select></td></tr>';
@@ -325 +349 @@
-}
-
+//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();
- == 'app_fax' || $fax['module'] == 'res_fax'
+
-    global $ext;
-    global $engine;
-    $routes=fax_get_incoming();
-    foreach($routes as $current => $route){
+      if ($route['detection'] == 'nvfax' && !$fax['nvfax']) {
+        continue; // skip this one if there is no NVFaxdetect installed on this system
+      }
-      if($route['extension']=='' && $route['cidnum']){//callerID only
-        $extension='s/'.$route['cidnum'];
@@ -401 +430 @@
-function fax_save_settings($settings){
-  global $db;
-
+if (is_array($settings)) 
-    sql("REPLACE INTO fax_details (`key`, `value`) VALUES ('".$key."','".$db->escapeSimple($value)."')");
-  }