aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjim-p <jimp@pfsense.org>2014-05-09 14:24:49 -0400
committerjim-p <jimp@pfsense.org>2014-05-09 14:24:49 -0400
commit1d4b895614b279345659592ff7c808a3ce045946 (patch)
tree59b6df5f7d62415451f2b9a5eeff1cf3ee7ae716
parenta890380266da7f589b809701bd3d0e8ac715e82f (diff)
downloadpfsense-packages-1d4b895614b279345659592ff7c808a3ce045946.tar.gz
pfsense-packages-1d4b895614b279345659592ff7c808a3ce045946.tar.bz2
pfsense-packages-1d4b895614b279345659592ff7c808a3ce045946.zip
Fix call-time pass-by-reference in spamd, bump
-rw-r--r--config/spamd/spamd.inc2
-rw-r--r--config/spamd/spamd_settings.xml4
-rw-r--r--pkg_config.10.xml2
-rw-r--r--pkg_config.8.xml2
-rw-r--r--pkg_config.8.xml.amd642
5 files changed, 6 insertions, 6 deletions
diff --git a/config/spamd/spamd.inc b/config/spamd/spamd.inc
index 18b4e241..0bd29bd8 100644
--- a/config/spamd/spamd.inc
+++ b/config/spamd/spamd.inc
@@ -324,7 +324,7 @@ function spamd_install_cron($should_install) {
}
}
-function spamd_validate_input($post, $input_errors) {
+function spamd_validate_input($post, &$input_errors) {
global $config, $g;
$nextmta = str_replace("$", "", $post['nextmta']);
if(stristr($nextmta, "{")) {
diff --git a/config/spamd/spamd_settings.xml b/config/spamd/spamd_settings.xml
index 2607e87f..7ed4c572 100644
--- a/config/spamd/spamd_settings.xml
+++ b/config/spamd/spamd_settings.xml
@@ -42,7 +42,7 @@
<requirements>Describe your package requirements here</requirements>
<faq>Currently there are no FAQ items provided.</faq>
<name>spamdsettings</name>
- <version>0.1.0</version>
+ <version>1.1.1</version>
<title>SpamD Settings</title>
<aftersaveredirect>pkg_edit.php?xml=spamd_settings.xml&amp;id=0</aftersaveredirect>
<include_file>/usr/local/pkg/spamd.inc</include_file>
@@ -185,7 +185,7 @@
</field>
</fields>
<custom_php_validation_command>
- spamd_validate_input($_POST, &amp;$input_errors);
+ spamd_validate_input($_POST, $input_errors);
</custom_php_validation_command>
<custom_php_resync_config_command>
sync_package_spamd();
diff --git a/pkg_config.10.xml b/pkg_config.10.xml
index c2859517..9e36fa6d 100644
--- a/pkg_config.10.xml
+++ b/pkg_config.10.xml
@@ -410,7 +410,7 @@
<category>Services</category>
<config_file>https://packages.pfsense.org/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_1 v1.1</version>
+ <version>4.9.1_1 v1.1.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 30047046..49af2956 100644
--- a/pkg_config.8.xml
+++ b/pkg_config.8.xml
@@ -566,7 +566,7 @@
<depends_on_package_base_url>https://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 v1.1</version>
+ <version>4.9.1 v1.1.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 ebe74c1e..ba2690e1 100644
--- a/pkg_config.8.xml.amd64
+++ b/pkg_config.8.xml.amd64
@@ -553,7 +553,7 @@
<depends_on_package_base_url>https://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.9.1 v1.1</version>
+ <version>4.9.1 v1.1.1</version>
<status>Beta</status>
<required_version>1.2.1</required_version>
<configurationfile>spamd.xml</configurationfile>