diff options
Diffstat (limited to 'config/spamd')
| -rw-r--r-- | config/spamd/spamd.xml | 18 | ||||
| -rw-r--r-- | config/spamd/spamd_db.php | 2 | ||||
| -rw-r--r-- | config/spamd/spamd_db_ext.php | 2 |
3 files changed, 10 insertions, 12 deletions
diff --git a/config/spamd/spamd.xml b/config/spamd/spamd.xml index 76d39af9..45cc9168 100644 --- a/config/spamd/spamd.xml +++ b/config/spamd/spamd.xml @@ -42,7 +42,7 @@ <requirements>Describe your package requirements here</requirements> <faq>Currently there are no FAQ items provided.</faq> <name>spamdsources</name> - <version>4.2</version> + <version>4.9.1 v1.1</version> <title>SpamD: External Sources</title> <include_file>/usr/local/pkg/spamd.inc</include_file> <backup_file>/var/db/spamd</backup_file> @@ -97,42 +97,42 @@ <additional_files_needed> <prefix>/usr/local/www/</prefix> <chmod>0755</chmod> - <item>http://www.pfsense.com/packages/config/spamd/spamd_rules.php</item> + <item>https://packages.pfsense.org/packages/config/spamd/spamd_rules.php</item> </additional_files_needed> <additional_files_needed> <prefix>/usr/local/pkg/</prefix> <chmod>0755</chmod> - <item>http://www.pfsense.com/packages/config/spamd/spamd_whitelist.xml</item> + <item>https://packages.pfsense.org/packages/config/spamd/spamd_whitelist.xml</item> </additional_files_needed> <additional_files_needed> <prefix>/usr/local/pkg/</prefix> <chmod>0755</chmod> - <item>http://www.pfsense.com/packages/config/spamd/spamd_outlook.xml</item> + <item>https://packages.pfsense.org/packages/config/spamd/spamd_outlook.xml</item> </additional_files_needed> <additional_files_needed> <prefix>/usr/local/pkg/</prefix> <chmod>0755</chmod> - <item>http://www.pfsense.com/packages/config/spamd/spamd.inc</item> + <item>https://packages.pfsense.org/packages/config/spamd/spamd.inc</item> </additional_files_needed> <additional_files_needed> <prefix>/usr/local/pkg/</prefix> <chmod>0755</chmod> - <item>http://www.pfsense.com/packages/config/spamd/spamd_settings.xml</item> + <item>https://packages.pfsense.org/packages/config/spamd/spamd_settings.xml</item> </additional_files_needed> <additional_files_needed> <prefix>/usr/local/www/</prefix> <chmod>0755</chmod> - <item>http://www.pfsense.com/packages/config/spamd/spamd_db.php</item> + <item>https://packages.pfsense.org/packages/config/spamd/spamd_db.php</item> </additional_files_needed> <additional_files_needed> <prefix>/usr/local/www/</prefix> <chmod>0755</chmod> - <item>http://www.pfsense.com/packages/config/spamd/spamd_db_ext.php</item> + <item>https://packages.pfsense.org/packages/config/spamd/spamd_db_ext.php</item> </additional_files_needed> <additional_files_needed> <prefix>/usr/local/bin/</prefix> <chmod>0755</chmod> - <item>http://www.pfsense.com/packages/config/spamd/spamd_gather_stats.php</item> + <item>https://packages.pfsense.org/packages/config/spamd/spamd_gather_stats.php</item> </additional_files_needed> <!-- fields gets invoked when the user adds or edits a item. the following items diff --git a/config/spamd/spamd_db.php b/config/spamd/spamd_db.php index 7faef7f0..c2df25d1 100644 --- a/config/spamd/spamd_db.php +++ b/config/spamd/spamd_db.php @@ -103,7 +103,7 @@ if($_POST['spamtrapemail'] <> "") { } if($_GET['getstatus'] <> "") { - $status = exec("/usr/local/sbin/spamdb | grep \"{$_GET['getstatus']}\""); + $status = exec("/usr/local/sbin/spamdb | grep " . escapeshellarg($_GET['getstatus'])); if(stristr($status, "WHITE") == true) { echo "WHITE"; } else if(stristr($status, "TRAPPED") == true) { diff --git a/config/spamd/spamd_db_ext.php b/config/spamd/spamd_db_ext.php index e029f676..61a90141 100644 --- a/config/spamd/spamd_db_ext.php +++ b/config/spamd/spamd_db_ext.php @@ -54,8 +54,6 @@ foreach($config['installedpackages']['spamdoutlook']['config'] as $outlook) { } } -exec("echo {$_GET['action']} > /tmp/tmp"); - /* handle AJAX operations */ if($_GET['action'] or $_POST['action']) { if($_GET['action']) |