From 60249457c632326d780ebba353e49faf4f6aef35 Mon Sep 17 00:00:00 2001
From: sunsetsystems <sunsetsystems>
Date: Fri, 6 Oct 2006 23:37:11 +0000
Subject: [PATCH] some bug fixes and initial support for listing and viewing
 outgoing faxes

---
 interface/fax/fax_dispatch.php |   2 +-
 interface/fax/fax_view.php     |  44 +++++++++-
 interface/fax/faxq.php         | 179 ++++++++++++++++++++++++++++++++++++-----
 3 files changed, 198 insertions(+), 27 deletions(-)

diff --git a/interface/fax/fax_dispatch.php b/interface/fax/fax_dispatch.php
index afbdad716..a33052782 100644
--- a/interface/fax/fax_dispatch.php
+++ b/interface/fax/fax_dispatch.php
@@ -213,7 +213,7 @@
   if ($tmp2) die("mkdir returned $tmp2: $tmp0");
   $tmp0 = exec("cd '$faxcache'; tiffsplit '$filepath'", $tmp1, $tmp2);
   if ($tmp2) die("tiffsplit returned $tmp2: $tmp0");
-  $tmp0 = exec("cd '$faxcache'; mogrify -resize 600x776 -format jpg *.tif", $tmp1, $tmp2);
+  $tmp0 = exec("cd '$faxcache'; mogrify -resize 750x970 -format jpg *.tif", $tmp1, $tmp2);
   if ($tmp2) die("mogrify returned $tmp2: $tmp0");
  }
 
diff --git a/interface/fax/fax_view.php b/interface/fax/fax_view.php
index fcb0b19bd..fe893b76f 100644
--- a/interface/fax/fax_view.php
+++ b/interface/fax/fax_view.php
@@ -8,22 +8,58 @@
 
 	require_once("../globals.php");
 
-	$ffname = $GLOBALS['hylafax_basedir'] . '/recvq/' . $_GET['file'];
+	$ffname = '';
+	$jobid = $_GET['jid'];
+	if ($jobid) {
+		$jfname = $GLOBALS['hylafax_basedir'] . "/sendq/q$jobid";
+		if (!file_exists($jfname))
+			$jfname = $GLOBALS['hylafax_basedir'] . "/doneq/q$jobid";
+		$jfhandle = fopen($jfname, 'r');
+		if (!$jfhandle) {
+			echo "I am in these groups: ";
+			passthru("groups");
+			echo "<br />";
+			die(xl("Cannot open ") . $jfname);
+		}
+		while (!feof($jfhandle)) {
+			$line = trim(fgets($jfhandle));
+			if (substr($line, 0, 12) == '!postscript:') {
+				$ffname = $GLOBALS['hylafax_basedir'] . '/' .
+					substr($line, strrpos($line, ':') + 1);
+				break;
+			}
+		}
+		fclose($jfhandle);
+		if (!$ffname) {
+			die(xl("Cannot find postscript document reference in ") . $jfname);
+		}
+	}
+	else {
+		$ffname = $GLOBALS['hylafax_basedir'] . '/recvq/' . $_GET['file'];
+	}
 
 	if (!file_exists($ffname)) {
-		die(xl("Cannot access ") . $ffname);
+		die(xl("Cannot find ") . $ffname);
+	}
+
+	if (!is_readable($ffname)) {
+		die(xl("I do not have permission to read ") . $ffname);
 	}
 
 	ob_start();
 
-	passthru("tiff2pdf $ffname");
+	$ext = substr($ffname, strrpos($ffname, '.'));
+	if ($ext == '.ps')
+		passthru("TMPDIR=/tmp ps2pdf $ffname -");
+	else
+		passthru("tiff2pdf $ffname");
 
 	header("Pragma: public");
 	header("Expires: 0");
 	header("Cache-Control: must-revalidate, post-check=0, pre-check=0");
 	header("Content-Type: application/pdf");
 	header("Content-Length: " . ob_get_length());
-	header("Content-Disposition: inline; filename=" . basename($ffname, '.tif') . '.pdf');
+	header("Content-Disposition: inline; filename=" . basename($ffname, $ext) . '.pdf');
 
 	ob_end_flush();
 
diff --git a/interface/fax/faxq.php b/interface/fax/faxq.php
index a3b2e8d83..6226f9d07 100644
--- a/interface/fax/faxq.php
+++ b/interface/fax/faxq.php
@@ -24,6 +24,25 @@
  }
  ksort($mlines);
 
+ // Get the doneq entries, parse and sort by job ID
+ //
+ /* for example:
+ JID  Pri S  Owner Number       Pages Dials     TTS Status
+ 155  123 D nobody 6158898622    1:1   5:12
+ 153  124 D nobody 6158896439    1:1   4:12
+ 154  124 F nobody 6153551807    0:1   4:12         No carrier detected
+ */
+ $donelines = array();
+ exec("faxstat -s -d -l -h " . $GLOBALS['hylafax_server'], $donelines);
+ $dlines = array();
+ foreach ($donelines as $line) {
+  // This gets jobid, priority, statchar, owner, phone, pages, dials and tts/status.
+  if (preg_match('/^(\d+)\s+(\d+)\s+(\S)\s+(\S+)\s+(\S+)\s+(\d+:\d+)\s+(\d+:\d+)(.*)$/', $line, $matches)) {
+   $dlines[$matches[1]] = $matches;
+  }
+ }
+ ksort($dlines);
+
  // echo "<!--\n"; print_r($statlines); echo "-->\n"; // debugging
 
 ?>
@@ -35,16 +54,54 @@
 <title><? xl('Received Faxes','e'); ?></title>
 
 <style>
-tr.head   { font-size:10pt; background-color:#cccccc; font-weight: bold; }
-tr.detail { font-size:10pt; }
-td        { padding-left: 4px; padding-right: 4px; }
-a, a:visited, a:hover { color:#0000cc; }
+td {
+ font-family: Arial, Helvetica, sans-serif;
+ padding-left: 4px;
+ padding-right: 4px;
+}
+a, a:visited, a:hover {
+ color:#0000cc;
+}
+tr.head {
+ font-size:10pt;
+ background-color:#cccccc;
+ font-weight: bold;
+}
+tr.detail {
+ font-size:10pt;
+}
+td.tabhead {
+  font-size: 11pt;
+  font-weight: bold;
+  height: 20pt;
+  text-align: center;
+}
 </style>
 
 <script type="text/javascript" src="../../library/dialog.js"></script>
 
 <script language="JavaScript">
 
+function tabclick(tabname) {
+ var tabs = new Array('faxin', 'faxout', 'scanin');
+ var visdisp = document.getElementById('bigtable').style.display;
+ for (var i in tabs) {
+  var thistd    = document.getElementById('td_tab_' + tabs[i]);
+  var thistable = document.getElementById('table_' + tabs[i]);
+  if (tabs[i] == tabname) {
+   thistd.style.borderBottom = '0px solid #000000';
+   thistd.style.color = '#cc0000';
+   thistd.style.cursor = 'default';
+   thistable.style.display = visdisp;
+  } else {
+   thistd.style.borderBottom = '2px solid #000000';
+   thistd.style.color = '#777777';
+   thistd.style.cursor = 'pointer';
+   thistable.style.display = 'none';
+  }
+ }
+}
+
 // callback from popups to refresh this display.
 function refreshme() {
  location.reload();
@@ -57,9 +114,16 @@ function dodclick(ffname) {
  return false;
 }
 
+// Process click on Job ID to view.
+function dojclick(jobid) {
+ cascwin('fax_view.php?jid=' + jobid, '_blank', 600, 475,
+  "resizable=1,scrollbars=1");
+ return false;
+}
+
 // Process click on More to pop up the dispatch window.
 function domclick(ffname) {
- dlgopen('fax_dispatch.php?file=' + ffname, '_blank', 700, 475);
+ dlgopen('fax_dispatch.php?file=' + ffname, '_blank', 850, 550);
 }
 
 </script>
@@ -67,15 +131,31 @@ function domclick(ffname) {
 </head>
 
 <body <?echo $top_bg_line;?>>
-<form method='post' action='faxq.php'>
-
-<table width='100%' cellpadding='1' cellspacing='2'>
- <tr class='head'>
-  <td colspan='2' title='Click to view'><? xl('Document','e'); ?></td>
-  <td><? xl('Received','e'); ?></td>
-  <td><? xl('From','e'); ?></td>
-  <td align='right'><? xl('Pages','e'); ?></td>
+<table cellspacing='0' cellpadding='0' style='margin: 0 0 0 0; border: 2px solid #000000;'
+ id='bigtable' width='100%' height='100%'>
+ <tr style='height: 20px;'>
+  <td width='33%' id='td_tab_faxin'  class='tabhead'
+   style='color: #cc0000; border-right: 2px solid #000000;'
+   onclick='tabclick("faxin")'>Faxes In</td>
+  <td width='33%' id='td_tab_faxout' class='tabhead'
+   style='color: #777777; border-right: 2px solid #000000; border-bottom: 2px solid #000000; cursor: pointer;'
+   onclick='tabclick("faxout")'>Faxes Out</td>
+  <td width='34%' id='td_tab_scanin' class='tabhead'
+   style='color: #777777; border-bottom: 2px solid #000000; cursor: pointer;'
+   onclick='tabclick("scanin")'>Scanner In</td>
  </tr>
+ <tr>
+  <td colspan='3' style='padding: 5px;' valign='top'>
+
+   <form method='post' action='faxq.php'>
+
+   <table width='100%' cellpadding='1' cellspacing='2' id='table_faxin'>
+    <tr class='head'>
+     <td colspan='2' title='Click to view'><? xl('Document','e'); ?></td>
+     <td><? xl('Received','e'); ?></td>
+     <td><? xl('From','e'); ?></td>
+     <td align='right'><? xl('Pages','e'); ?></td>
+    </tr>
 <?
  $encount = 0;
  foreach ($mlines as $matches) {
@@ -83,20 +163,75 @@ function domclick(ffname) {
   $ffname = $matches[4];
   $ffbase = basename("/$ffname", '.tif');
   $bgcolor = "#" . (($encount & 1) ? "ddddff" : "ffdddd");
-  echo " <tr class='detail' bgcolor='$bgcolor'>\n";
-  echo "  <td onclick='dodclick(\"$ffname\")'>";
+  echo "    <tr class='detail' bgcolor='$bgcolor'>\n";
+  echo "     <td onclick='dodclick(\"$ffname\")'>";
   echo "<a href='fax_view.php?file=$ffname' onclick='return false'>$ffbase</a></td>\n";
   // echo "<a href='fax_view.php?file=$ffname'>$ffname</a></td>\n";
-  echo "  <td onclick='domclick(\"$ffname\")'>";
+  echo "     <td onclick='domclick(\"$ffname\")'>";
   echo "<a href='fax_dispatch.php?file=$ffname' onclick='return false'>Dispatch</a></td>\n";
-  echo "  <td>" . htmlentities($matches[3]) . "</td>\n";
-  echo "  <td>" . htmlentities($matches[2]) . "</td>\n";
-  echo "  <td align='right'>" . htmlentities($matches[1]) . "</td>\n";
-  echo " </tr>\n";
+  echo "     <td>" . htmlentities($matches[3]) . "</td>\n";
+  echo "     <td>" . htmlentities($matches[2]) . "</td>\n";
+  echo "     <td align='right'>" . htmlentities($matches[1]) . "</td>\n";
+  echo "    </tr>\n";
  }
 ?>
-</table>
+   </table>
+
+   <table width='100%' cellpadding='1' cellspacing='2' id='table_faxout' style='display:none;'>
+    <tr class='head'>
+     <td title='Click to view'><? xl('Job ID','e'); ?></td>
+     <td><? xl('To','e'); ?></td>
+     <td><? xl('Pages','e'); ?></td>
+     <td><? xl('Dials','e'); ?></td>
+     <td><? xl('TTS','e'); ?></td>
+     <td><? xl('Status','e'); ?></td>
+    </tr>
+<?
+ $encount = 0;
+ foreach ($dlines as $matches) {
+  ++$encount;
+  $jobid = $matches[1];
+  $ffstatus = $matches[3];
+  if ($ffstatus == 'D') $ffstatus = 'Sent successfully';
+  else if ($ffstatus == 'B') $ffstatus = 'Blocked';
+  else if ($ffstatus == 'F') $ffstatus = 'Failed';
+  else if ($ffstatus == 'P') $ffstatus = 'Pending';
+  else if ($ffstatus == 'R') $ffstatus = 'Send in progress';
+  else if ($ffstatus == 'S') $ffstatus = 'Sleeping';
+  else if ($ffstatus == 'T') $ffstatus = 'Suspended';
+  else if ($ffstatus == 'W') $ffstatus = 'Waiting';
+  $fftts = '';
+  $ffstatend = $matches[8];
+  if (preg_match('/^\s*(\d+:\d+)\s*(.*)$/', $ffstatend, $tmp)) {
+   $fftts = $tmp[1];
+   $ffstatend = $tmp[2];
+  }
+  if ($ffstatend) $ffstatus .= ': ' . $ffstatend;
+  $bgcolor = "#" . (($encount & 1) ? "ddddff" : "ffdddd");
+  echo "    <tr class='detail' bgcolor='$bgcolor'>\n";
+  echo "     <td onclick='dojclick(\"$jobid\")'>" .
+       "<a href='fax_view.php?jid=$jobid' onclick='return false'>" .
+       "$jobid</a></td>\n";
+  echo "     <td>" . htmlentities($matches[5]) . "</td>\n";
+  echo "     <td>" . htmlentities($matches[6]) . "</td>\n";
+  echo "     <td>" . htmlentities($matches[7]) . "</td>\n";
+  echo "     <td>" . htmlentities($fftts)      . "</td>\n";
+  echo "     <td>" . htmlentities($ffstatus)   . "</td>\n";
+  echo "    </tr>\n";
+ }
+?>
+   </table>
+
+   <table width='100%' cellpadding='1' cellspacing='2' id='table_scanin' style='display:none;'>
+    <tr class='detail'>
+     <td>Not yet implemented.</td>
+    </tr>
+   </table>
 
-</form>
+   </form>
+
+  </td>
+ </tr>
+</table>
 </body>
 </html>
-- 
2.11.4.GIT