From 05b0510a62bcc1da9841e981a52212477ad01c0e Mon Sep 17 00:00:00 2001
From: jim-p <jimp@pfsense.org>
Date: Wed, 7 May 2014 16:26:11 -0400
Subject: Fix call-time pass-by-reference in HAVP, bump

---
 config/havp/havp.inc       | 6 +++---
 config/havp/havp.xml       | 6 +++---
 config/havp/havp_avset.xml | 4 ++--
 config/havp/havp_fscan.xml | 4 ++--
 pkg_config.10.xml          | 2 +-
 pkg_config.8.xml           | 2 +-
 pkg_config.8.xml.amd64     | 2 +-
 7 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/config/havp/havp.inc b/config/havp/havp.inc
index 29a109ba..f6e37a3b 100644
--- a/config/havp/havp.inc
+++ b/config/havp/havp.inc
@@ -234,11 +234,11 @@ function havp_deinstall()
 # ==============================================================================
 # before form
 # ------------------------------------------------------------------------------
-function havp_before_form($pkg)
+function havp_before_form(&$pkg)
 {
 }
 # ------------------------------------------------------------------------------
-function havp_fscan_before_form($pkg)
+function havp_fscan_before_form(&$pkg)
 {
     if(is_array($pkg['fields']['field'])) {
         foreach($pkg['fields']['field'] as $key => $field) {
@@ -252,7 +252,7 @@ function havp_fscan_before_form($pkg)
 # ------------------------------------------------------------------------------
 # validation
 # ------------------------------------------------------------------------------
-function havp_validate_settings($post, $input_errors)
+function havp_validate_settings($post, &$input_errors)
 {
     $submit = isset($_GET['submit']) ? $_GET['submit'] : $_POST['submit'];
 
diff --git a/config/havp/havp.xml b/config/havp/havp.xml
index 1e50eb5e..47611030 100644
--- a/config/havp/havp.xml
+++ b/config/havp/havp.xml
@@ -3,7 +3,7 @@
         <name>havp</name>
         <title>Antivirus: HTTP proxy (havp + clamav)</title>
         <category>Status</category>
-        <version>0.88_03</version>
+        <version>1.02</version>
         <include_file>/usr/local/pkg/havp.inc</include_file>
         <menu>
                 <name>Antivirus</name>
@@ -288,10 +288,10 @@
                 </field>
         </fields>
         <custom_php_command_before_form>
-            havp_before_form(&amp;$pkg);
+            havp_before_form($pkg);
         </custom_php_command_before_form>
         <custom_php_validation_command>
-            havp_validate_settings($_POST, &amp;$input_errors);
+            havp_validate_settings($_POST, $input_errors);
         </custom_php_validation_command>
         <custom_php_resync_config_command>
             havp_resync();
diff --git a/config/havp/havp_avset.xml b/config/havp/havp_avset.xml
index 3cea9b76..3d4372f4 100644
--- a/config/havp/havp_avset.xml
+++ b/config/havp/havp_avset.xml
@@ -92,10 +92,10 @@
                 </field>
         </fields>
         <custom_php_command_before_form>
-		havp_before_form(&amp;$pkg);
+		havp_before_form($pkg);
         </custom_php_command_before_form>
         <custom_php_validation_command>
-		havp_validate_settings($_POST, &amp;$input_errors);
+		havp_validate_settings($_POST, $input_errors);
         </custom_php_validation_command>
         <custom_php_resync_config_command>
 		havp_avset_resync();
diff --git a/config/havp/havp_fscan.xml b/config/havp/havp_fscan.xml
index 1f0ca8dc..91dce25c 100644
--- a/config/havp/havp_fscan.xml
+++ b/config/havp/havp_fscan.xml
@@ -36,10 +36,10 @@
                 </field>
         </fields>
         <custom_php_command_before_form>
-            havp_fscan_before_form(&amp;$pkg);
+            havp_fscan_before_form($pkg);
         </custom_php_command_before_form>
         <custom_php_validation_command>
-            havp_validate_settings($_POST, &amp;$input_errors);
+            havp_validate_settings($_POST, $input_errors);
         </custom_php_validation_command>
         <custom_php_resync_config_command>
         </custom_php_resync_config_command>
diff --git a/pkg_config.10.xml b/pkg_config.10.xml
index 3643788e..b80ed2f3 100644
--- a/pkg_config.10.xml
+++ b/pkg_config.10.xml
@@ -1113,7 +1113,7 @@
 			<port>www/havp</port>
 		</build_pbi>
 		<build_options>CLAMAVUSER=havp;CLAMAVGROUP=havp</build_options>
-		<version>0.91_1 pkg v1.01</version>
+		<version>0.91_1 pkg v1.02</version>
 		<status>BETA</status>
 		<required_version>2.2</required_version>
 		<config_file>https://packages.pfsense.org/packages/config/havp/havp.xml</config_file>
diff --git a/pkg_config.8.xml b/pkg_config.8.xml
index bcba9edd..fefb7c7f 100644
--- a/pkg_config.8.xml
+++ b/pkg_config.8.xml
@@ -1470,7 +1470,7 @@
 		<depends_on_package_pbi>havp-0.91_1-i386.pbi</depends_on_package_pbi>
 		<build_port_path>/usr/ports/www/havp</build_port_path>
 		<build_options>CLAMAVUSER=havp;CLAMAVGROUP=havp</build_options>
-		<version>0.91_1 pkg v1.01</version>
+		<version>0.91_1 pkg v1.02</version>
 		<status>BETA</status>
 		<required_version>1.2.2</required_version>
 		<config_file>https://packages.pfsense.org/packages/config/havp/havp.xml</config_file>
diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64
index 085b0f42..19caa112 100644
--- a/pkg_config.8.xml.amd64
+++ b/pkg_config.8.xml.amd64
@@ -1457,7 +1457,7 @@
 		<depends_on_package_pbi>havp-0.91_1-amd64.pbi</depends_on_package_pbi>
 		<build_port_path>/usr/ports/www/havp</build_port_path>
 		<build_options>CLAMAVUSER=havp;CLAMAVGROUP=havp</build_options>
-		<version>0.91_1 pkg v1.01</version>
+		<version>0.91_1 pkg v1.02</version>
 		<status>BETA</status>
 		<required_version>1.2.2</required_version>
 		<config_file>https://packages.pfsense.org/packages/config/havp/havp.xml</config_file>
-- 
cgit v1.2.3