diff options
| author | Chris Buechler <cmb@pfsense.org> | 2015-08-16 00:12:43 -0500 |
|---|---|---|
| committer | Chris Buechler <cmb@pfsense.org> | 2015-08-16 00:12:43 -0500 |
| commit | 21fd7e810b732289f207f1c3ee4566be30f75659 (patch) | |
| tree | 2e8ffb77744ad962a3dcd22c0e57ff1d6b3140a7 /config/spamd/spamd_db.php | |
| parent | 7f77d22a3bca3c6c3e048fb823a893b85eedee49 (diff) | |
| parent | 3b12fa7aec920d072592c8801d1da4a84aac6056 (diff) | |
| download | pfsense-packages-21fd7e810b732289f207f1c3ee4566be30f75659.tar.gz pfsense-packages-21fd7e810b732289f207f1c3ee4566be30f75659.tar.bz2 pfsense-packages-21fd7e810b732289f207f1c3ee4566be30f75659.zip | |
Merge pull request #955 from PiBa-NL/spamd_1.1.2
Diffstat (limited to 'config/spamd/spamd_db.php')
| -rw-r--r-- | config/spamd/spamd_db.php | 31 |
1 files changed, 18 insertions, 13 deletions
diff --git a/config/spamd/spamd_db.php b/config/spamd/spamd_db.php index 83601805..3fe439ef 100644 --- a/config/spamd/spamd_db.php +++ b/config/spamd/spamd_db.php @@ -320,6 +320,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"); @@ -383,9 +388,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 = ""; @@ -398,7 +403,7 @@ if (typeof getURL == 'undefined') { $toaddress = ""; $first = ""; $pass = ""; - $expire = htmlentities($pkgdb_split[2]); + $expire = formatspamddatetime($pkgdb_split[2]); $attempts = ""; break; case "GREY": @@ -406,9 +411,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": @@ -416,9 +421,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; } @@ -429,9 +434,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> "; |