dbxe
/
fusionpbx
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix implode paramater order and few other minor edits.

This commit is contained in:
FusionPBX 2022-05-13 11:44:41 -06:00 committed by GitHub
parent 22db796b11
commit 58fc71fce9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
secure/fax_to_email.php
View File

@ -42,7 +42,7 @@ if (defined('STDIN')) {
$IS_WINDOWS = stristr(PHP_OS, 'WIN') ? true : false; $IS_WINDOWS = stristr(PHP_OS, 'WIN') ? true : false;
if (!function_exists('exec_in_dir')) { if (!function_exists('exec_in_dir')) {
function exec_in_dir($dir, $cmd, &$ok){ function exec_in_dir($dir, $cmd, &$ok) {
$args = func_get_args(); $args = func_get_args();
$cwd = getcwd(); $cwd = getcwd();
chdir($dir); chdir($dir);
@ -52,7 +52,7 @@ if (!function_exists('exec_in_dir')) {
if ($cwd) if ($cwd)
chdir($cwd); chdir($cwd);
$ok = ($ret == 0); $ok = ($ret == 0);
return join($output, "\n"); return implode("\n", $output);
} }
} }
@ -83,23 +83,23 @@ if (!function_exists('path_join')) {
$path = trim( $path, '/' ); $path = trim( $path, '/' );
} }
if ($prefix === null){ if ($prefix === null) {
return ''; return '';
} }
$paths = array_filter($paths); $paths = array_filter($paths);
return $prefix . join('/', $paths); return $prefix . implode('/', $paths);
} }
} }
if (!function_exists('tiff2pdf')) { if (!function_exists('tiff2pdf')) {
function tiff2pdf($tiff_file_name){ function tiff2pdf($tiff_file_name) {
//convert the tif to a pdf //convert the tif to a pdf
//Ubuntu: apt-get install libtiff-tools //Ubuntu: apt-get install libtiff-tools
global $IS_WINDOWS; global $IS_WINDOWS;
if (!file_exists($tiff_file_name)){ if (!file_exists($tiff_file_name)) {
echo "tiff file does not exists"; echo "tiff file does not exists";
return false; // "tiff file does not exists"; return false; // "tiff file does not exists";
} }
@ -108,18 +108,18 @@ if (!function_exists('tiff2pdf')) {
$tiff_file = pathinfo($tiff_file_name); $tiff_file = pathinfo($tiff_file_name);
$dir_fax = $tiff_file['dirname']; $dir_fax = $tiff_file['dirname'];
$fax_file_name = $tiff_file['filename']; $fax_file_name = $tiff_file['filename'];
$pdf_file_name = path_join( $dir_fax, $fax_file_name . '.pdf' ); $pdf_file_name = path_join($dir_fax, $fax_file_name . '.pdf');
if (file_exists($pdf_file_name)) { if (file_exists($pdf_file_name)) {
return $pdf_file_name; return $pdf_file_name;
} }
$dir_fax_temp = $_SESSION['server']['temp']['dir']; $dir_fax_temp = $_SESSION['server']['temp']['dir'];
if (!$dir_fax_temp){ if (!$dir_fax_temp) {
$dir_fax_temp = path_join(dirname($dir_fax), 'temp'); $dir_fax_temp = path_join(dirname($dir_fax), 'temp');
} }
if (!file_exists($dir_fax_temp)){ if (!file_exists($dir_fax_temp)) {
echo "can not create temporary directory"; echo "can not create temporary directory";
return false; // return false; //
} }
@ -127,7 +127,7 @@ if (!function_exists('tiff2pdf')) {
$cmd = "tiffinfo " . correct_path($tiff_file_name) . ' | grep "Resolution:"'; $cmd = "tiffinfo " . correct_path($tiff_file_name) . ' | grep "Resolution:"';
$ok = false; $ok = false;
$resp = exec_in_dir($dir_fax, $cmd, $ok); $resp = exec_in_dir($dir_fax, $cmd, $ok);
if (!$ok){ if (!$ok) {
echo "can not find fax resoulution"; echo "can not find fax resoulution";
return false; // "can not find fax resoulution" return false; // "can not find fax resoulution"
} }
@ -135,14 +135,14 @@ if (!function_exists('tiff2pdf')) {
$ppi_w = 0; $ppi_w = 0;
$ppi_h = 0; $ppi_h = 0;
$tmp = array(); $tmp = array();
if (preg_match('/Resolution.*?(\d+).*?(\d+)/', $resp, $tmp)){ if (preg_match('/Resolution.*?(\d+).*?(\d+)/', $resp, $tmp)) {
$ppi_w = $tmp[1]; $ppi_w = $tmp[1];
$ppi_h = $tmp[2]; $ppi_h = $tmp[2];
} }
$cmd = "tiffinfo " . $tiff_file_name . ' | grep "Image Width:"'; $cmd = "tiffinfo " . $tiff_file_name . ' | grep "Image Width:"';
$resp = exec_in_dir($dir_fax, $cmd, $ok); $resp = exec_in_dir($dir_fax, $cmd, $ok);
if (!$ok){ if (!$ok) {
echo "can not find fax size"; echo "can not find fax size";
return false; // "can not find fax size" return false; // "can not find fax size"
} }
@ -150,7 +150,7 @@ if (!function_exists('tiff2pdf')) {
$pix_w = 0; $pix_w = 0;
$pix_h = 0; $pix_h = 0;
$tmp = array(); $tmp = array();
if (preg_match('/Width.*?(\d+).*?Length.*?(\d+)/', $resp, $tmp)){ if (preg_match('/Width.*?(\d+).*?Length.*?(\d+)/', $resp, $tmp)) {
$pix_w = $tmp[1]; $pix_w = $tmp[1];
$pix_h = $tmp[2]; $pix_h = $tmp[2];
} }
@ -177,14 +177,14 @@ if (!function_exists('tiff2pdf')) {
$page_width = sprintf('%.4f', $page_width); $page_width = sprintf('%.4f', $page_width);
$page_height = sprintf('%.4f', $page_height); $page_height = sprintf('%.4f', $page_height);
$cmd = join(array('tiff2pdf', $cmd = implode(' ', array('tiff2pdf',
'-o', correct_path($pdf_file_name), '-o', correct_path($pdf_file_name),
correct_path($tiff_file_name), correct_path($tiff_file_name),
), ' '); ));
$resp = exec_in_dir($dir_fax, $cmd, $ok); $resp = exec_in_dir($dir_fax, $cmd, $ok);
if (!file_exists($pdf_file_name)){ if (!file_exists($pdf_file_name)) {
echo "can not create pdf: $resp"; echo "can not create pdf: $resp";
return false; return false;
} }
@ -194,10 +194,10 @@ if (!function_exists('tiff2pdf')) {
} }
if (!function_exists('fax_split_dtmf')) { if (!function_exists('fax_split_dtmf')) {
function fax_split_dtmf(&$fax_number, &$fax_dtmf){ function fax_split_dtmf(&$fax_number, &$fax_dtmf) {
$tmp = array(); $tmp = array();
$fax_dtmf = ''; $fax_dtmf = '';
if (preg_match('/^\s*(.*?)\s*\((.*)\)\s*$/', $fax_number, $tmp)){ if (preg_match('/^\s*(.*?)\s*\((.*)\)\s*$/', $fax_number, $tmp)) {
$fax_number = $tmp[1]; $fax_number = $tmp[1];
$fax_dtmf = $tmp[2]; $fax_dtmf = $tmp[2];
} }
@ -362,7 +362,7 @@ if (!function_exists('fax_split_dtmf')) {
$pdf_file = tiff2pdf($fax_file); $pdf_file = tiff2pdf($fax_file);
echo "file: $pdf_file \n"; echo "file: $pdf_file \n";
if (!$pdf_file){ if (!$pdf_file) {
$fax_file_warning = 'warning: Fax image not available on server.'; $fax_file_warning = 'warning: Fax image not available on server.';
} }
else{ else{
@ -420,7 +420,7 @@ if (!function_exists('fax_split_dtmf')) {
fax_split_dtmf($fax_forward_number, $fax_dtmf); fax_split_dtmf($fax_forward_number, $fax_dtmf);
$fax_send_mode = $_SESSION['fax']['send_mode']['text']; $fax_send_mode = $_SESSION['fax']['send_mode']['text'];
if (strlen($fax_send_mode) == 0){ if (strlen($fax_send_mode) == 0) {
$fax_send_mode = 'direct'; $fax_send_mode = 'direct';
} }