\n";
- echo " \n";
- echo "
";
-
//show the header
- //$text['title-fax_files']
- //$text['description-fax_file']
- echo "\n";
+ echo "\n";
echo " \n";
echo " \n";
if ($_REQUEST['box'] == 'inbox' && permission_exists('fax_inbox_view')) {
@@ -159,7 +200,6 @@ else {
if ($_REQUEST['box'] == 'sent') {
$sql .= "and fax_mode = 'tx' ";
}
- if (strlen($order_by)> 0) { $sql .= "order by $order_by $order "; }
$prep_statement = $db->prepare($sql);
if ($prep_statement) {
$prep_statement->execute();
@@ -173,12 +213,12 @@ else {
}
//prepare to page the results
- $rows_per_page = 10;
- $param = "";
+ $rows_per_page = 50;
+ $param = "&id=".$_GET['id']."&box=".$_GET['box']."&order_by=".$_GET['order_by']."&order=".$_GET['order'];
$page = $_GET['page'];
- if (strlen($page) == 0) { $page = 0; $_GET['page'] = 0; }
- list($paging_controls, $rows_per_page, $var3) = paging($num_rows, $param, $rows_per_page);
- $offset = $rows_per_page * $page;
+ if (strlen($page) == 0) { $page = 0; $_GET['page'] = 0; }
+ list($paging_controls, $rows_per_page, $var3) = paging($num_rows, $param, $rows_per_page);
+ $offset = $rows_per_page * $page;
//get the list
$sql = "select * from v_fax_files ";
@@ -190,7 +230,7 @@ else {
if ($_REQUEST['box'] == 'sent') {
$sql .= "and fax_mode = 'tx' ";
}
- if (strlen($order_by)> 0) { $sql .= "order by $order_by $order "; }
+ $sql .= "order by ".((strlen($order_by) > 0) ? $order_by.' '.$order : "fax_date desc")." ";
$sql .= "limit $rows_per_page offset $offset ";
$prep_statement = $db->prepare(check_sql($sql));
$prep_statement->execute();
@@ -203,21 +243,18 @@ else {
$row_style["0"] = "row_style0";
$row_style["1"] = "row_style1";
- echo "\n";
echo " \n";
echo "\n";
+ echo th_order_by('fax_caller_id_name', $text['label-fax_caller_id_name'], $order_by, $order, "&id=".$_GET['id']."&box=".$_GET['box']."&page=".$_GET['page']);
+ echo th_order_by('fax_caller_id_number', $text['label-fax_caller_id_number'], $order_by, $order, "&id=".$_GET['id']."&box=".$_GET['box']."&page=".$_GET['page']);
+ if ($_REQUEST['box'] == 'sent') {
+ echo th_order_by('fax_destination', $text['label-fax_destination'], $order_by, $order, "&id=".$_GET['id']."&box=".$_GET['box']."&page=".$_GET['page']);
+ }
echo "| ".$text['table-file']." | \n";
echo "".$text['table-view']." | \n";
- echo th_order_by('fax_number', $text['label-fax_number'], $order_by, $order);
- //echo th_order_by('fax_file_type', $text['label-fax_file_type'], $order_by, $order);
- //echo th_order_by('fax_file_path', $text['label-fax_file_path'], $order_by, $order);
- echo th_order_by('fax_caller_id_name', $text['label-fax_caller_id_name'], $order_by, $order);
- echo th_order_by('fax_caller_id_number', $text['label-fax_caller_id_number'], $order_by, $order);
- echo th_order_by('fax_date', $text['label-fax_date'], $order_by, $order);
- //echo th_order_by('fax_epoch', $text['label-fax_epoch'], $order_by, $order);
- //echo th_order_by('fax_base64', $text['label-fax_base64'], $order_by, $order);
- echo " | \n";
- echo " \n";
+ echo th_order_by('fax_date', $text['label-fax_date'], $order_by, $order, "&id=".$_GET['id']."&box=".$_GET['box']."&page=".$_GET['page']);
+ echo "| | \n";
+ echo " \n";
if ($result_count > 0) {
foreach($result as $row) {
$file = basename($row['fax_file_path']);
@@ -239,43 +276,85 @@ else {
file_put_contents($dir_fax_sent.'/'.$file, base64_decode($row['fax_base64']));
}
}
-
- }
- //convert the tif to pdf
- if (!file_exists($dir_fax_inbox.'/'.$file_name.".pdf")) {
- if ($_REQUEST['box'] == 'inbox' && permission_exists('fax_inbox_view')) {
- chdir($dir_fax_inbox);
- if (is_file("/usr/local/bin/tiff2pdf")) {
- exec("/usr/local/bin/tiff2pdf -f -o ".$file_name.".pdf ".$dir_fax_inbox.'/'.$file_name.".tif");
- }
- if (is_file("/usr/bin/tiff2pdf")) {
- exec("/usr/bin/tiff2pdf -f -o ".$file_name.".pdf ".$dir_fax_inbox.'/'.$file_name.".tif");
- }
- }
- if ($_REQUEST['box'] == 'sent' && permission_exists('fax_sent_view')) {
- chdir($dir_fax_sent);
- if (is_file("/usr/local/bin/tiff2pdf")) {
- exec("/usr/local/bin/tiff2pdf -f -o ".$file_name.".pdf ".$dir_fax_sent.'/'.$file_name.".tif");
- }
- if (is_file("/usr/bin/tiff2pdf")) {
- exec("/usr/bin/tiff2pdf -f -o ".$file_name.".pdf ".$dir_fax_sent.'/'.$file_name.".tif");
- }
- }
}
- echo "\n";
- echo " \n";
- echo " \n";
+ //convert the tif to pdf
+ unset($dir_fax);
if ($_REQUEST['box'] == 'inbox' && permission_exists('fax_inbox_view')) {
- echo " \n";
+ if (!file_exists($dir_fax_inbox.'/'.$file_name.".pdf")) {
+ $dir_fax = $dir_fax_inbox;
+ }
}
if ($_REQUEST['box'] == 'sent' && permission_exists('fax_sent_view')) {
- echo " \n";
+ if (!file_exists($dir_fax_sent.'/'.$file_name.".pdf")) {
+ $dir_fax = $dir_fax_sent;
+ }
+ }
+ if ($dir_fax != '') {
+ chdir($dir_fax);
+ //get fax resolution (ppi, W & H)
+ $resp = exec("tiffinfo ".$file_name.".tif | grep 'Resolution:'");
+ $resp_array = explode(' ', trim($resp));
+ $ppi_w = (int) $resp_array[1];
+ $ppi_h = (int) $resp_array[2];
+ unset($resp_array);
+ $gs_r = $ppi_w.'x'.$ppi_h; //used by ghostscript
+ //get page dimensions/size (pixels/inches, W & H)
+ $resp = exec("tiffinfo ".$file_name.".tif | grep 'Image Width:'");
+ $resp_array = explode(' ', trim($resp));
+ $pix_w = $resp_array[2];
+ $pix_h = $resp_array[5];
+ unset($resp_array);
+ $gs_g = $pix_w.'x'.$pix_h; //used by ghostscript
+ $page_width = $pix_w / $ppi_w;
+ $page_height = $pix_h / $ppi_h;
+ if ($page_width > 8.4 && $page_height > 13) {
+ $page_width = 8.5;
+ $page_height = 14;
+ $page_size = 'legal';
+ }
+ else if ($page_width > 8.4 && $page_height < 12) {
+ $page_width = 8.5;
+ $page_height = 11;
+ $page_size = 'letter';
+ }
+ else if ($page_width < 8.4 && $page_height > 11) {
+ $page_width = 8.3;
+ $page_height = 11.7;
+ $page_size = 'a4';
+ }
+ //generate pdf (a work around, as tiff2pdf improperly inverts the colors)
+ $cmd_tif2pdf = "tiff2pdf -i -u i -p ".$page_size." -w ".$page_width." -l ".$page_height." -f -o ".$dir_fax_temp.'/'.$file_name.".pdf ".$dir_fax.'/'.$file_name.".tif";
+ //echo $cmd_tif2pdf."
";
+ exec($cmd_tif2pdf);
+ chdir($dir_fax_temp);
+ $cmd_pdf2tif = "gs -q -sDEVICE=tiffg3 -r".$gs_r." -g".$gs_g." -dNOPAUSE -sOutputFile=".$file_name."_temp.tif -- ".$file_name.".pdf -c quit";
+ //echo $cmd_pdf2tif."
";
+ exec($cmd_pdf2tif); //convert pdf to tif
+ @unlink($dir_fax_temp.'/'.$file_name.".pdf");
+ $cmd_tif2pdf = "tiff2pdf -i -u i -p ".$page_size." -w ".$page_width." -l ".$page_height." -f -o ".$dir_fax.'/'.$file_name.".pdf ".$dir_fax_temp.'/'.$file_name."_temp.tif";
+ //echo $cmd_tif2pdf."
";
+ exec($cmd_tif2pdf);
+ @unlink($dir_fax_temp.'/'.$file_name."_temp.tif");
+ }
+ echo " | ";
+ echo "\n";
+ echo " | ".$row['fax_caller_id_name']." | \n";
+ echo " ".format_phone($row['fax_caller_id_number'])." | \n";
+ if ($_REQUEST['box'] == 'sent') {
+ echo " ".format_phone($row['fax_destination'])." | \n";
+ }
+ echo " \n";
+ if ($_REQUEST['box'] == 'inbox' && permission_exists('fax_inbox_view')) {
+ echo " \n";
+ }
+ if ($_REQUEST['box'] == 'sent' && permission_exists('fax_sent_view')) {
+ echo " \n";
}
echo " $file_name";
echo " ";
echo " | \n";
- echo " \n";
+ echo " | \n";
if ($_REQUEST['box'] == 'inbox') {
$dir_fax = $dir_fax_inbox;
}
@@ -284,65 +363,33 @@ else {
}
if (file_exists($dir_fax.'/'.$file_name.".pdf")) {
if ($_REQUEST['box'] == 'inbox' && permission_exists('fax_inbox_view')) {
- echo " \n";
+ echo " PDF\n";
}
if ($_REQUEST['box'] == 'sent' && permission_exists('fax_sent_view')) {
- echo " \n";
+ echo " PDF\n";
}
- echo " PDF";
- echo " ";
}
else {
echo " \n";
}
echo " | \n";
- //echo " ".basename($row['fax_file_path'])." | \n";
- //echo " PDF | \n";
- echo " ".$row['fax_number']." | \n";
- //echo " ".$row['fax_file_type']." | \n";
- echo " ".$row['fax_caller_id_name']." | \n";
- echo " ".$row['fax_caller_id_number']." | \n";
echo " ".date("F d Y H:i:s", strtotime($row['fax_date']))." | \n";
- //echo " ".$row['fax_epoch']." | \n";
- //echo " ".$row['fax_base64']." | \n";
- echo " ";
- //if (permission_exists('fax_file_edit')) {
- // echo "$v_link_label_edit";
- //}
+ echo " | ";
if (permission_exists('fax_file_delete')) {
echo "$v_link_label_delete";
}
echo " | \n";
echo " \n";
- if ($c==0) { $c=1; } else { $c=0; }
+ $c = ($c) ? 0 : 1;
} //end foreach
unset($sql, $result, $row_count);
} //end if results
//show the paging controls
- echo "\n";
- echo "\n";
- echo " \n";
- echo " \n";
- echo " | | \n";
- echo " $paging_controls | \n";
- echo " ";
- echo " ";
- echo " | \n";
- echo " \n";
- echo " \n";
- echo " | \n";
- echo " \n";
-
echo " ";
- echo "
";
-//close the table and div
- echo " | ";
- echo " ";
- echo " ";
- echo "";
+ echo "".$paging_controls." \n";
echo "
";
//include the footer
diff --git a/app/fax/fax_box_remote.php b/app/fax/fax_files_remote.php
similarity index 82%
rename from app/fax/fax_box_remote.php
rename to app/fax/fax_files_remote.php
index 95a6dd5c78..ddc87a7dca 100644
--- a/app/fax/fax_box_remote.php
+++ b/app/fax/fax_files_remote.php
@@ -187,11 +187,13 @@ else {
echo "\n";
echo " \n";
- echo " | ".$text['label-email_received']." | \n";
- echo " ".$text['label-email-fax']." | \n";
- echo " ".$text['label-email_size']." | \n";
+ echo " ".$text['label-fax_caller_id_name']." | \n";
+ echo " ".$text['label-fax_caller_id_number']." | \n";
+ echo " ".$text['table-file']." | \n";
+ echo " ".$text['label-email_size']." | \n";
+ echo " ".$text['label-email_received']." | \n";
if (permission_exists('fax_inbox_delete')) {
- echo " | \n";
+ echo " | \n";
}
echo " ";
@@ -202,19 +204,24 @@ else {
foreach ($emails as $email_id) {
$metadata = object_to_array(imap_fetch_overview($connection, $email_id, FT_UID));
$attachment = parse_attachments($connection, $email_id, FT_UID);
-
- echo "\n";
- echo " | ".$metadata[0]['date']." | \n";
- echo " ".$attachment[0]['filename']." | \n";
- echo " ".byte_convert(strlen($attachment[0]['attachment']))." | \n";
+ $file_name = $attachment[0]['filename'];
+ $caller_id_name = substr($file_name, 0, strpos($file_name, '-'));
+ $caller_id_number = (is_numeric($caller_id_name)) ? format_phone((int) $caller_id_name) : null;
+ echo " \n";
+ echo " | ".$caller_id_name." | \n";
+ echo " ".$caller_id_number." | \n";
+ echo " ".$file_name." | \n";
+ echo " ".byte_convert(strlen($attachment[0]['attachment']))." | \n";
+ echo " ".$metadata[0]['date']." | \n";
if (permission_exists('fax_inbox_delete')) {
- echo " $v_link_label_delete | \n";
+ echo " ".$v_link_label_delete." | \n";
}
- echo " \n";
+ echo " \n";
// $fax_message = imap_fetchbody($connection, $email_id, '1.1', FT_UID);
// if ($fax_message == '') {
// $fax_message = imap_fetchbody($connection, $email_id, '1', FT_UID);
// }
+ $c = ($c) ? 0 : 1;
}
}
diff --git a/app/fax/fax_send.php b/app/fax/fax_send.php
index d8ac802913..f2e10fb9c4 100644
--- a/app/fax/fax_send.php
+++ b/app/fax/fax_send.php
@@ -196,14 +196,17 @@ if (!$included) {
//set resolution
switch ($fax_resolution) {
case 'fine':
- $gs_r = '204x196'; $gs_g = ((int) ($page_width * 204)).'x'.((int) ($page_height * 196));
+ $gs_r = '204x196';
+ $gs_g = ((int) ($page_width * 204)).'x'.((int) ($page_height * 196));
break;
case 'superfine':
- $gs_r = '408x391'; $gs_g = ((int) ($page_width * 408)).'x'.((int) ($page_height * 391));
+ $gs_r = '408x391';
+ $gs_g = ((int) ($page_width * 408)).'x'.((int) ($page_height * 391));
break;
case 'normal':
default:
- $gs_r = '204x98'; $gs_g = ((int) ($page_width * 204)).'x'.((int) ($page_height * 98));
+ $gs_r = '204x98';
+ $gs_g = ((int) ($page_width * 204)).'x'.((int) ($page_height * 98));
break;
}
@@ -573,7 +576,7 @@ if (!$included) {
if (!$included) {
//redirect the browser
$_SESSION["message"] = $response;
- header("Location: fax_box.php?id=".$fax_uuid."&box=sent");
+ header("Location: fax_files.php?id=".$fax_uuid."&box=sent");
exit;
}
diff --git a/resources/install/scripts/fax_retry.lua b/resources/install/scripts/fax_retry.lua
index 2d9be611e7..c9d5d99f19 100644
--- a/resources/install/scripts/fax_retry.lua
+++ b/resources/install/scripts/fax_retry.lua
@@ -340,6 +340,7 @@
table.insert(sql, "'" .. sip_to_user .. "', ");
end
table.insert(sql, "'tif', ");
+ fax_file = string.gsub(fax_file, '/temp/', '/sent/');
table.insert(sql, "'" .. fax_file .. "', ");
table.insert(sql, "'" .. origination_caller_id_name .. "', ");
table.insert(sql, "'" .. origination_caller_id_number .. "', ");
|