Changeset 14150

Timestamp:

06/18/12 11:52:43 (1 year ago)

Author:

mbrevda

Message:

fax code cleanup; advanced setting wrtietimeout manager support; add port option to backups; closes #5871; #5823;

Files:

• modules/branches/2.10/backup/functions.inc/class.backup.php (modified) (5 diffs)
• modules/branches/2.10/core/page.advancedsettings.php (modified) (1 diff)
• modules/branches/2.10/fax/bin/fax2mail.php (modified) (3 diffs)
• modules/branches/2.10/fax/functions.inc.php (modified) (7 diffs)
• modules/branches/2.10/fax/install.php (modified) (1 diff)
• modules/branches/2.10/findmefollow/functions.inc.php (modified) (1 diff)

modules/branches/2.10/backup/functions.inc/class.backup.php

@@ -93 +93 @@
-
-  function init() {
-//
+
-    $this->b['_tmpdir']   = $this->amp_conf['ASTSPOOLDIR'] . '/tmp/backup-' . $this->b['id'];
-    $this->b['_tmpfile']  = $this->amp_conf['ASTSPOOLDIR'] . '/tmp/' . $this->b['_file'] . '.tgz';
@@ -360 +360 @@
-          $cmd[] = $s['key'];
-          $cmd[] = $s['user'] . '\@' . $s['host'];
+          $cmd[] = '-p ' . $s['port'];
-          $cmd[] = 'mkdir -p ' . $s['path'] 
-              . '/' . $this->b['_dirname'];
@@ -369 +370 @@
-          $cmd[] = fpbx_which('scp');
-          $cmd[] = '-o StrictHostKeyChecking=no -i';
+          $cmd[] = '-P ' . $s['port'];
-          $cmd[] = $s['key'];
-          $cmd[] = $this->b['_tmpfile'];
@@ -511 +513 @@
-        $cmd[] = $data['key'];
-        $cmd[] = $data['user'] . '\@' . $data['host'];
+        $cmd[] = '-p ' . $data['port'];
-        $cmd[] = 'ls -1 ' . $data['path'] . '/' . $this->b['_dirname'];
-        exec(implode(' ', $cmd), $dir);
@@ -568 +571 @@
-          $cmd[] = $data['key'];
-          $cmd[] = $data['user'] . '\@' . $data['host'];
+          $cmd[] = '-p ' . $data['port'];
-          $cmd[] = 'rm ' . $data['path'] . '/' . '/' . $this->b['_dirname'] . '/' . $file;
-          exec(implode(' ', $cmd));

modules/branches/2.10/core/page.advancedsettings.php

@@ -36 +36 @@
-        case 'AMPMGRUSER':
-          fpbx_ami_update($var['value'], false);
+        break;
+        case 'ASTMGRWRITETIMEOUT':
+          fpbx_ami_update(false, false, true);
-        break;
-      }

modules/branches/2.10/fax/bin/fax2mail.php

@@ -7 +7 @@
-}
-
-
-
+
-$var['from']    = sql('SELECT value FROM fax_details WHERE `key` = "sender_address"','getOne');
-$var['from']    = $var['from'] ? $var['from'] : 'fax@freepbx.pbx';
@@ -14 +13 @@
-$var        = array_merge($var, get_opt());
-$var['callerid']  = $var['callerid'] === true ? '' : $var['callerid'];//prevent callerid from being blank
+$var['keep_file'] = $var['delete'] == 'true' ? false : true;
-
-
+ 
-foreach ($var as $k => $v) {
-  switch ($k) {
@@ -42 +42 @@
-
-//if file is a tif, try to convert it to a pdf
-
-
-
+
-
-$msg = 'Enclosed, please find a new fax ';

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

@@ -140 +140 @@
-function fax_delete_incoming($extdisplay){
-  global $db;
-
-
+
+
+
+
+
+
+
+
-}
-
-function fax_delete_user($faxext) {
-       global $db;
-=
-.$faxext.
+ = 
+ . $faxext . 
-}
-
@@ -256 +262 @@
-        $ext->add($context, $exten, '', new ext_noop('Receiving Fax for: ${FAX_FOR}, From: ${CALLERID(all)}'));
-        $ext->add($context, $exten, '', new ext_set('FAX_RX_EMAIL', $row['faxemail']));     
-    
+   
-      }
-    }
@@ -315 +321 @@
-    $ext->add($context, $exten, '', new ext_noop_trace('PROCESSING FAX with status: [${FAXSTATUS}] for: [${FAX_RX_EMAIL}], From: [${CALLERID(all)}]'));
-    $ext->add($context, $exten, 'process', new ext_gotoif('$[${LEN(${FAX_RX_EMAIL})} = 0]','noemail'));
-
+
+
+
-
-    $ext->add($context, $exten, 'end', new ext_macro('hangupcall'));
@@ -391 +399 @@
-}
-
-
+ = ''
-  global $db;
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  return $settings;
-}
@@ -427 +441 @@
-  if(!$extension && !$cidnum){//set $extension,$cidnum if we dont already have them
-    if ($extdisplay) {
-=
-=
-=$opts['1']
+    = 
+ = 
+    = isset($opts['1']) ? $opts['1'] : ''
-    } else {
-      $extension = $cidnum = '';
@@ -625 +639 @@
-}
-
-)
+ = '') 
-  global $db;
-
-
-
-
+
+
+
+
+
-}
-
-function fax_sip_faxdetect(){
-  global $asterisk_conf;
- 
+  
-}
-
@@ -662 +677 @@
-}
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    return false;
-  }
-  
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-?>

modules/branches/2.10/fax/install.php

@@ -272 +272 @@
-  out(_("already done"));
-}
+
+$set['value'] = 'www.freepbx.org';
+$set['defaultval'] =& $set['value'];
+$set['readonly'] = 1;
+$set['hidden'] = 1;
+$set['module'] = '';
+$set['category'] = 'Styling and Logos';
+$set['emptyok'] = 0;
+$set['name'] = 'tiff2pdf Author';
+$set['description'] = "Author to pass to tiff2pdf's -a option";
+$set['type'] = CONF_TYPE_TEXT;
+$freepbx_conf =& freepbx_conf::create();
+$freepbx_conf->define_conf_setting('PDFAUTHOR', $set, true);
-?>

modules/branches/2.10/findmefollow/functions.inc.php

@@ -544 +544 @@
-// extensions and users.
-//
-
+isset($amp_conf['FOLLOWME_AUTO_CREATE']) && 
-  function findmefollow_configprocess() {
-    global $amp_conf;