X-Git-Url: http://git.datanom.net/qtadmin.git/blobdiff_plain/219d049c7929a3f9af00a8a63c66fb011ef7676d..55e904ab4e0994f21d26a68e70497fcacd8ec2d6:/index.php

diff --git a/index.php b/index.php
index 6e1db88..54b82d8 100644
--- a/index.php
+++ b/index.php
@@ -4,7 +4,7 @@
     require_once $CFG->root . 'lib/db_factory.php';
     require_once $CFG->root . 'lib/utils.inc.php';
 
-    $util = Utils::getInstance();
+    $util = new Utils;
     unset($_SESSION['mailInfo']);
 
     if ($util->isLoggedIn()) {
@@ -25,17 +25,19 @@
         echo $util->getHeader();
         echo $util->getHeading();
 
-        echo "<span class=\"user\">{$util->getUser()}
-            <a title=\"Logout\" href=\"auth.php?op=logout\">Logout</a></span>";
+        echo "Rows per page <input type=\"text\" value=\"$rowsPerPage\" id=\"rows\"
+              size=\"2\"/><input type=\"button\" onclick=\"javascript: updateRowsPerPage()\"
+              value=\"Change\"/><span class=\"user\">{$util->getUser()}
+              <a title=\"Logout\" href=\"auth.php?op=logout\">Logout</a></span>";
         $which = ($util->isAdmin() == true) ? 'all' : $util->getUser();
         $rows = $DB->getQMails($offset, $rowsPerPage, $which);
         $numrows = $DB->numRows();
         echo "<span class=\"total-rows\">$numrows quarantined mail(s)</span>";
         echo "<table><tr>";
-        echo "<table><tr><th>Received</th><th>Cause</th>";
+        echo "<th>Received</th><th>Cause</th>";
         echo "<th>Sender</th><th>Recipient</th><th>Subject</th><th>Action</th>";
-        echo "<th><input name=\"multiselect\" type=\"checkbox\"
-              onchange=\"javascript: updateAction(this)\" /></th>";
+        echo "<th><input name=\"multiselect\" type=\"checkbox\" ";
+        echo "onchange=\"javascript: updateAction(this)\" /></th>";
         echo "</tr>";
 
         $mailInfo = array();
@@ -50,17 +52,19 @@
             $url = urlencode($id);
             $checkbox = "<input name=\"action\" type=\"checkbox\" value=\"$url\" />";
             $recipient = "<a title=\"Show Report\" href=\"mail_report.php?id=$url\">{$row->recipient}</a>";
-            $action = "<a title=\"Release Mail\" href=\"quarantine.php?id=$url&op=release\">";
+            $action = "<a title=\"Release Mail\" href=\"quarantine.php?id=$url&amp;op=release\">";
             $action .= "<img class=\"nav-img\" src=\"pics/release.png\" alt=\"Release\" /></a>";
-            $action .= "&nbsp;<a title=\"Delete Mail\" href=\"quarantine.php?id=$url&op=delete\">";
+            $action .= "&nbsp;<a title=\"Delete Mail\" href=\"quarantine.php?id=$url&amp;op=delete\">";
             $action .= "<img class=\"nav-img\" src=\"pics/delete.png\" alt=\"Delete\" /></a>";
+            $action .= "&nbsp;<a title=\"Block Sender\" href=\"block.php?id=$url\">";
+            $action .= "<img class=\"nav-img\" src=\"pics/spam.png\" alt=\"Block Sender\" /></a>";
             $sender = $row->sender;
             $received = strftime("%c", $row->time_iso);
             $quaratinefor = $util->convertContent($row->quaratinefor);
             $subject = $row->subject;
             echo "<td>$received</td><td class=\"nav-action\">".
                 "$quaratinefor</td><td>$sender</td><td>$recipient</td>".
-                "<td>$subject</td><td class=\"nav-action\">$action</td><td>$checkbox</td></tr>";
+                "<td>$subject</td><td class=\"nav-action\">$action</td><td class=\"nav-action\">$checkbox</td></tr>";
             $i++;
         }
         $_SESSION['mailInfo'] = $mailInfo;
@@ -71,10 +75,10 @@
 
         if ($pageNum > 1) {
             $page  = $pageNum - 1;
-            $prev = " <a title=\"Prev Page\" href=\"$self?page=$page&rowsperpage=$rowsPerPage\"
-                class='whitefooter'>[Prev]</a>";
-            $first = " <a title=\"First Page\" href=\"$self?page=1&rowsperpage=$rowsPerPage\"
-                class='whitefooter'>[First Page]</a> ";
+            $prev = " <a title=\"Prev Page\" href=\"$self?page=$page&amp;rowsperpage=$rowsPerPage\"
+                class='whitefooter'><img class=\"nav-img\" src=\"pics/go-previous-symbolic.svg\" alt=\"Previous\" /></a> ";
+            $first = " <a title=\"First Page\" href=\"$self?page=1&amp;rowsperpage=$rowsPerPage\"
+                class='whitefooter'><img class=\"nav-img\" src=\"pics/go-first-symbolic.svg\" alt=\"First\" /></a> ";
         } else {
             $prev  = '&nbsp;'; // we're on page one, don't print previous link
             $first = '&nbsp;'; // nor the first page link
@@ -82,10 +86,10 @@
 
         if ($pageNum < $maxPage) {
             $page = $pageNum + 1;
-            $next = " <a title=\"Next Page\" href=\"$self?page=$page&rowsperpage=$rowsPerPage\"
-                class='whitefooter'>[Next]</a>";
-            $last = "<a title=\"Last Page\" href=\"$self?page=$maxPage&rowsperpage=$rowsPerPage\"
-                class='whitefooter'>[Last Page]</a> ";
+            $next = " <a title=\"Next Page\" href=\"$self?page=$page&amp;rowsperpage=$rowsPerPage\"
+                class='whitefooter'><img class=\"nav-img\" src=\"pics/go-next-symbolic.svg\" alt=\"Next\" /></a> ";
+            $last = " <a title=\"Last Page\" href=\"$self?page=$maxPage&amp;rowsperpage=$rowsPerPage\"
+                class='whitefooter'><img class=\"nav-img\" src=\"pics/go-last-symbolic.svg\" alt=\"Last\" /></a> ";
         } else {
             $next = '&nbsp;'; // we're on the last page, don't print next link
             $last = '&nbsp;'; // nor the last page link