From c58cd3009ae4dc2a612864ba3cc8c332440f6be5 Mon Sep 17 00:00:00 2001
From: PiBa-NL <pba_2k3@yahoo.com>
Date: Fri, 7 Aug 2015 21:17:24 +0200
Subject: spamd, allow configuring interface to listen/intercept on

---
 config/spamd/spamd_db.php | 31 ++++++++++++++++++-------------
 1 file changed, 18 insertions(+), 13 deletions(-)

(limited to 'config/spamd/spamd_db.php')

diff --git a/config/spamd/spamd_db.php b/config/spamd/spamd_db.php
index e1d004f7..dab599b8 100644
--- a/config/spamd/spamd_db.php
+++ b/config/spamd/spamd_db.php
@@ -324,6 +324,11 @@ if (typeof getURL == 'undefined') {
 					<td class="list"></td>
 				</tr>
 <?php
+
+function formatspamddatetime($dt) {
+	return date("Y-m-d", $dt) . "<br/>" . date("H:i:s", $dt);
+}
+
 	if($filter) {
 		if($not) {
 			$fd = fopen("/tmp/spamdb", "w");
@@ -387,9 +392,9 @@ if (typeof getURL == 'undefined') {
 		switch($pkgdb_split[0]) {
 			case "SPAMTRAP":
 				$recordtype = htmlentities($pkgdb_split[0]);
-				$srcip = htmlentities($pkgdb_split[1]);
-				$fromaddress = htmlentities($pkgdb_split[3]);
-				$toaddress = htmlentities($pkgdb_split[4]);
+				$srcip = "";
+				$fromaddress = htmlentities($pkgdb_split[1]);
+				$toaddress = "";
 				$first = "";
 				$pass = "";
 				$expire = "";
@@ -402,7 +407,7 @@ if (typeof getURL == 'undefined') {
 				$toaddress = "";
 				$first = "";
 				$pass = "";
-				$expire = htmlentities($pkgdb_split[2]);
+				$expire = formatspamddatetime($pkgdb_split[2]);
 				$attempts = "";
 				break;
 			case "GREY":
@@ -410,9 +415,9 @@ if (typeof getURL == 'undefined') {
 				$srcip = htmlentities($pkgdb_split[1]);
 				$fromaddress = htmlentities($pkgdb_split[3]);
 				$toaddress = htmlentities($pkgdb_split[4]);
-				$first = htmlentities($pkgdb_split[5]);
-				$pass = htmlentities($pkgdb_split[6]);
-				$expire = htmlentities($pkgdb_split[7]);
+				$first = formatspamddatetime($pkgdb_split[5]);
+				$pass = formatspamddatetime($pkgdb_split[6]);
+				$expire = formatspamddatetime($pkgdb_split[7]);
 				$attempts = htmlentities($pkgdb_split[8]);			
 				break;
 			case "WHITE":
@@ -420,9 +425,9 @@ if (typeof getURL == 'undefined') {
 				$srcip = htmlentities($pkgdb_split[1]);
 				$fromaddress = "";
 				$toaddress = "";
-				$first = htmlentities($pkgdb_split[4]);
-				$pass = htmlentities($pkgdb_split[5]);
-				$expire = htmlentities($pkgdb_split[6]);
+				$first = formatspamddatetime($pkgdb_split[4]);
+				$pass = formatspamddatetime($pkgdb_split[5]);
+				$expire = formatspamddatetime($pkgdb_split[6]);
 				$attempts = htmlentities($pkgdb_split[8]);			
 				break;
 		}
@@ -433,9 +438,9 @@ if (typeof getURL == 'undefined') {
 		echo "<td class=\"listr\">{$srcip}</td>";
 		echo "<td class=\"listr\">{$fromaddress}</td>";		
 		echo "<td class=\"listr\">{$toaddress}</td>";
-		echo "<td class=\"listr\"><span style='white-space: nowrap;'>" . date("Y-m-d", $first) . "<br/>" . date("H:i:s", $first) . "</span></td>";
-		echo "<td class=\"listr\"><span style='white-space: nowrap;'>" . date("Y-m-d", $pass) . "<br/>" . date("H:i:s", $pass) . "</span></td>";
-		echo "<td class=\"listr\"><span style='white-space: nowrap;'>" . date("Y-m-d", $expire) . "<br/>" . date("H:i:s", $expire) . "</span></td>";
+		echo "<td class=\"listr\"><span style='white-space: nowrap;'>" . $first . "</span></td>";
+		echo "<td class=\"listr\"><span style='white-space: nowrap;'>" . $pass . "</span></td>";
+		echo "<td class=\"listr\"><span style='white-space: nowrap;'>" . $expire . "</span></td>";
 		echo "<td class=\"listr\">{$attempts}</td>";
 		echo "<td>";
 		$rowtext = "<NOBR><a href='javascript:toggle_on(\"w{$rows}\", \"/themes/{$g['theme']}/images/icons/icon_plus_p.gif\"); getURL(\"spamd_db.php?buttonid=w{$rows}&srcip={$srcip}&action=whitelist\", outputrule);'><img title=\"Add to whitelist\" name='w{$rows}' id='w{$rows}' border=\"0\" alt=\"Add to whitelist\" src=\"/themes/{$g['theme']}/images/icons/icon_plus.gif\"></a> ";
-- 
cgit v1.2.3