Changeset 8612

Timestamp:

01/14/10 17:22:41 (3 years ago)

Author:

mbrevda

Message:

re #4007; replace multipal intances of functions with variables

Files:

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

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

@@ -255 +255 @@
-    //TODO: we want to get rid of this since it will be 2.7 only...
-    //
+    $fax_dahdi_faxdetect=fax_dahdi_faxdetect();
+    $fax_sip_faxdetect=fax_sip_faxdetect();
+    $dahdi=ast_with_dahdi()?_('Dahdi'):_('Zaptel');
+    $fax_detect=fax_detect();
-    $html='<script type="text/javascript">$(document).ready(function(){
-    $("input[name=Submit]").click(function(){
-      if($("input[name=faxenabled]:checked").val()=="true" && !$("input[name=gotoFAX]:checked").val()){//ensure the user selected a fax destination
-
-
-
-
-
+
-    $html .= '<tr><td colspan="2"><h5>';
-    $html .= _("Fax Detect");
-    $html .= '<hr></h5></td></tr>';
-fax_detect()
-
+$fax_detect
+/*
-      $html .= '<table><tr><td><style>.faxerror{color:red; '.(($faxenabled == 'no')?'':'display: none;').'}</style><span class=faxerror>'._('It seems that you dont have fax receving modules installed in Asterisk or Asterisk is unreachable.<br/> Fax-related dialplan will <strong>NOT</strong> be generated!<br /> Please contact your vendor for more information.').'</span></td></tr></table>';
-
+*/
-    if($fax['module'] == 'res_fax' && $fax['license'] < 1){//error message if there are no fax licenses
-      $html .= '<table><tr><td><style>.faxerror{color:red; '.(($faxenabled == 'no')?'':'display: none;').'}</style><span class=faxerror>'._('It seems that you dont have any fax licenses on this system. Fax-related dialplan will <strong>NOT</strong> be generated!<br /> Please contact your vendor for more information.').'</span></td></tr></table>';
@@ -276 +276 @@
-    $html .= '<td><a href="#" class="info">';
-    $html .= _("Detect Faxes").'<span>'._("Attemp to detect faxes on this DID.<ul><li>No: No attempts are made to auto-determain the call type; all calls sent to destination below. Use this option if this DID is used exclusevly for voice OR fax.</li><li>Yes: try to auto determain the type of call; route to the fax destination if call is a fax, otherwise send to regular destination. Use this option if you receive both voice and fax calls on this line</li></ul>").'.</span></a>:</td>';
-    //js to show/hide the detection type/time/destination
-    $js = "if ($('input[name=extension]').val() == ''){//disable if there is no did
-              alert('"._('Fax detection can only be enabled when the Inbound Route contains a DID')."');return false;
-          }
-          if ($(this).val() == 'true'){
-            $('.faxdetect').slideDown();
-            $('select[name=faxdetection]').trigger('click');
-          }else{
-            $('.faxdetect').slideUp();
-            $('select[name=faxdetection]').trigger('click');
-          }
-          if(\$(this).val() == 'true'){\$('.faxerror').show();}else{\$('.faxerror').hide();//show error notice if it exists, only when using faxdetect
-          }";
-    $html .= '<td><input type="radio" name="faxenabled" value="false" CHECKED onclick="'.$js.'"/>No';
-    $html .= '<input type="radio" name="faxenabled" value="true" '.(($faxenabled == 'yes')?'CHECKED':'').' onclick="'.$js.'"/>Yes</td></tr>';
-    $html .= '</table>';
-    
+    //dont allow detection to be set if we have no valid detection types
+    if(!$fax_dahdi_faxdetect&&!$fax_sip_faxdetect){
+      $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';
+      $html .= '<input type="radio" name="faxenabled" value="true"  onclick="'.$js.'"/>Yes</td></tr>';
+      $html .= '</table>';
+    }else{//show detection options
+      //js to show/hide the detection type/time/destination
+      $js = "if ($('input[name=extension]').val() == ''){//disable if there is no did
+                alert('"._('Fax detection can only be enabled when the Inbound Route contains a DID')."');return false;
+            }
+            if ($(this).val() == 'true'){
+              $('.faxdetect').slideDown();
+              $('select[name=faxdetection]').trigger('click');
+            }else{
+              $('.faxdetect').slideUp();
+              $('select[name=faxdetection]').trigger('click');
+            }
+            if(\$(this).val() == 'true'){\$('.faxerror').show();}else{\$('.faxerror').hide();//show error notice if it exists, only when using faxdetect
+            }";
+      $html .= '<td><input type="radio" name="faxenabled" value="false" CHECKED onclick="'.$js.'"/>No';
+      $html .= '<input type="radio" name="faxenabled" value="true" '.(($faxenabled == 'yes')?'CHECKED':'').' onclick="'.$js.'"/>Yes</td></tr>';
+      $html .= '</table>';
+    } 
-    //fax detection+destinations
-    $html .= '<table class=faxdetect '.($faxdetection?'':'style="display: none;"').'>'; 
-    $info = engine_getinfo();
-"Fax Detection type").'<span>'._("Type of fax detection to use.<ul><li>".(ast_with_dahdi()?"Dahdi":"Zaptel").": use ".(ast_with_dahdi()?"Dahdi":"Zaptel")." fax detection; requires 'faxdetect=' to be set to 'incoming' or 'both' in ".(ast_with_dahdi()?"dahdi":"zaptel")
+'Fax Detection type').'<span>'._("Type of fax detection to use.<ul><li>".$dahdi.": use ".$dahdi." fax detection; requires 'faxdetect=' to be set to 'incoming' or 'both' in ".$dahdi
-    $html .= '<td><select name="faxdetection" tabindex="'.++$tabindex.'">';
-    //$html .= '<option value="Auto"'.($faxdetection == 'auto' ? 'SELECTED' : '').'>'. _("Auto").'</option>';<li>Auto: allow the system to chose the best fax detection method</li>
-fax_dahdi_faxdetect()?'':'disabled').'>'. _((ast_with_dahdi()?"Dahdi":"Zaptel"))
-fax_sip_faxdetect()
+$fax_dahdi_faxdetect?'':'disabled').'>'.$dahdi
+$fax_sip_faxdetect
-/*
- * code for nvfaxdetect. I'm not sure if we should be offering this, 
@@ -314 +324 @@
-*/  
-    //if we cant find ANY valid faxdetect type, then dont show options  
-fax_detect()&& fax_dahdi_faxdetect()?'':'style="display: none;"').'><td><a href="#" class="info">'._("Fax Detection Time").'<span>'._('How long to wait and try to detect fax. Please note that callers to a '.(ast_with_dahdi()?"dahdi":"zaptel")
+$fax_detect&& $fax_dahdi_faxdetect?'':'style="display: none;"').'><td><a href="#" class="info">'._("Fax Detection Time").'<span>'._('How long to wait and try to detect fax. Please note that callers to a '.$dahdi
-    $html .= '<td><select name="faxdetectionwait" tabindex="'.++$tabindex.'">';
-    if(!$faxdetectionwait){$faxdetectionwait=4;}//default wait time is 4 second
@@ -322 +332 @@
-    //if we cant find ANY valid faxdetect type, then dont show options  
-    $html .= '</select></td></tr>';
-
+
+
-    $html .= '</tr>';
-fax_detect()
+$fax_detect
-    $html .= '</table>';
-    $html .= '<table>';