diff options
| author | Scott Ullrich <sullrich@pfsense.org> | 2008-07-15 22:24:27 +0000 |
|---|---|---|
| committer | Scott Ullrich <sullrich@pfsense.org> | 2008-07-15 22:24:27 +0000 |
| commit | b3b190cab5ebc835ab3d6d34941844b8da23f574 (patch) | |
| tree | d345acfd8af57398dad16faf56bad1cba6bdee31 | |
| parent | ec9fcb0c3a7b05003f61825ccd7d06f71410bac0 (diff) | |
| download | pfsense-packages-b3b190cab5ebc835ab3d6d34941844b8da23f574.tar.gz pfsense-packages-b3b190cab5ebc835ab3d6d34941844b8da23f574.tar.bz2 pfsense-packages-b3b190cab5ebc835ab3d6d34941844b8da23f574.zip | |
Do not double escape items
| -rw-r--r-- | packages/spamd_db.php | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/packages/spamd_db.php b/packages/spamd_db.php index a611e893..10cf7a26 100644 --- a/packages/spamd_db.php +++ b/packages/spamd_db.php @@ -63,26 +63,26 @@ if($_GET['action'] or $_POST['action']) { /* execute spamdb command */ if($action == "'whitelist'") { exec("/usr/local/sbin/spamdb -d {$srcip}"); - exec("/usr/local/sbin/spamdb -d \"{$srcip}\" -T"); - exec("/usr/local/sbin/spamdb -d \"{$srcip}\" -t"); + 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'") { exec("/usr/local/sbin/spamdb -d {$srcip}"); - exec("/usr/local/sbin/spamdb -d \"{$srcip}\" -T"); - exec("/usr/local/sbin/spamdb -d \"{$srcip}\" -t"); + 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 == "'spamtrap'") { exec("/usr/local/sbin/spamdb -d {$srcip}"); - exec("/usr/local/sbin/spamdb -d \"{$srcip}\" -T"); - exec("/usr/local/sbin/spamdb -d \"{$srcip}\" -t"); + exec("/usr/local/sbin/spamdb -d {$srcip} -T"); + exec("/usr/local/sbin/spamdb -d {$srcip} -t"); exec("/usr/local/sbin/spamdb -a {$srcip} -T"); } else if($action == "'trapped'") { - exec("/usr/local/sbin/spamdb -T -d \"{$toaddress}\""); + exec("/usr/local/sbin/spamdb -T -d {$toaddress}"); exec("/usr/local/sbin/spamdb -T -a '{$toaddress}'"); } /* signal a reload for real time effect. */ @@ -94,8 +94,8 @@ if($_GET['action'] or $_POST['action']) { if($_POST['spamtrapemail'] <> "") { $spamtrapemail = escapeshellarg($_POST['spamtrapemail']); exec("/usr/local/sbin/spamdb -d {$spamtrapemail}"); - exec("/usr/local/sbin/spamdb -d -T \"{$spamtrapemail}\""); - exec("/usr/local/sbin/spamdb -d -t \"{$spamtrapemail}\""); + exec("/usr/local/sbin/spamdb -d -T {$spamtrapemail}"); + exec("/usr/local/sbin/spamdb -d -t {$spamtrapemail}"); exec("/usr/local/sbin/spamdb -T -a '{$toaddress}'"); mwexec("killall -HUP spamlogd"); @@ -121,7 +121,7 @@ if($_GET['getstatus'] <> "") { /* spam trap e-mail address */ if($_GET['spamtrapemail'] <> "") { $spamtrapemail = escapeshellarg($_GET['spamtrapemail']); - $status = exec("spamdb -T -a \"{$spamtrapemail}\""); + $status = exec("spamdb -T -a {$spamtrapemail}"); mwexec("killall -HUP spamlogd"); if($status) echo $status; @@ -133,7 +133,7 @@ if($_GET['spamtrapemail'] <> "") { /* whitelist e-mail address */ if($_GET['whitelist'] <> "") { $spamtrapemail = escapeshellarg($_GET['spamtrapemail']); - $status = exec("spamdb -a \"{$spamtrapemail}\""); + $status = exec("spamdb -a {$spamtrapemail}"); mwexec("killall -HUP spamlogd"); if($status) echo $status; @@ -152,7 +152,7 @@ function delete_from_blacklist($srcip) { fwrite($fd, "{$bl}\n"); } fclose($fd); - mwexec("/sbin/pfctl -q -t spamd -T delete $srcip"); + mwexec("/sbin/pfctl -q -t spamd -T delete {$srcip}"); mwexec("/sbin/pfctl -q -t blacklist -T replace -f /var/db/blacklist.txt"); config_unlock(); } |