From 67718c4fbf21473297b79c9710b7d65720c80d29 Mon Sep 17 00:00:00 2001
From: jim-p <jimp@pfsense.org>
Date: Wed, 7 May 2014 16:16:12 -0400
Subject: Fix call-time pass-by-reference in Zabbix2-agent and -proxy, bump

---
 config/zabbix2/zabbix2-agent.xml | 4 ++--
 config/zabbix2/zabbix2-proxy.xml | 4 ++--
 config/zabbix2/zabbix2.inc       | 2 +-
 pkg_config.10.xml                | 2 +-
 pkg_config.8.xml                 | 4 ++--
 pkg_config.8.xml.amd64           | 4 ++--
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/config/zabbix2/zabbix2-agent.xml b/config/zabbix2/zabbix2-agent.xml
index 24b7bd01..57ef7be3 100644
--- a/config/zabbix2/zabbix2-agent.xml
+++ b/config/zabbix2/zabbix2-agent.xml
@@ -41,7 +41,7 @@
 	<name>zabbixagent</name>
 	<title>Services: Zabbix-2 Agent</title>
 	<category>Monitoring</category>
-	<version>0.8_1</version>
+	<version>0.8.1</version>
 	<include_file>/usr/local/pkg/zabbix2.inc</include_file>
 	<addedit_string>Zabbix Agent has been created/modified.</addedit_string>
 	<delete_string>Zabbix Agent has been deleted.</delete_string>
@@ -172,7 +172,7 @@
 	<custom_php_command_before_form></custom_php_command_before_form>
 	<custom_php_after_head_command></custom_php_after_head_command>
 	<custom_php_after_form_command></custom_php_after_form_command>
-	<custom_php_validation_command>validate_input_zabbix2($_POST, &amp;$input_errors);</custom_php_validation_command>
+	<custom_php_validation_command>validate_input_zabbix2($_POST, $input_errors);</custom_php_validation_command>
 	<custom_add_php_command></custom_add_php_command>
 	<custom_php_resync_config_command>sync_package_zabbix2();</custom_php_resync_config_command>
 	<custom_php_deinstall_command>php_deinstall_zabbix2_agent();</custom_php_deinstall_command>
diff --git a/config/zabbix2/zabbix2-proxy.xml b/config/zabbix2/zabbix2-proxy.xml
index ebcb5bb0..b51d1d6b 100644
--- a/config/zabbix2/zabbix2-proxy.xml
+++ b/config/zabbix2/zabbix2-proxy.xml
@@ -41,7 +41,7 @@
 	<name>zabbixproxy</name>
 	<title>Services: Zabbix-2 Proxy</title>
 	<category>Monitoring</category>
-	<version>0.8_1</version>
+	<version>0.8.1</version>
 	<include_file>/usr/local/pkg/zabbix2.inc</include_file>
 	<addedit_string>Zabbix Proxy has been created/modified.</addedit_string>
 	<delete_string>Zabbix Proxy has been deleted.</delete_string>
@@ -143,7 +143,7 @@
 	<custom_php_command_before_form></custom_php_command_before_form>
 	<custom_php_after_head_command></custom_php_after_head_command>
 	<custom_php_after_form_command></custom_php_after_form_command>
-	<custom_php_validation_command>validate_input_zabbix2($_POST, &amp;$input_errors);</custom_php_validation_command>
+	<custom_php_validation_command>validate_input_zabbix2($_POST, $input_errors);</custom_php_validation_command>
 	<custom_add_php_command></custom_add_php_command>
 	<custom_php_resync_config_command>sync_package_zabbix2();</custom_php_resync_config_command>
 	<custom_php_deinstall_command>php_deinstall_zabbix2_proxy();</custom_php_deinstall_command>
diff --git a/config/zabbix2/zabbix2.inc b/config/zabbix2/zabbix2.inc
index bf9c6606..c2ff4244 100644
--- a/config/zabbix2/zabbix2.inc
+++ b/config/zabbix2/zabbix2.inc
@@ -99,7 +99,7 @@ function php_deinstall_zabbix2_proxy(){
    conf_mount_ro();
 }
 
-function validate_input_zabbix2($post,&$input_errors){
+function validate_input_zabbix2($post, &$input_errors){
 
 	if  (isset($post['proxyenabled'])){
 		if (!is_numericint($post['serverport'])) {
diff --git a/pkg_config.10.xml b/pkg_config.10.xml
index 8a7ee3aa..3643788e 100644
--- a/pkg_config.10.xml
+++ b/pkg_config.10.xml
@@ -1439,7 +1439,7 @@
 		<descr>Monitoring agent.</descr>
 		<category>Services</category>
 		<config_file>https://packages.pfsense.org/packages/config/zabbix2/zabbix2-agent.xml</config_file>
-		<version>zabbix2-agent-2.2.2_1 pkg v0.8_1</version>
+		<version>zabbix2-agent-2.2.2_1 pkg v0.8.1</version>
 		<status>BETA</status>
 		<required_version>2.2</required_version>
 		<configurationfile>zabbix2-agent.xml</configurationfile>
diff --git a/pkg_config.8.xml b/pkg_config.8.xml
index e10572d7..fbafdd30 100644
--- a/pkg_config.8.xml
+++ b/pkg_config.8.xml
@@ -1875,7 +1875,7 @@
 		<descr>Monitoring agent.</descr>
 		<category>Services</category>
 		<config_file>https://packages.pfsense.org/packages/config/zabbix2/zabbix2-agent.xml</config_file>
-		<version>zabbix2-agent-2.2.2_1 pkg v0.8_2</version>
+		<version>zabbix2-agent-2.2.2_1 pkg v0.8.1</version>
 		<status>BETA</status>
 		<required_version>2.0</required_version>
 		<configurationfile>zabbix2-agent.xml</configurationfile>
@@ -1894,7 +1894,7 @@
 		<descr>Monitoring agent proxy.</descr>
 		<category>Services</category>
 		<config_file>https://packages.pfsense.org/packages/config/zabbix2/zabbix2-proxy.xml</config_file>
-		<version>zabbix2-proxy-2.2.2_1 pkg v0.8_2</version>
+		<version>zabbix2-proxy-2.2.2_1 pkg v0.8.1</version>
 		<status>BETA</status>
 		<required_version>2.0</required_version>
 		<configurationfile>zabbix2-proxy.xml</configurationfile>
diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64
index 13510ac8..af9e48b2 100644
--- a/pkg_config.8.xml.amd64
+++ b/pkg_config.8.xml.amd64
@@ -1862,7 +1862,7 @@
 		<descr>Monitoring agent.</descr>
 		<category>Services</category>
 		<config_file>https://packages.pfsense.org/packages/config/zabbix2/zabbix2-agent.xml</config_file>
-		<version>zabbix2-agent-2.2.2_1 pkg v0.8_2</version>
+		<version>zabbix2-agent-2.2.2_1 pkg v0.8.1</version>
 		<status>BETA</status>
 		<required_version>2.0</required_version>
 		<configurationfile>zabbix2-agent.xml</configurationfile>
@@ -1881,7 +1881,7 @@
 		<descr>Monitoring agent proxy.</descr>
 		<category>Services</category>
 		<config_file>https://packages.pfsense.org/packages/config/zabbix2/zabbix2-proxy.xml</config_file>
-		<version>zabbix2-proxy-2.2.2_1 pkg v0.8_2</version>
+		<version>zabbix2-proxy-2.2.2_1 pkg v0.8.1</version>
 		<status>BETA</status>
 		<required_version>2.0</required_version>
 		<configurationfile>zabbix2-proxy.xml</configurationfile>
-- 
cgit v1.2.3