Changeset 8759

Timestamp:

02/02/10 06:27:05 (2 years ago)

Author:

mbrevda

Message:

#closed

Files:

• modules/branches/2.7/fax/functions.inc.php (modified) (2 diffs)
• modules/branches/2.7/fax/module.xml (modified) (2 diffs)

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

@@ -254 +254 @@
-    die_freepbx($results->getMessage()."<br><br>Error selecting from fax"); 
-  }
-  /*
-   *
-   * this may or may not work to include a system default destination
-   * Rememebr to reenable defautl destination in the gui as well
-   *       
-  //get system default fax destination
-  $sql='SELECT * FROM fax_details WHERE `key` = ? OR `key` = ?';
-  $system = $db->getAssoc($sql,  false, array('system_instance', 'system_fax2email'), DB_FETCHMODE_ASSOC);
-  if ($system_fax2email != 'disabled'){// if system default is enabled
-    if($system_fax2email == 'system'){
-      $sys=array('user' => 'system', 'faxemail' => $systemfax2email, 'name' => 'System Default');
-    }else{//find user, loop thru the $result of the previous fetch which lists all users/emails
-      foreach($result as $res => $user){
-        if ($user['user'] == $system_instance){
-          $systemfax2email = $user['faxemail'];
-          break;
-        }
-      } 
-      $sys=array('user' => 'system', 'faxemail' => $systemfax2email, 'name' => 'System Default');
-    }
-    array_unshift($results, $sys);
-  }
-  *
-  *
-  */
-  return $results;
-}
@@ -364 +339 @@
-      $html.='<input type="radio" name="faxenabled" value="true"  onclick="'.$js.'"/>Yes</td></tr>';
-      $html.='</table>';
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-      $html.='<td><input type="radio" name="faxenabled" value="false" CHECKED onclick="'.$js.'"/>No';
+      $js="$('.legacyemail').slideUp('400',function(){
+            $('.faxdetect').slideDown()
+          });";
-      $html.='<input type="radio" name="faxenabled" value="true" '.($fax?'CHECKED':'').' onclick="'.$js.'"/>Yes';
-      if($fax['legacy_email']!==null){
+        $js="$('.faxdest27').slideUp('400',function(){ 
+              $('.faxdetect, .legacyemail').not($('.faxdest27')).slideDown();
+          });";
-        $html.='<input type="radio" name="faxenabled" value="legacy" CHECKED onclick="'.$js.'"/>Legacy';
-      }

modules/branches/2.7/fax/module.xml

@@ -2 +2 @@
-  <rawname>fax</rawname>
-  <name>Fax Configuration</name>
-3
+4
-  <publisher>Schmoozecom.com</publisher>
-  <license>GPLv2+</license>
@@ -12 +12 @@
-  <description>Adds configurations, options and GUI for inbound faxing</description>
-  <changelog>
+    *2.7.0.4* #4021
-    *2.7.0.3* #4020
-    *2.7.0.2* #4019