From c123ca2922f22f19ca69e1c0d02b81533bee4312 Mon Sep 17 00:00:00 2001
From: Scott Ullrich <sullrich@pfsense.org>
Date: Sun, 5 Feb 2006 07:25:11 +0000
Subject: Add <backup_file> which will be included with package backups soon to
 backup essential files not included by config.xml

---
 packages/spamd.xml    | 5 +++--
 packages/spamd_db.php | 6 +++---
 2 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'packages')

diff --git a/packages/spamd.xml b/packages/spamd.xml
index 8a7fc6ea..9bceb8fd 100644
--- a/packages/spamd.xml
+++ b/packages/spamd.xml
@@ -3,7 +3,8 @@
 	<name>spamdsources</name>
 	<version>4.2</version>
 	<include_file>/usr/local/pkg/spamd.inc</include_file>
-	<title></title>
+	<title>SpamD</title>
+	<backup_file>/var/db/spamd</backup_file>
 	<!-- Menu is where this packages menu will appear -->
 	<menu>
 		<name>SpamD</name>
@@ -12,7 +13,7 @@
 	</menu>
 	<service>
                 <name>spamd</name>
-                <rcfile>spamd.sh</rcfile>
+                <rcfile>/usr/local/etc/rc.d/spamd.sh</rcfile>
         </service>
 	<tabs>
 		<tab>
diff --git a/packages/spamd_db.php b/packages/spamd_db.php
index 046ce6cb..c55a0e2c 100644
--- a/packages/spamd_db.php
+++ b/packages/spamd_db.php
@@ -232,7 +232,7 @@ if (typeof getURL == 'undefined') {
 				$col = str_replace("-"," -",$col);
 				$col = str_replace("."," .",$col);
 			}
-			$rowtext .= "<td class=\"listr\">{$col}</td>";
+			$rowtext .= "<td class=\"listr\">&nbsp;{$col}&nbsp;</td>";
 			$column++;
 		}
 		if(strstr($pkgdb_row, "TRAPPED")) {
@@ -245,14 +245,14 @@ if (typeof getURL == 'undefined') {
 				$rowtext .= "<td class=\"listr\"></td>";
 			}
 		}		
-		$rowtext .= "<td class=\"list\">";
+		$rowtext .= "<td class=\"list\">&nbsp;";
 		$srcip = $pkgdb_split[1];
 		$lastrow = $rows - 1;
 		$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:delete_row_db(\"{$rows}\"); toggle_on(\"s{$rows}\", \"/themes/{$g['theme']}/images/icons/icon_plus_bl_p.gif\");getURL(\"spamd_db.php?buttonid=s{$rows}&srcip={$srcip}&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> ";
-		$rowtext .= "</NOBR></td>";		
+		$rowtext .= "</NOBR>&nbsp;</td>";		
 		$rowtext .= "</tr>";
 		if($srcip == "")
 			$dontdisplay = true;
-- 
cgit v1.2.3