aboutsummaryrefslogtreecommitdiffstats
path: root/config/spamd/spamd_db.php
diff options
context:
space:
mode:
authorErmal <eri@pfsense.org>2014-04-28 08:06:07 +0000
committerErmal <eri@pfsense.org>2014-04-28 08:06:07 +0000
commitd298aee67a45d08a93831a2b6f272165ff2f89e6 (patch)
treea170bdfa24a33ea7884e5efb34a3d3aa3e7b3915 /config/spamd/spamd_db.php
parente116c7c7697858fa319f4fae1e8fa4e0912e80f1 (diff)
parentca16935efd0fee58cc3a30be8d98a750b52a9c05 (diff)
downloadpfsense-packages-d298aee67a45d08a93831a2b6f272165ff2f89e6.tar.gz
pfsense-packages-d298aee67a45d08a93831a2b6f272165ff2f89e6.tar.bz2
pfsense-packages-d298aee67a45d08a93831a2b6f272165ff2f89e6.zip
Merge pull request #646 from PiBa-NL/spamd_db_content_extra_expiration_info
Diffstat (limited to 'config/spamd/spamd_db.php')
-rw-r--r--config/spamd/spamd_db.php19
1 files changed, 18 insertions, 1 deletions
diff --git a/config/spamd/spamd_db.php b/config/spamd/spamd_db.php
index c4c8ffe2..c2df25d1 100644
--- a/config/spamd/spamd_db.php
+++ b/config/spamd/spamd_db.php
@@ -205,7 +205,6 @@ $blacklist_items = $blacklist_items + $spamdb_black;
<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 src="/javascript/sorttable.js"></script>
<script language="javascript">
function outputrule(req) {
if(req.content != '') {
@@ -314,6 +313,9 @@ if (typeof getURL == 'undefined') {
<td class="listhdrr">IP</td>
<td class="listhdrr">From</td>
<td class="listhdrr">To</td>
+ <td class="listhdrr">First</td>
+ <td class="listhdrr">Pass</td>
+ <td class="listhdrr">Expire</td>
<td class="listhdr">Attempts</td>
<td class="list"></td>
</tr>
@@ -386,6 +388,9 @@ if (typeof getURL == 'undefined') {
$srcip = htmlentities($pkgdb_split[1]);
$fromaddress = htmlentities($pkgdb_split[3]);
$toaddress = htmlentities($pkgdb_split[4]);
+ $first = "";
+ $pass = "";
+ $expire = "";
$attempts = htmlentities($pkgdb_split[8]);
break;
case "TRAPPED":
@@ -393,6 +398,9 @@ if (typeof getURL == 'undefined') {
$srcip = htmlentities($pkgdb_split[1]);
$fromaddress = "";
$toaddress = "";
+ $first = "";
+ $pass = "";
+ $expire = htmlentities($pkgdb_split[2]);
$attempts = "";
break;
case "GREY":
@@ -400,6 +408,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]);
$attempts = htmlentities($pkgdb_split[8]);
break;
case "WHITE":
@@ -407,6 +418,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]);
$attempts = htmlentities($pkgdb_split[8]);
break;
}
@@ -417,6 +431,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\">{$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> ";