Improving main screen display

diff --git a/www/lvllog.php b/www/lvllog.php
index cf86ae5ada8308dd5ddf3f826f11a46b10c1c548..0cb7da7eb46476ab50702532d22193e559e66db8 100644 (file)
--- a/www/lvllog.php
+++ b/www/lvllog.php
@@ -21,7 +21,7 @@ function login()
 {
 $STR  = <<<EOT
 
-<table border="0" align="center" width="500" cellpadding="0" cellspacing="0">
+<table border="0" align="center" width="60%" cellpadding="0" cellspacing="0">
     <tr>
       <td align="center">
       <FONT SIZE=+2><STRONG>

diff --git a/www/lvlmai.php b/www/lvlmai.php
index fd36102f4b03167c05ee4b1d43a56d1c5ac7b1ab..bb59b87252d3948ac24ba122d18648fb5aee3302 100644 (file)
--- a/www/lvlmai.php
+++ b/www/lvlmai.php
@@ -34,25 +34,31 @@ if (isset($_POST['offset']))
 
 $actions=sql_getactionslist($dbsql,$username,$limit,$offset);
 $line="";
-$count=$offset;
+$count=$offset+1;
 foreach($actions as $action) {
+  $info=substr($action['info'],3,1);
+  if ($info=="-")
+    continue;
   $bgcolor="white";
   if ($count & 1 ) {
     $bgcolor="green";
     }
+  $status=substr($action['info'],0,4);
   $date=$action['creation'];
   $smtpfrom=$action['smtpfrom'];
   $emailfrom=$action['emailfrom'];
-  $emailfrom=str_replace("<","&lt;",$emailfrom);
-  $emailfrom=str_replace(">","&gt;",$emailfrom);
-  rou_alert(0,"JMPDBG <$emailfrom>");
+  $emailfrom=htmlspecialchars($emailfrom,ENT_QUOTES);
   $recipient=$action['rcptto'];
+  $subject=$action['subject'];
   $line=$line."<TR>\r\n";
-  $line=$line."<TD><FONT SIZE=-1>$count&nbsp</FONT>\r\n";
+  $line=$line."<TD align=left>$count $status</TD>\r\n";
   $line=$line."<TD align=left>$date</TD>\r\n";
-  $line=$line."<TD align=left>$smtpfrom</TD>\r\n";
-  $line=$line."<TD align=left>$emailfrom</TD>\r\n";
+  $line=$line."<TD align=left>";
+  $line=$line."$emailfrom<BR>";
+  $line=$line."<FONT SIZE=-1>$smtpfrom</FONT>";
+  $line=$line."</TD>\r\n";
   $line=$line."<TD align=left>$recipient</TD>\r\n";
+  $line=$line."<TD align=left>$subject</TD>\r\n";
   $line=$line."</TR>";
   $count++;
   }
@@ -79,11 +85,11 @@ $top
 <table WIDTH="100%" BORDER="0" CellSpacing="0">
 <table class="table-userlist" WIDTH="100%" BORDER="1" CellSpacing="0">
 <TR>
-<TH align=center></TH>
+<TH align=center>Status</TH>
 <TH align=center>Date</TH>
-<TH align=center>SMTP Originator</TH>
-<TH align=center>Email From</TH>
+<TH align=center>Originator</TH>
 <TH align=center>Recipient</TH>
+<TH align=center>subject</TH>
 </TR>
 $line
 </Table>