spamd - code style cleanup and multiple fixes

- Code style and indentation fixes
- Use shell_exec() instead of backticks
- Don't add the same email address to spamtrap twice (?!)
- XHTML fixes

1 files changed, 161 insertions, 160 deletions

diff --git a/config/spamd/spamd_db.php b/config/spamd/spamd_db.php
index 3fe439ef..90215e6f 100644
--- a/config/spamd/spamd_db.php
+++ b/config/spamd/spamd_db.php
@@ -1,9 +1,9 @@
 <?php
-/* $Id$ */
 /*
 	spamd_db.php
-	part of the pfSense project
-	Copyright (C) 2006, 2007, 2008 Scott Ullrich
+	part of pfSense (https://www.pfSense.org/)
+	Copyright (C) 2006-2009 Scott Ullrich
+	Copyright (C) 2015 ESF, LLC
 	All rights reserved.
 
 	Redistribution and use in source and binary forms, with or without
@@ -27,93 +27,90 @@
 	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 	POSSIBILITY OF SUCH DAMAGE.
 */
- 
 require("guiconfig.inc");
+global $filter, $not, $limit, $spamtrapemail;
 
-$pf_version=substr(trim(file_get_contents("/etc/version")),0,3);
-if ($pf_version < 2.0)
-	$one_two = true;
-
-if($_POST['filter'])
+if ($_POST['filter']) {
 	$filter = $_POST['filter'];
-if($_POST['not'])
+}
+if ($_POST['not']) {
 	$not = true;
-if($_POST['limit'])
+}
+if ($_POST['limit']) {
 	$limit = intval($_POST['limit']);
-else
+} else {
 	$limit = "25";
-	
-if($_GET['spamtrapemail']) 
+}
+
+if ($_GET['spamtrapemail']) {
 	$spamtrapemail = $_GET['spamtrapemail'];
-if($_POST['spamtrapemail']) 
+}
+if ($_POST['spamtrapemail']) {
 	$spamtrapemail = $_POST['spamtrapemail'];
-if ($spamtrapemail)
+}
+if ($spamtrapemail) {
 	$spamtrapemailarg = escapeshellarg($spamtrapemail);
+}
 	
 /* handle AJAX operations */
-if($_GET['action'] or $_POST['action']) {
-	/*    echo back buttonid so it can be turned
-	 *    back off when request is completed.
-	 */
+if ($_GET['action'] or $_POST['action']) {
+	/* echo back buttonid so it can be turned  back off when request is completed. */
 	echo $_GET['buttonid'] . "|";
-	if($_GET['action'])
+	if ($_GET['action']) {
 		$action = $_GET['action'];
-	if($_POST['action'])
+	}
+	if ($_POST['action']) {
 		$action = $_POST['action'];
-	if($_GET['srcip'])
+	}
+	if ($_GET['srcip']) {
 		$srcip = $_GET['srcip'];
-	if($_POST['srcip'])
+	}
+	if ($_POST['srcip']) {
 		$srcip = $_POST['srcip'];
-	$srcip = str_replace("<","",$srcip);
-	$srcip = str_replace(">","",$srcip);
-	$srcip = str_replace(" ","",$srcip);
-	// Make input safe
+	}
+	$srcip = str_replace("<", "", $srcip);
+	$srcip = str_replace(">", "", $srcip);
+	$srcip = str_replace(" ", "", $srcip);
+	// make input safe
 	$srcip = escapeshellarg($srcip);
 	/* execute spamdb command */
-	if($action == "whitelist") {
+	if ($action == "whitelist") {
 		exec("/usr/local/sbin/spamdb -d {$srcip} -T");
 		exec("/usr/local/sbin/spamdb -d {$srcip} -t");
 		delete_from_blacklist($srcip);
 		mwexec("/sbin/pfctl -q -t blacklist -T replace -f /var/db/blacklist.txt");
 		exec("echo spamdb -a {$srcip} > /tmp/tmp");
 		exec("/usr/local/sbin/spamdb -a {$srcip}");
-	} else if($action == "delete") {
+	} elseif ($action == "delete") {
 		exec("/usr/local/sbin/spamdb -d {$srcip}");
 		exec("/usr/local/sbin/spamdb -d {$srcip} -T");
 		exec("/usr/local/sbin/spamdb -d {$srcip} -t");
 		delete_from_blacklist($srcip);
 		mwexec("/sbin/pfctl -q -t spamd -T delete $srcip");
 		mwexec("/sbin/pfctl -q -t blacklist -T replace -f /var/db/blacklist.txt");		
-	} else if($action == "trapped") {
+	} elseif ($action == "trapped") {
 		exec("/usr/local/sbin/spamdb -d {$srcip}");
 		exec("/usr/local/sbin/spamdb -d {$srcip}");
 		exec("/usr/local/sbin/spamdb -d -t {$srcip}");
 		exec("/usr/local/sbin/spamdb -a -t {$srcip}");
-	} else if($action == "spamtrap") {
+	} elseif ($action == "spamtrap") {
 		exec("/usr/local/sbin/spamdb -a -T {$spamtrapemailarg}");
 	}
 	/* signal a reload for real time effect. */
-	mwexec("killall -HUP spamlogd");
+	mwexec("/usr/bin/killall -HUP spamlogd");
 	exit;
 }
 
 
-/* spam trap e-mail address */
-if($spamtrapemail <> "") {
-	exec("spamdb -T -a {$spamtrapemailarg}");
-	mwexec("killall -HUP spamlogd");
-	$savemsg = htmlentities($spamtrapemail) . " added to spam trap database.";
-}
-
-if($_GET['getstatus'] <> "") {
-	$status = exec("/usr/local/sbin/spamdb | grep " . escapeshellarg($_GET['getstatus']));
-	if(stristr($status, "WHITE") == true) {
+if ($_GET['getstatus'] != "") {
+	$status = exec("/usr/local/sbin/spamdb | /usr/bin/grep " . escapeshellarg($_GET['getstatus']));
+	if (stristr($status, "WHITE") == true) {
 		echo "WHITE";
-	} else if(stristr($status, "TRAPPED") == true) {
+	} elseif (stristr($status, "TRAPPED") == true) {
 		echo "TRAPPED";
-	} else if(stristr($status, "GREY") == true) {
+	} elseif (stristr($status, "GREY") == true) {
 		echo "GREY";
-	} else if(stristr($status, "SPAMTRAP") == true) {
+	} elseif (stristr($status, "SPAMTRAP") == true) {
 		echo "SPAMTRAP";
 	} else {
 		echo "NOT FOUND";	
@@ -122,35 +119,38 @@ if($_GET['getstatus'] <> "") {
 }
 
 /* spam trap e-mail address */
-if($_GET['spamtrapemail'] <> "") {
-	$status = exec("spamdb -T -a {$spamtrapemailarg}");
-	mwexec("killall -HUP spamlogd");
-	if($status)
+if ($spamtrapemail != "") {
+	$status = exec("/usr/local/sbin/spamdb -T -a {$spamtrapemailarg}");
+	mwexec("/usr/bin/killall -HUP spamlogd");
+	if ($status) {
 		echo $status;
-	else 
-		echo htmlentities($_POST['spamtrapemail']) . " added to spam trap database.";
+	} else {
+		echo htmlentities($spamtrapemail) . " added to spam trap database.";
+	}
 	exit;
 }
 
 /* whitelist e-mail address */
-if($_GET['whitelist'] <> "") {
-	$spamtrapemail = escapeshellarg($_GET['spamtrapemail']);
-	$status = exec("spamdb -a {$spamtrapemail}");
-	mwexec("killall -HUP spamlogd");
-	if($status)
+if ($_GET['whitelist'] != "") {
+	$status = exec("/usr/local/sbin/spamdb -a {$spamtrapemail}");
+	mwexec("/usr/bin/killall -HUP spamlogd");
+	if ($status) {
 		echo $status;
-	else 
-		echo htmlentities($_POST['spamtrapemail']) . " added to whitelist database.";
+	} else {
+		echo htmlentities($spamtrapemail) . " added to whitelist database.";
+	}
 	exit;
 }
 
 function delete_from_blacklist($srcip) {
 	$blacklist = explode("\n", file_get_contents("/var/db/blacklist.txt"));
 	$fd = fopen("/var/db/blacklist.txt", "w");
-	foreach($blacklist as $bl) {
-		if($bl <> "")
-			if(!stristr($bl, $srcip))
+	foreach ($blacklist as $bl) {
+		if ($bl != "") {
+			if (!stristr($bl, $srcip)) {
 				fwrite($fd, "{$bl}\n");
+			}
+		}
 	}
 	fclose($fd);
 	mwexec("/sbin/pfctl -q -t spamd -T delete {$srcip}");
@@ -161,9 +161,11 @@ function delete_from_whitelist($srcip) {
 	$whitelist = explode("\n", file_get_contents("/var/db/whitelist.txt"));
 	$fd = fopen("/var/db/whitelist.txt", "w");
 	foreach($whitelist as $wl) {
-		if($wl <> "")
-			if(!stristr($wl, $srcip))
+		if ($wl != "") {
+			if (!stristr($wl, $srcip)) {
 				fwrite($fd, "{$wl}\n");
+			}
+		}
 	}
 	fclose($fd);
 	mwexec("/sbin/pfctl -q -t spamd -T delete $srcip");
@@ -173,23 +175,25 @@ function delete_from_whitelist($srcip) {
 $pgtitle = "SpamD: Database";
 include("head.inc");
 
-if(file_exists("/var/db/whitelist.txt"))
-	$whitelist_items = `cat /var/db/whitelist.txt | wc -l`;
-else 
+if (file_exists("/var/db/whitelist.txt")) {
+	$whitelist_items = shell_exec("/bin/cat /var/db/whitelist.txt | /usr/bin/wc -l");
+} else {
 	$whitelist_items = 0;
+}
 	
-if(file_exists("/var/db/blacklist.txt"))
-	$blacklist_items = `cat /var/db/blacklist.txt | wc -l`;
-else 
+if (file_exists("/var/db/blacklist.txt")) {
+	$blacklist_items = shell_exec("/bin/cat /var/db/blacklist.txt | /usr/bin/wc -l");
+} else {
 	$blacklist_items = 0;
+}
 
 // Get an overall count of the database
-$spamdb_items = `/usr/local/sbin/spamdb | wc -l`;
+$spamdb_items = shell_exec("/usr/local/sbin/spamdb | /usr/bin/wc -l");
 
 // Get blacklist and whitelist count from database
-$spamdb_white = `/usr/local/sbin/spamdb | grep WHITE | wc -l`;
-$spamdb_black = `/usr/local/sbin/spamdb | grep BLACK | wc -l`;
-$spamdb_grey = `/usr/local/sbin/spamdb | grep GREY | wc -l`;
+$spamdb_white = shell_exec("/usr/local/sbin/spamdb | /usr/bin/grep WHITE | /usr/bin/wc -l");
+$spamdb_black = shell_exec("/usr/local/sbin/spamdb | /usr/bin/grep BLACK | /usr/bin/wc -l");
+$spamdb_grey = shell_exec("/usr/local/sbin/spamdb | /usr/bin/grep GREY | /usr/bin/wc -l");
 
 // Now count the user contributed whitelist and blacklist count
 $whitelist_items = $whitelist_items + $spamdb_white;
@@ -198,22 +202,20 @@ $blacklist_items = $blacklist_items + $spamdb_black;
 ?>
 <body link="#000000" vlink="#000000" alink="#000000">
 <?php include("fbegin.inc"); ?>
-<?php if($one_two): ?>
-<p class="pgtitle"><?=$pgtitle?></font></p>
-<?php endif; ?>
 <form action="spamd_db.php" method="post" name="iform">
 <script src="/javascript/scriptaculous/prototype.js" type="text/javascript"></script>
 <script src="/javascript/scriptaculous/scriptaculous.js" type="text/javascript"></script>
 <script type="text/javascript" language="javascript" src="row_toggle.js"></script>
-<script language="javascript">
+<script type="text/javascript">
+//<![CDATA[
 function outputrule(req) {
-	if(req.content != '') {
+	if (req.content != '') {
 		/* response is split by | */
 		var itemsplit = req.content.split("|");
 		/* turn back off the button */
 		toggle_off(itemsplit[0]);
 		/* uh oh, we've got an error of some sort */
-		if(itemsplit[1] != "")
+		if (itemsplit[1] != "")
 			alert('An error was detected.\n\n' + req.content);
 	}
 }
@@ -225,7 +227,7 @@ function toggle_on(button, image) {
 /* turn off button by stripping _p out */
 function toggle_off(button) {
 	/* no text back?  thats bad. */
-	if(button == '')
+	if (button == '')
 		return;
 	var item = document.getElementById(button);
 	var currentbutton = item.src;
@@ -248,13 +250,12 @@ if (typeof getURL == 'undefined') {
 			if (typeof callback.operationComplete == 'function')
 				callback = callback.operationComplete;
 		} catch (e) {}
-			if (typeof callback != 'function')
-				throw 'No callback function for getURL';
+		if (typeof callback != 'function')
+			throw 'No callback function for getURL';
 		var http_request = null;
 		if (typeof XMLHttpRequest != 'undefined') {
-		    http_request = new XMLHttpRequest();
-		}
-		else if (typeof ActiveXObject != 'undefined') {
+			http_request = new XMLHttpRequest();
+		} else if (typeof ActiveXObject != 'undefined') {
 			try {
 				http_request = new ActiveXObject('Msxml2.XMLHTTP');
 			} catch (e) {
@@ -264,24 +265,27 @@ if (typeof getURL == 'undefined') {
 			}
 		}
 		if (!http_request)
-			throw 'Both getURL and XMLHttpRequest are undefined';		
+			throw 'Both getURL and XMLHttpRequest are undefined';
 		http_request.onreadystatechange = function() {
 			if (http_request.readyState == 4) {
-				callback( { success : true,
-				  content : http_request.responseText,
-				  contentType : http_request.getResponseHeader("Content-Type") } );
+				callback({
+					success: true,
+					content: http_request.responseText,
+					contentType: http_request.getResponseHeader("Content-Type")
+				});
 			}
 		}
 		http_request.open('GET', url, true);
 		http_request.send(null);
 	}
 }
+//]]>
 </script>
 <?php if ($savemsg) print_info_box($savemsg); ?>
-<?php if (file_exists($d_natconfdirty_path)): ?><p>
+<?php if (file_exists($d_natconfdirty_path)): ?><br />
 <?php endif; ?>
 <table width="99%" border="0" cellpadding="0" cellspacing="0">
-  <tr><td>
+<tr><td>
 <?php
 	$tab_array = array();
 	$tab_array[] = array("SpamD External Sources", false, "/pkg.php?xml=spamd.xml");
@@ -290,25 +294,20 @@ if (typeof getURL == 'undefined') {
 	$tab_array[] = array("SpamD Database", true, "/spamd_db.php");
 	display_top_tabs($tab_array);
 ?>
- </td></tr>
-  <tr>
-    <td>
+</td></tr>
+<tr><td>
 	<div id="mainarea">
-		<table id="maintable" name="maintable" class="tabcont" width="100%" border="0" cellpadding="0" cellspacing="0">
+	<table id="maintable" name="maintable" class="tabcont" width="100%" border="0" cellpadding="0" cellspacing="0">
 		<tr><td>
-		
-
-<table>
-<tr><td align="right">Filter by test:</td><td><input name="filter" value="<?=$filter?>"></input></td><td><input type="submit" value="Filter"></td><td>&nbsp;&nbsp;Inverse filter (NOT):</td><td><input type="checkbox" id="not" name="not" <?php if($not) echo " CHECKED"; ?>></td></tr>
-<tr><td align="right">Limit:</td><td><input name="limit" value="<?=$limit?>"></input></td></tr>
-<tr><td>&nbsp;</td></tr>
-<tr><td align="right">* Add spam trap E-mail address:</td><td><input name="spamtrapemail" value="<?=$spamtrapemail?>"></input></td><td><input type="submit" value="Add"></td></tr>
-</table><br>
-		
-		
-		
+			<table>
+				<tr><td align="right">Filter by test:</td><td><input name="filter" value="<?=$filter?>"></input></td><td><input type="submit" value="Filter" /></td><td>&nbsp;&nbsp;Inverse filter (NOT):</td><td><input type="checkbox" id="not" name="not" <?php if($not) echo " checked=\"checked\""; ?> /></td></tr>
+				<tr><td align="right">Limit:</td><td><input name="limit" value="<?=$limit?>"></input></td></tr>
+				<tr><td>&nbsp;</td></tr>
+				<tr><td align="right">* Add spam trap E-mail address:</td><td><input name="spamtrapemail" value="<?=$spamtrapemail?>"></input></td><td><input type="submit" value="Add" /></td></tr>
+			</table>
+			<br />
 			<table id="sortabletable1" name="sortabletable1" class="sortable" width="100%" border="0" cellpadding="0" cellspacing="0">
-			    <tr id="frheader">
+				<tr id="frheader">
 					<td class="listhdrr">Type</td>
 					<td class="listhdrr">IP</td>
 					<td class="listhdrr">From</td>
@@ -322,68 +321,65 @@ if (typeof getURL == 'undefined') {
 <?php
 
 function formatspamddatetime($dt) {
-	return date("Y-m-d", $dt) . "<br/>" . date("H:i:s", $dt);
+	return date("Y-m-d", $dt) . "<br />" . date("H:i:s", $dt);
 }
 
-	if($filter) {
-		if($not) {
+	if ($filter) {
+		if ($not) {
 			$fd = fopen("/tmp/spamdb", "w");
-			$cmd = "/usr/local/sbin/spamdb | grep -v " . escapeshellarg($filter) . " | tail -n {$limit}";
+			$cmd = "/usr/local/sbin/spamdb | /usr/bin/grep -v " . escapeshellarg($filter) . " | /usr/bin/tail -n {$limit}";
 			fwrite($fd, $cmd);
 			fclose($fd);
 			exec($cmd, $pkgdb);
-			if(file_exists("/var/db/blacklist.txt")) {
-				$cmd = "cat /var/db/blacklist.txt | grep -v \"" . escapeshellarg($filter) . "\" ";
+			if (file_exists("/var/db/blacklist.txt")) {
+				$cmd = "/bin/cat /var/db/blacklist.txt | /usr/bin/grep -v \"" . escapeshellarg($filter) . "\" ";
 				exec($cmd, $pkgdba);
 				foreach($pkgdba as $pkg) {
 					$pkgdb[] = "TRAPPED|{$pkg}|1149324397";	
 				}				
 			}			
 		} else {
-			$cmd = "/usr/local/sbin/spamdb | grep " . escapeshellarg($filter) . " | tail -n {$limit}";
+			$cmd = "/usr/local/sbin/spamdb | /usr/bin/grep " . escapeshellarg($filter) . " | /usr/bin/tail -n {$limit}";
 			exec($cmd, $pkgdb);
-			if(file_exists("/var/db/blacklist.txt")) {
-				$cmd = "cat /var/db/blacklist.txt | grep " . escapeshellarg($filter);
+			if (file_exists("/var/db/blacklist.txt")) {
+				$cmd = "/bin/cat /var/db/blacklist.txt | /usr/bin/grep " . escapeshellarg($filter);
 				exec($cmd, $pkgdba);
-				foreach($pkgdba as $pkg) {
+				foreach ($pkgdba as $pkg) {
 					$pkgdb[] = "TRAPPED|{$pkg}|1149324397";
 				}
 				echo "<!-- $pkgdb -->";
 			}
 		}
 	} else {
-		exec("/usr/local/sbin/spamdb | tail -n {$limit}", $pkgdb);
+		exec("/usr/local/sbin/spamdb | /usr/bin/tail -n {$limit}", $pkgdb);
 	}
 	$rows = 0;
 	$lastseenip = "";
 	$srcip = "|";
-	foreach($pkgdb as $pkgdb_row) {
+	foreach ($pkgdb as $pkgdb_row) {
 
-		if($rows > $limit)
+		if($rows > $limit) {
 			break;
+		}
 		$dontdisplay = false;
-		if(!$pkgdb_row) 
+		if (!$pkgdb_row) {
 			continue;
+		}
 		$pkgdb_split = explode("|", $pkgdb_row);
 
 		/*
-
-  			For TRAPPED entries the format is:
-
+  		For TRAPPED entries the format is:
         	type|ip|expire
 
-  				where type will be TRAPPED, IP will be the IP address blacklisted due to
-  				hitting a spamtrap, and expire will be when the IP is due to be removed
-  				from the blacklist.
-
-  			For GREY entries, the format is:
+  		where type will be TRAPPED, IP will be the IP address blacklisted due to
+  		hitting a spamtrap, and expire will be when the IP is due to be removed
+  		from the blacklist.
 
+  		For GREY entries, the format is:
         	type|source IP|helo|from|to|first|pass|expire|block|pass
 
-  			For WHITE entries, the format is:
-
+		For WHITE entries, the format is:
         	type|source IP|||first|pass|expire|block|pass
-
 		*/
 		switch($pkgdb_split[0]) {
 			case "SPAMTRAP":
@@ -427,8 +423,9 @@ function formatspamddatetime($dt) {
 				$attempts = htmlentities($pkgdb_split[8]);			
 				break;
 		}
-		if($srcip == "" and $fromaddress == "" and $toaddress == "") 
+		if ($srcip == "" and $fromaddress == "" and $toaddress == "") {
 			continue;
+		}
 		echo "<tr id=\"{$rows}\">";
 		echo "<td class=\"listr\">{$recordtype}</td>";		
 		echo "<td class=\"listr\">{$srcip}</td>";
@@ -438,40 +435,44 @@ function formatspamddatetime($dt) {
 		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> ";
-		$rowtext .= "<a href='javascript:toggle_on(\"b{$rows}\", \"/themes/{$g['theme']}/images/icons/icon_trapped_p.gif\");getURL(\"spamd_db.php?buttonid=b{$rows}&srcip={$srcip}&action=trapped\", outputrule);'><img title=\"Blacklist\" name='b{$rows}' id='b{$rows}' border=\"0\" alt=\"Blacklist\" src=\"/themes/{$g['theme']}/images/icons/icon_trapped.gif\"></a> ";
-		$rowtext .= "<a href='javascript:toggle_on(\"d{$rows}\", \"/themes/{$g['theme']}/images/icons/icon_x_p.gif\");getURL(\"spamd_db.php?buttonid=d{$rows}&srcip={$srcip}&action=delete\", outputrule);'><img title=\"Delete\" border=\"0\" name='d{$rows}' id='d{$rows}' alt=\"Delete\" src=\"./themes/{$g['theme']}/images/icons/icon_x.gif\"></a>";
-		$rowtext .= "<a href='javascript:toggle_on(\"s{$rows}\", \"/themes/{$g['theme']}/images/icons/icon_plus_bl_p.gif\");getURL(\"spamd_db.php?buttonid=s{$rows}&spamtrapemail={$toaddress}&action=spamtrap\", outputrule);'><img title=\"Spamtrap\" name='s{$rows}' id='s{$rows}' border=\"0\" alt=\"Spamtrap\" src=\"./themes/{$g['theme']}/images/icons/icon_plus_bl.gif\"></a> ";
-
+		echo "<td style=\"white-space:nowrap;\">";
+		$rowtext = "<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\" alt=\"\" /></a> ";
+		$rowtext .= "<a href='javascript:toggle_on(\"b{$rows}\", \"/themes/{$g['theme']}/images/icons/icon_trapped_p.gif\"); getURL(\"spamd_db.php?buttonid=b{$rows}&srcip={$srcip}&action=trapped\", outputrule);'><img title=\"Blacklist\" name='b{$rows}' id='b{$rows}' border=\"0\" alt=\"Blacklist\" src=\"/themes/{$g['theme']}/images/icons/icon_trapped.gif\" alt=\"\" /></a> ";
+		$rowtext .= "<a href='javascript:toggle_on(\"d{$rows}\", \"/themes/{$g['theme']}/images/icons/icon_x_p.gif\"); getURL(\"spamd_db.php?buttonid=d{$rows}&srcip={$srcip}&action=delete\", outputrule);'><img title=\"Delete\" border=\"0\" name='d{$rows}' id='d{$rows}' alt=\"Delete\" src=\"./themes/{$g['theme']}/images/icons/icon_x.gif\" alt=\"\" /></a>";
+		$rowtext .= "<a href='javascript:toggle_on(\"s{$rows}\", \"/themes/{$g['theme']}/images/icons/icon_plus_bl_p.gif\"); getURL(\"spamd_db.php?buttonid=s{$rows}&spamtrapemail={$toaddress}&action=spamtrap\", outputrule);'><img title=\"Spamtrap\" name='s{$rows}' id='s{$rows}' border=\"0\" alt=\"Spamtrap\" src=\"./themes/{$g['theme']}/images/icons/icon_plus_bl.gif\" alt=\"\" /></a> ";
 		echo $rowtext;
-		
 		echo "</td></tr>";
 
 		$rows++;
-	}	
-?>	</td></tr></table>
-	<tr><td>
-		<?php echo "<font face=\"arial\"><p><b>" . $rows . "</b> rows returned."; ?>
-		<p>
-		* NOTE: adding an e-mail address to the spamtrap automatically traps any server trying to send e-mail to this address.
-	</td></tr>
+	}
+?>
+			</td></tr>
+			</table>
+		<tr><td>
+			<?php echo "<font face=\"arial\"><p><b>" . $rows . "</b> rows returned.</p></font>"; ?>
+			<p>
+			* NOTE: adding an e-mail address to the spamtrap automatically traps any server trying to send e-mail to this address.
+			</p>
+		</td></tr>
 	</table>
 	</div>
-	</td>
-  </tr>
+</td></tr>
 </table>
 </form>
-<br>
-<span class="vexpl"><strong><span class="red">Note:</span> Clicking on the action icons will invoke a AJAX query and the page will not refresh.   Click refresh in you're browser if you wish to view the changes in status.</strong></span>
-<br>
-		<p><font size="-2"><b>Database totals:</b><br><font size="-3"><br>
-		<?php
-			echo "{$whitelist_items} total items in the whitelist.<br>";
-			echo "{$blacklist_items} total items in the blacklist.<br>";
-			echo "{$spamdb_grey} total items in the greylist.<br>";			
-			echo "{$spamdb_items} total items in the SpamDB.<br>";
-		?>
+<br />
+<span class="vexpl"><strong><span class="red">Note:</span> Clicking on the action icons will invoke a AJAX query and the page will not refresh. Click refresh in your browser if you wish to view the changes in status.</strong></span>
+<br />
+<p>
+	<font size="-2"><strong>Database totals:</strong></font><br/><br />
+	<font size="-3">
+	<?php
+		echo "{$whitelist_items} total items in the whitelist.<br />";
+		echo "{$blacklist_items} total items in the blacklist.<br />";
+		echo "{$spamdb_grey} total items in the greylist.<br />";			
+		echo "{$spamdb_items} total items in the SpamDB.<br />";
+	?>
+	</font>
+</p>
 <?php include("fend.inc"); ?>
 </body>
 </html>