diff options
| author | jim-p <jimp@pfsense.org> | 2014-02-18 16:15:54 -0500 |
|---|---|---|
| committer | jim-p <jimp@pfsense.org> | 2014-02-18 16:15:54 -0500 |
| commit | a973e73b6fe151a342d5c998ed02c3fce482d006 (patch) | |
| tree | 3db0645d2834c5124db6f2dd66d97a5005ca4702 | |
| parent | 48a6f785e551967611ca49f40c05d1a567dd628e (diff) | |
| download | pfsense-packages-a973e73b6fe151a342d5c998ed02c3fce482d006.tar.gz pfsense-packages-a973e73b6fe151a342d5c998ed02c3fce482d006.tar.bz2 pfsense-packages-a973e73b6fe151a342d5c998ed02c3fce482d006.zip | |
Use escapeshellarg for spamd; remove unused echo.
| -rw-r--r-- | config/spamd/spamd.xml | 2 | ||||
| -rw-r--r-- | config/spamd/spamd_db.php | 2 | ||||
| -rw-r--r-- | config/spamd/spamd_db_ext.php | 2 | ||||
| -rw-r--r-- | pkg_config.10.xml | 2 | ||||
| -rw-r--r-- | pkg_config.8.xml | 2 | ||||
| -rw-r--r-- | pkg_config.8.xml.amd64 | 2 |
6 files changed, 5 insertions, 7 deletions
diff --git a/config/spamd/spamd.xml b/config/spamd/spamd.xml index 76d39af9..1a7b4272 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> diff --git a/config/spamd/spamd_db.php b/config/spamd/spamd_db.php index 112fdd71..c4c8ffe2 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']) diff --git a/pkg_config.10.xml b/pkg_config.10.xml index ac2ea8cd..3b33da5c 100644 --- a/pkg_config.10.xml +++ b/pkg_config.10.xml @@ -411,7 +411,7 @@ <category>Services</category> <config_file>http://www.pfsense.com/packages/config/spamd/spamd.xml</config_file> <depends_on_package_pbi>spamd-4.9.1_1-##ARCH##.pbi</depends_on_package_pbi> - <version>4.9.1</version> + <version>4.9.1_1 v1.1</version> <status>Beta</status> <required_version>2.2</required_version> <configurationfile>spamd.xml</configurationfile> diff --git a/pkg_config.8.xml b/pkg_config.8.xml index 32e6370a..b8d88a3f 100644 --- a/pkg_config.8.xml +++ b/pkg_config.8.xml @@ -567,7 +567,7 @@ <depends_on_package_base_url>http://files.pfsense.org/packages/8/All/</depends_on_package_base_url> <depends_on_package>spamd-4.9.1.tbz</depends_on_package> <depends_on_package_pbi>spamd-4.9.1-i386.pbi</depends_on_package_pbi> - <version>4.9.1</version> + <version>4.9.1 v1.1</version> <status>Beta</status> <required_version>1.2.1</required_version> <configurationfile>spamd.xml</configurationfile> diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64 index 52873dd1..df29e677 100644 --- a/pkg_config.8.xml.amd64 +++ b/pkg_config.8.xml.amd64 @@ -554,7 +554,7 @@ <depends_on_package_base_url>http://files.pfsense.org/packages/amd64/8/All/</depends_on_package_base_url> <depends_on_package>spamd-4.9.1.tbz</depends_on_package> <depends_on_package_pbi>spamd-4.9.1-amd64.pbi</depends_on_package_pbi> - <version>4.8.0</version> + <version>4.9.1 v1.1</version> <status>Beta</status> <required_version>1.2.1</required_version> <configurationfile>spamd.xml</configurationfile> |