Merge pull request #1109 from doktornotor/patch-3

8 files changed, 458 insertions, 337 deletions

diff --git a/config/zabbix2/zabbix2-agent.priv.inc b/config/zabbix2/zabbix2-agent.priv.inc
new file mode 100644
index 00000000..bdd3543d
--- /dev/null
+++ b/config/zabbix2/zabbix2-agent.priv.inc
@@ -0,0 +1,38 @@
+<?php
+/*
+	zabbix2-agent.priv.inc
+	part of pfSense (http://www.pfSense.org/)
+	Copyright (C) 2015 ESF, LLC
+	All rights reserved.
+
+	Redistribution and use in source and binary forms, with or without
+	modification, are permitted provided that the following conditions are met:
+
+	1. Redistributions of source code must retain the above copyright notice,
+	   this list of conditions and the following disclaimer.
+
+	2. Redistributions in binary form must reproduce the above copyright
+	   notice, this list of conditions and the following disclaimer in the
+	   documentation and/or other materials provided with the distribution.
+
+	THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+	INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+	AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+	AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+	OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+	SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+	INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+	CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+	POSSIBILITY OF SUCH DAMAGE.
+*/
+global $priv_list;
+
+$priv_list['page-services-zabbix2-agent'] = array();
+$priv_list['page-services-zabbix2-agent']['name'] = "WebCfg - Services: Zabbix-2 Agent package";
+$priv_list['page-services-zabbix2-agent']['descr'] = "Allow access to Zabbix-2 Agent package GUI";
+
+$priv_list['page-services-zabbix2-agent']['match'] = array();
+$priv_list['page-services-zabbix2-agent']['match'][] = "pkg_edit.php?xml=zabbix2-agent.xml*";
+
+?>
diff --git a/config/zabbix2/zabbix2-agent.xml b/config/zabbix2/zabbix2-agent.xml
index 3d2400ad..e02caefc 100644
--- a/config/zabbix2/zabbix2-agent.xml
+++ b/config/zabbix2/zabbix2-agent.xml
@@ -1,47 +1,51 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE packagegui SYSTEM "../schema/packages.dtd">
+<?xml-stylesheet type="text/xsl" href="../xsl/package.xsl"?>
 <packagegui>
-<copyright>
+	<copyright>
 	<![CDATA[
 /* $Id$ */
-/* ========================================================================== */
+/* ====================================================================================== */
 /*
-    zabbix2-agent.xml
-    part of the Zabbix package for pfSense
-    Copyright (C) 2013 Danilo G. Baio
+	zabbix2-agent.xml
+	part of pfSense (https://www.pfSense.org/)
+	Copyright (C) 2013 Danilo G. Baio
 	Copyright (C) 2013 Marcello Coutinho
-	
-    All rights reserved.            
-			                                                                  */
-/* ========================================================================== */
+	Copyright (C) 2015 ESF, LLC
+	All rights reserved.
+*/
+/* ====================================================================================== */
 /*
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions are met:
+	Redistribution and use in source and binary forms, with or without
+	modification, are permitted provided that the following conditions are met:
 
-     1. Redistributions of source code must retain the above copyright notice,
-        this list of conditions and the following disclaimer.
 
-     2. Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
+	1. Redistributions of source code must retain the above copyright notice,
+	   this list of conditions and the following disclaimer.
 
-    THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
-    INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
-    AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-    AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
-    OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-    INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-    CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-    ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-    POSSIBILITY OF SUCH DAMAGE.
-                                                                              */
-/* ========================================================================== */
+	2. Redistributions in binary form must reproduce the above copyright
+	   notice, this list of conditions and the following disclaimer in the
+	   documentation and/or other materials provided with the distribution.
+
+
+	THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+	INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+	AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+	AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+	OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+	SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+	INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+	CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+	POSSIBILITY OF SUCH DAMAGE.
+*/
+/* ====================================================================================== */
 	]]>
 	</copyright>
 	<name>zabbixagent</name>
 	<title>Services: Zabbix-2 Agent</title>
 	<category>Monitoring</category>
-	<version>0.8.3</version>
+	<version>0.8.4</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>
@@ -49,7 +53,10 @@
 	<additional_files_needed>
 		<item>https://packages.pfsense.org/packages/config/zabbix2/zabbix2.inc</item>
 		<prefix>/usr/local/pkg/</prefix>
-		<chmod>0755</chmod>
+	</additional_files_needed>
+	<additional_files_needed>
+		<item>https://packages.pfsense.org/packages/config/zabbix2/zabbix2-agent.priv.inc</item>
+		<prefix>/etc/inc/priv/</prefix>
 	</additional_files_needed>
 	<menu>
 		<name>Zabbix-2 Agent</name>
@@ -61,7 +68,7 @@
 		<name>zabbix_agentd</name>
 		<rcfile>zabbix2_agentd.sh</rcfile>
 		<executable>zabbix_agentd</executable>
-		<description>Zabbix Agent host monitor daemon</description>
+		<description>Zabbix Agent Host Monitor Daemon</description>
 	</service>
 	<tabs>
 		<tab>
@@ -70,6 +77,7 @@
 			<active />
 		</tab>
 	</tabs>
+	<advanced_options>enabled</advanced_options>
 	<fields>
 		<field>
 			<name>Zabbix2 Agent Settings</name>
@@ -78,27 +86,27 @@
 		<field>
 			<fielddescr>Enable</fielddescr>
 			<fieldname>agentenabled</fieldname>
-			<description>Enable Zabbix2 Agent service</description>
+			<description>Enable Zabbix2 Agent service.</description>
 			<type>checkbox</type>
 		</field>
 		<field>
 			<fielddescr>Server</fielddescr>
 			<fieldname>server</fieldname>
-			<description>List of comma delimited IP addresses (or hostnames) of ZABBIX servers</description>
+			<description>List of comma delimited IP addresses (or hostnames) of Zabbix servers.</description>
 			<type>input</type>
 			<size>60</size>
 		</field>
 		<field>
 			<fielddescr>Server Active</fielddescr>
 			<fieldname>serveractive</fieldname>
-			<description>List of comma delimited IP:port (or hostname:port) pairs of Zabbix servers for active checks</description>
+			<description>List of comma delimited IP:port (or hostname:port) pairs of Zabbix servers for active checks.</description>
 			<type>input</type>
 			<size>60</size>
 		</field>
 		<field>
 			<fielddescr>Hostname</fielddescr>
 			<fieldname>hostname</fieldname>
-			<description>Unique hostname. Required for active checks and must match hostname as configured on the Zabbix server (case sensitive).</description>
+			<description>Unique, case sensitive hostname. Required for active checks and must match hostname as configured on the Zabbix server.</description>
 			<type>input</type>
 			<size>60</size>
 		</field>
@@ -108,7 +116,7 @@
 			<default_value>0.0.0.0</default_value>
 			<type>input</type>
 			<size>60</size>
-			<description>Listen IP for connections from the server (default 0.0.0.0 for all interfaces)</description>
+			<description>Listen IP for connections from the server. (Default: 0.0.0.0 - all interfaces)</description>
 		</field>
 		<field>
 			<fielddescr>Listen Port</fielddescr>
@@ -116,7 +124,7 @@
 			<default_value>10050</default_value>
 			<type>input</type>
 			<size>5</size>
-			<description>Listen port for connections from the server (default 10050)</description>
+			<description>Listen port for connections from the server. (Default: 10050)</description>
 		</field>
 		<field>
 			<fielddescr>Refresh Active Checks</fielddescr>
@@ -124,7 +132,7 @@
 			<default_value>120</default_value>
 			<type>input</type>
 			<size>5</size>
-			<description>The agent will refresh list of active checks once per 120 (default) seconds.</description>
+			<description>The agent will refresh list of active checks once per this number of seconds. (Default: 120)</description>
 		</field>
 		<field>
 			<fielddescr>Timeout</fielddescr>
@@ -132,7 +140,13 @@
 			<default_value>3</default_value>
 			<type>input</type>
 			<size>5</size>
-			<description>Timeout (default 3). Do not spend more that Timeout seconds on getting requested value (1-30). The agent does not kill timeouted User Parameters processes!</description>
+			<description>
+				<![CDATA[
+				Do not spend more that N seconds on getting requested value.<br />
+				Note: The agent does not kill timeouted User Parameters processes!<br />
+				(Default: 3. Valid range: 1-30)
+				]]>
+			</description>
 		</field>
 		<field>
 			<fielddescr>Buffer Send</fielddescr>
@@ -140,7 +154,12 @@
 			<default_value>5</default_value>
 			<type>input</type>
 			<size>5</size>
-			<description>Buffer Send (default 5). Do not keep data longer than N seconds in buffer (1-3600).</description>
+			<description>
+				<![CDATA[
+				Do not keep data longer than N seconds in buffer.<br />
+				(Default: 5. Valid range: 1-3600)
+				]]>
+			</description>
 		</field>
 		<field>
 			<fielddescr>Buffer Size</fielddescr>
@@ -148,7 +167,12 @@
 			<default_value>100</default_value>
 			<type>input</type>
 			<size>5</size>
-			<description>Buffer Size (default 100). Maximum number of values in a memory buffer (2-65535). The agent will send all collected data to Zabbix server or proxy if the buffer is full.</description>
+			<description>
+				<![CDATA[
+				Maximum number of values in the memory buffer. The agent will send all collected data to Zabbix server or proxy if the buffer is full.<br />
+				(Default: 100. Valid range: 2-65535)
+				]]>
+			</description>
 		</field>
 		<field>
 			<fielddescr>Start Agents</fielddescr>
@@ -156,7 +180,13 @@
 			<default_value>3</default_value>
 			<type>input</type>
 			<size>5</size>
-			<description>Start Agents (default 3). Number of pre-forked instances of zabbix_agentd that process passive checks (0-100).If set to 0, disables passive checks and the agent will not listen on any TCP port.</description>
+			<description>
+				<![CDATA[
+				Number of pre-forked instances of zabbix_agentd that process passive checks.<br />
+				Note: Setting to 0 disables passive checks and the agent will not listen on any TCP port.<br />
+				(Default: 3. Valid range: 0-100)
+				]]>
+			</description>
 		</field>
 		<field>
 			<fielddescr>User Parameters</fielddescr>
@@ -165,15 +195,25 @@
 			<type>textarea</type>
 			<rows>5</rows>
 			<cols>50</cols>
-			<description>User-defined parameter to monitor. There can be several user-defined parameters. Value has form, example: UserParameter=users,who|wc -l</description>
+			<description>
+				<![CDATA[
+				User-defined parameter(s) to monitor. There can be multiple user-defined parameters.<br />
+				Example: <em>UserParameter=users,who|wc -l</em>
+				]]>
+			</description>
+			<advancedfield/>
 		</field>
 	</fields>
-	<custom_php_install_command>sync_package_zabbix2();</custom_php_install_command>
-	<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, $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>
+	<custom_php_install_command>
+		sync_package_zabbix2();
+	</custom_php_install_command>
+	<custom_php_validation_command>
+		validate_input_zabbix2($_POST, $input_errors);
+	</custom_php_validation_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>
 </packagegui>
diff --git a/config/zabbix2/zabbix2-proxy.priv.inc b/config/zabbix2/zabbix2-proxy.priv.inc
new file mode 100644
index 00000000..f3bfc5e1
--- /dev/null
+++ b/config/zabbix2/zabbix2-proxy.priv.inc
@@ -0,0 +1,38 @@
+<?php
+/*
+	zabbix2-proxy.priv.inc
+	part of pfSense (http://www.pfSense.org/)
+	Copyright (C) 2015 ESF, LLC
+	All rights reserved.
+
+	Redistribution and use in source and binary forms, with or without
+	modification, are permitted provided that the following conditions are met:
+
+	1. Redistributions of source code must retain the above copyright notice,
+	   this list of conditions and the following disclaimer.
+
+	2. Redistributions in binary form must reproduce the above copyright
+	   notice, this list of conditions and the following disclaimer in the
+	   documentation and/or other materials provided with the distribution.
+
+	THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+	INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+	AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+	AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+	OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+	SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+	INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+	CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+	POSSIBILITY OF SUCH DAMAGE.
+*/
+global $priv_list;
+
+$priv_list['page-services-zabbix2-proxy'] = array();
+$priv_list['page-services-zabbix2-proxy']['name'] = "WebCfg - Services: Zabbix-2 Proxy package";
+$priv_list['page-services-zabbix2-proxy']['descr'] = "Allow access to Zabbix-2 Proxy package GUI";
+
+$priv_list['page-services-zabbix2-proxy']['match'] = array();
+$priv_list['page-services-zabbix2-proxy']['match'][] = "pkg_edit.php?xml=zabbix2-proxy.xml*";
+
+?>
diff --git a/config/zabbix2/zabbix2-proxy.xml b/config/zabbix2/zabbix2-proxy.xml
index 00d9b106..398c3df4 100644
--- a/config/zabbix2/zabbix2-proxy.xml
+++ b/config/zabbix2/zabbix2-proxy.xml
@@ -1,47 +1,51 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE packagegui SYSTEM "../schema/packages.dtd">
+<?xml-stylesheet type="text/xsl" href="../xsl/package.xsl"?>
 <packagegui>
-<copyright>
+	<copyright>
 	<![CDATA[
 /* $Id$ */
-/* ========================================================================== */
+/* ====================================================================================== */
 /*
-    zabbix2-proxy.xml
-    part of the Zabbix package for pfSense
-    Copyright (C) 2013 Danilo G. Baio
-    Copyright (C) 2013 Marcello Coutinho
-
-    All rights reserved.            
-			                                                                  */
-/* ========================================================================== */
+	zabbix2-proxy.xml
+	part of pfSense (https://www.pfSense.org/)
+	Copyright (C) 2013 Danilo G. Baio
+	Copyright (C) 2013 Marcello Coutinho
+	Copyright (C) 2015 ESF, LLC
+	All rights reserved.
+*/
+/* ====================================================================================== */
 /*
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions are met:
+	Redistribution and use in source and binary forms, with or without
+	modification, are permitted provided that the following conditions are met:
+
 
-     1. Redistributions of source code must retain the above copyright notice,
-        this list of conditions and the following disclaimer.
+	1. Redistributions of source code must retain the above copyright notice,
+	   this list of conditions and the following disclaimer.
 
-     2. Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
+	2. Redistributions in binary form must reproduce the above copyright
+	   notice, this list of conditions and the following disclaimer in the
+	   documentation and/or other materials provided with the distribution.
 
-    THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
-    INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
-    AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-    AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
-    OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-    INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-    CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-    ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-    POSSIBILITY OF SUCH DAMAGE.
-                                                                              */
-/* ========================================================================== */
+
+	THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+	INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+	AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+	AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+	OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+	SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+	INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+	CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+	POSSIBILITY OF SUCH DAMAGE.
+*/
+/* ====================================================================================== */
 	]]>
 	</copyright>
 	<name>zabbixproxy</name>
 	<title>Services: Zabbix-2 Proxy</title>
 	<category>Monitoring</category>
-	<version>0.8.3</version>
+	<version>0.8.4</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>
@@ -49,7 +53,10 @@
 	<additional_files_needed>
 		<item>https://packages.pfsense.org/packages/config/zabbix2/zabbix2.inc</item>
 		<prefix>/usr/local/pkg/</prefix>
-		<chmod>0755</chmod>
+	</additional_files_needed>
+	<additional_files_needed>
+		<item>https://packages.pfsense.org/packages/config/zabbix2/zabbix2-proxy.priv.inc</item>
+		<prefix>/etc/inc/priv/</prefix>
 	</additional_files_needed>
 	<menu>
 		<name>Zabbix-2 Proxy</name>
@@ -61,7 +68,7 @@
 		<name>zabbix_proxy</name>
 		<rcfile>zabbix2_proxy.sh</rcfile>
 		<executable>zabbix_proxy</executable>
-		<description>Zabbix proxy collection daemon</description>
+		<description>Zabbix Proxy Collection Daemon</description>
 	</service>
 	<tabs>
 		<tab>
@@ -70,6 +77,7 @@
 			<active />
 		</tab>
 	</tabs>
+	<advanced_options>enabled</advanced_options>
 	<fields>
 		<field>
 			<name>Zabbix2 Proxy Settings</name>
@@ -78,31 +86,31 @@
 		<field>
 			<fielddescr>Enable</fielddescr>
 			<fieldname>proxyenabled</fieldname>
-			<description>Enable Zabbix2 Proxy service</description>
+			<description>Enable Zabbix2 Proxy service.</description>
 			<type>checkbox</type>
 		</field>
 		<field>
 			<fielddescr>Server</fielddescr>
 			<fieldname>server</fieldname>
-			<description>List of comma delimited IP addresses (or hostnames) of ZABBIX servers</description>
+			<description>List of comma delimited IP addresses (or hostnames) of Zabbix servers.</description>
 			<default_value>127.0.0.1</default_value>
 			<type>input</type>
 			<size>60</size>
 			<required>true</required>
 		</field>
 		<field>
-         <fielddescr>Server Port</fielddescr>
-         <fieldname>serverport</fieldname>
-         <description>Port of Zabbix trapper on Zabbix server. default value 10051</description>
-         <default_value>10051</default_value>
-         <type>input</type>
-         <size>6</size>
-         <required>true</required>
+			<fielddescr>Server Port</fielddescr>
+			<fieldname>serverport</fieldname>
+			<description>Port of Zabbix trapper on Zabbix server. (Default: 10051)</description>
+			<default_value>10051</default_value>
+			<type>input</type>
+			<size>6</size>
+			<required>true</required>
 		</field>
 		<field>
 			<fielddescr>Hostname</fielddescr>
 			<fieldname>hostname</fieldname>
-			<description>Unique, case-sensitive proxy name. Make sure the proxy name is known to the server</description>
+			<description>Unique, case-sensitive proxy name. Make sure the proxy name is known to the server.</description>
 			<default_value>localhost</default_value>
 			<type>input</type>
 			<size>50</size>
@@ -111,7 +119,7 @@
 		<field>
 			<fielddescr>Proxy Mode</fielddescr>
 			<fieldname>proxymode</fieldname>
-			<description>Select Zabbix proxy mode (Active is default)</description>
+			<description>Select Zabbix proxy mode. (Default: Active)</description>
 			<type>select</type>
 			<default_value>0</default_value>
 			<options>
@@ -136,15 +144,20 @@
 			<type>textarea</type>
 			<rows>5</rows>
 			<cols>50</cols>
-			<description>Advanced parameters. There are some rarely used parameters that sometimes need to be defined. Value has form, example: StartDiscoverers=10</description>
+			<description>Advanced parameters. There are some rarely used parameters that sometimes need to be defined. Example: StartDiscoverers=10</description>
+			<advancedfield/>
 		</field>
 	</fields>
-	<custom_php_install_command>sync_package_zabbix2();</custom_php_install_command>
-	<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, $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>
+	<custom_php_install_command>
+		sync_package_zabbix2();
+	</custom_php_install_command>
+	<custom_php_validation_command>
+		validate_input_zabbix2($_POST, $input_errors);
+	</custom_php_validation_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>
 </packagegui>
diff --git a/config/zabbix2/zabbix2.inc b/config/zabbix2/zabbix2.inc
index 77f1d6e1..9b5f3ed3 100644
--- a/config/zabbix2/zabbix2.inc
+++ b/config/zabbix2/zabbix2.inc
@@ -1,205 +1,213 @@
 <?php
-/* $Id$ */
-/* ========================================================================== */
 /*
-    zabbix2.inc
-    part of the Zabbix package for pfSense
-    Copyright (C) 2013 Danilo G. Baio
-    Copyright (C) 2013 Marcello Coutinho
-
-    All rights reserved.            
-			                                                                  */
-/* ========================================================================== */
-/*
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions are met:
-
-     1. Redistributions of source code must retain the above copyright notice,
-        this list of conditions and the following disclaimer.
-
-     2. Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
-
-    THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
-    INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
-    AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-    AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
-    OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-    INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-    CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-    ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-    POSSIBILITY OF SUCH DAMAGE.
-                                                                              */
-/* ========================================================================== */
+	zabbix2.inc
+	part of pfSense (https://www.pfSense.org/)
+	Copyright (C) 2013 Danilo G. Baio
+	Copyright (C) 2013 Marcello Coutinho
+	Copyright (C) 2015 ESF, LLC
+	All rights reserved.
+
+	Redistribution and use in source and binary forms, with or without
+	modification, are permitted provided that the following conditions are met:
+
+	1. Redistributions of source code must retain the above copyright notice,
+	   this list of conditions and the following disclaimer.
+
+	2. Redistributions in binary form must reproduce the above copyright
+	   notice, this list of conditions and the following disclaimer in the
+	   documentation and/or other materials provided with the distribution.
+
+	THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+	INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+	AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+	AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+	OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+	SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+	INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+	CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+	POSSIBILITY OF SUCH DAMAGE.
+*/
 require_once("util.inc");
 require_once("functions.inc");
 require_once("pkg-utils.inc");
 require_once("globals.inc");
 
-function php_install_zabbix2(){
-	sync_package_zabbix2();	
+function php_zabbix2_pfs_version() {
+	$pfs_version = substr(trim(file_get_contents("/etc/version")), 0, 3);
+	return $pfs_version;
 }
 
-function php_deinstall_zabbix2_agent(){
-   global $config, $g;
-
-   conf_mount_rw();
-   $pfs_version = php_zabbix2_pfs_version();
-   $zabbix2_pkg_base = php_zabbix2_pkg_base($pfs_version);
-
-   if ($pfs_version > 2.0){
-      define('ZABBIX_AGENT_BASE', '/usr/pbi/' . $zabbix2_pkg_base . '-agent-' . php_uname("m"));
-   } else {
-      define('ZABBIX_AGENT_BASE', '/usr/local');
-   }
-
-   exec("/usr/bin/killall zabbix_agentd");
-   unlink_if_exists(ZABBIX_AGENT_BASE . "/etc/rc.d/zabbix2_agentd.sh");
-   unlink_if_exists(ZABBIX_AGENT_BASE . "/etc/" . $zabbix2_pkg_base . "/zabbix_agentd.conf");
-   unlink_if_exists("/var/log/zabbix2/zabbix2_agentd.log");
-   unlink_if_exists("/var/run/zabbix2/zabbix2_agentd.pid");
-
-   if (!is_array($config['installedpackages']['zabbixproxy'])){
-      if (is_dir("/var/log/zabbix2"))
-         exec("/bin/rm -r /var/log/zabbix2/");
-      if (is_dir("/var/run/zabbix2"))
-         exec("/bin/rm -r /var/run/zabbix2/");
-   }
-
-   conf_mount_ro();
+function php_zabbix2_pkg_base($pfs_version) {
+	if ($pfs_version >= 2.2) {
+		// pfSense 2.2 with zabbix 2.4
+		$zabbix2_pkg_base = "zabbix24";
+	} else {
+		// pfSense 2.1 with zabbix 2.2
+		$zabbix2_pkg_base = "zabbix22";
+	}
+	return $zabbix2_pkg_base;
 }
 
-function php_deinstall_zabbix2_proxy(){
-   global $config, $g;
-
-   conf_mount_rw();
-   $pfs_version = php_zabbix2_pfs_version();
-   $zabbix2_pkg_base = php_zabbix2_pkg_base($pfs_version);
+function php_deinstall_zabbix2_agent() {
+	global $config, $g;
 
-   if ($pfs_version > 2.0){
-      define('ZABBIX_PROXY_BASE', '/usr/pbi/' . $zabbix2_pkg_base . '-proxy-' . php_uname("m"));
-   } else {
-      define('ZABBIX_PROXY_BASE', '/usr/local');
-   }
+	$pfs_version = php_zabbix2_pfs_version();
+	$zabbix2_pkg_base = php_zabbix2_pkg_base($pfs_version);
 
-   exec("/usr/bin/killall zabbix_proxy");
-   unlink_if_exists(ZABBIX_PROXY_BASE . "/etc/rc.d/zabbix2_proxy.sh");
-   unlink_if_exists(ZABBIX_PROXY_BASE . "/etc/" . $zabbix2_pkg_base . "/zabbix_proxy.conf");
-   unlink_if_exists("/var/log/zabbix2/zabbix_proxy.log");
-   unlink_if_exists("/var/run/zabbix2/zabbix2_proxy.pid");
+	if ($pfs_version == "2.1" || $pfs_version == "2.2") {
+		define('ZABBIX_AGENT_BASE', '/usr/pbi/' . $zabbix2_pkg_base . '-agent-' . php_uname("m"));
+	} else {
+		define('ZABBIX_AGENT_BASE', '/usr/local');
+	}
 
-   if (!is_array($config['installedpackages']['zabbixagent'])){
-      if (is_dir("/var/log/zabbix2"))
-         exec("/bin/rm -r /var/log/zabbix2/");
-      if (is_dir("/var/run/zabbix2"))
-         exec("/bin/rm -r /var/run/zabbix2/");
-   }
+	mwexec("/usr/bin/killall zabbix_agentd");
 
-   if (is_dir("/var/db/zabbix2"))
-      exec("/bin/rm -r /var/db/zabbix2/");
+	unlink_if_exists(ZABBIX_AGENT_BASE . "/etc/" . $zabbix2_pkg_base . "/zabbix_agentd.conf");
+	unlink_if_exists("/var/log/zabbix2/zabbix2_agentd.log");
+	unlink_if_exists("/var/run/zabbix2/zabbix2_agentd.pid");
 
-   conf_mount_ro();
+	if (!is_array($config['installedpackages']['zabbixproxy'])) {
+		if (is_dir("/var/log/zabbix2")) {
+			mwexec("/bin/rm -rf /var/log/zabbix2/");
+		}
+		if (is_dir("/var/run/zabbix2")) {
+			mwexec("/bin/rm -rf /var/run/zabbix2/");
+		}
+	}
 }
 
-function validate_input_zabbix2($post, &$input_errors){
+function php_deinstall_zabbix2_proxy() {
+	global $config, $g;
+
+	$pfs_version = php_zabbix2_pfs_version();
+	$zabbix2_pkg_base = php_zabbix2_pkg_base($pfs_version);
+
+	if ($pfs_version == "2.1" || $pfs_version == "2.2") {
+		define('ZABBIX_PROXY_BASE', '/usr/pbi/' . $zabbix2_pkg_base . '-proxy-' . php_uname("m"));
+	} else {
+		define('ZABBIX_PROXY_BASE', '/usr/local');
+	}
+
+	exec("/usr/bin/killall zabbix_proxy");
+	unlink_if_exists(ZABBIX_PROXY_BASE . "/etc/" . $zabbix2_pkg_base . "/zabbix_proxy.conf");
+	unlink_if_exists("/var/log/zabbix2/zabbix_proxy.log");
+	unlink_if_exists("/var/run/zabbix2/zabbix2_proxy.pid");
+
+	if (!is_array($config['installedpackages']['zabbixagent'])) {
+		if (is_dir("/var/log/zabbix2")) {
+			exec("/bin/rm -r /var/log/zabbix2/");
+		}
+		if (is_dir("/var/run/zabbix2")) {
+			exec("/bin/rm -r /var/run/zabbix2/");
+		}
+	}
 
-	if  (isset($post['proxyenabled'])){
+	if (is_dir("/var/db/zabbix2")) {
+		exec("/bin/rm -r /var/db/zabbix2/");
+	}
+}
+
+function validate_input_zabbix2($post, &$input_errors) {
+	if  (isset($post['proxyenabled'])) {
 		if (!is_numericint($post['serverport'])) {
-      		$input_errors[]='Server Port is not numeric.'.$ServerPort;
-   			}
-	
+			$input_errors[] = "'Server Port' value is not numeric.";
+   		} elseif ($post['serverport'] < 1 || $post['serverport'] > 65535) {
+			$input_errors[] = "You must enter a valid value for 'Server Port'.";
+		}
+
 		if (!is_numericint($post['configfrequency'])) {
-			$input_errors[]='Config Frequency is not numeric.';
-			}
+			$input_errors[] = "'Config Frequency' value is not numeric.";
 		}
-	if  (isset($post['agentenabled'])){
+	}
+
+	if (isset($post['agentenabled'])) {
 		if (!preg_match("/\w+/", $post['server'])) {
-			$input_errors[]='Server field is required.';
-			}
-		
+			$input_errors[] = "Server field is required.";
+		}
+
 		if (!preg_match("/\w+/", $post['hostname'])) {
-			$input_errors[]='Hostname field is required.';
-			}
-	
+			$input_errors[] = "Hostname field is required.";
+		}
+
 		if ($post['listenip'] != '') {
-			if (!is_ipaddr_configured($post['listenip']) && !preg_match("/(127.0.0.1|0.0.0.0)/",$post['listenip'])) {
-				$input_errors[]='Listen IP is not a configured IP address.';
+			if (!is_ipaddr_configured($post['listenip']) && !preg_match("/(127.0.0.1|0.0.0.0)/", $post['listenip'])) {
+				$input_errors[] = "'Listen IP' is not a configured IP address.";
 			}
 		}
 
 		if ($post['listenport'] != '') {
-			if (!preg_match("/^\d+$/", $post['listenport'])) {
-				$input_errors[]='Listen Port is not numeric.';
-			}	
+			if (!is_numericint($post['listenport'])) {
+				$input_errors[] = "'Listen Port' value is not numeric.";
+			} elseif ($post['listenport'] < 1 || $post['listenport'] > 65535) {
+				$input_errors[] = "You must enter a valid value for 'Listen Port'.";
+			}
 		}
 
 		if ($post['refreshactchecks'] != '') {
-			if (!preg_match("/^\d+$/", $post['refreshactchecks'])) {
-				$input_errors[]='Refresh Active Checks is not numeric.';
-			} elseif ( $post['refreshactchecks'] < 60 || $post['refreshactchecks'] > 3600 ) {
-				$input_errors[]='You must enter a valid value for \'Refresh Active Checks\'';
+			if (!is_numericint($post['refreshactchecks'])) {
+				$input_errors[] = "'Refresh Active Checks' value is not numeric.";
+			} elseif ($post['refreshactchecks'] < 60 || $post['refreshactchecks'] > 3600) {
+				$input_errors[] = "You must enter a valid value for 'Refresh Active Checks'.";
 			}
 		}
 
 		if ($post['timeout'] != '') {
 			if (!is_numericint($post['timeout'])) {
-				$input_errors[]='Timeout is not numeric.';
-			} elseif ( $post['timeout'] < 1 || $post['timeout'] > 30 ) {
-				$input_errors[]='You must enter a valid value for \'Timeout\'';
+				$input_errors[] = "Timeout value is not numeric.";
+			} elseif ($post['timeout'] < 1 || $post['timeout'] > 30) {
+				$input_errors[] = "You must enter a valid value for 'Timeout'.";
 			}
 		}
-	
+
 		if ($post['buffersend'] != '') {
 			if (!is_numericint($post['buffersend'])) {
-				$input_errors[]='Buffer Send is not numeric.';
-			} elseif ( $post['buffersend'] < 1 || $post['buffersend'] > 3600 ) {
-				$input_errors[]='You must enter a valid value for \'Buffer Send\'';
+				$input_errors[] = "'Buffer Send' value is not numeric.";
+			} elseif ($post['buffersend'] < 1 || $post['buffersend'] > 3600) {
+				$input_errors[] = "You must enter a valid value for 'Buffer Send'.";
 			}
 		}
-		
+
 		if ($post['buffersize'] != '') {
 			if (!is_numericint($post['buffersize'])) {
-				$input_errors[]='Bufer Size is not numeric.';
-			} elseif ( $post['buffersize'] < 2 || $post['buffersize'] > 65535 ) {
-				$input_errors[]='You must enter a valid value for \'Buffer Size\'';
+				$input_errors[] = "'Buffer Size' value is not numeric.";
+			} elseif ($post['buffersize'] < 2 || $post['buffersize'] > 65535) {
+				$input_errors[] = "You must enter a valid value for 'Buffer Size'.";
 			}
 		}
-		
+
 		if ($post['startagents'] != '') {
 			if (!is_numericint($post['startagents'])) {
 				$input_errors[]='Start Agents is not numeric.';
-			} elseif ( $post['startagents'] < 0 || $post['startagents'] > 100 ) {
-				$input_errors[]='You must enter a valid value for \'Start Agents\'';
+			} elseif ($post['startagents'] < 0 || $post['startagents'] > 100) {
+				$input_errors[] = "You must enter a valid value for 'Start Agents'.";
 			}
 		}
-	}	
+	}
 }
 
-function sync_package_zabbix2(){
+function sync_package_zabbix2() {
 	global $config, $g;
 
 	conf_mount_rw();
 	$pfs_version = php_zabbix2_pfs_version();
 	$zabbix2_pkg_base = php_zabbix2_pkg_base($pfs_version);
 
-	if ($pfs_version > 2.0){
+	if ($pfs_version == "2.1" || $pfs_version == "2.2") {
 		define('ZABBIX_AGENT_BASE', '/usr/pbi/' . $zabbix2_pkg_base . '-agent-' . php_uname("m"));
 		define('ZABBIX_PROXY_BASE', '/usr/pbi/' . $zabbix2_pkg_base . '-proxy-' . php_uname("m"));
-		}
-	else {
+	} else {
 		define('ZABBIX_AGENT_BASE', '/usr/local');
 		define('ZABBIX_PROXY_BASE', '/usr/local');
 	}
 
-	#check zabbix proxy config
-	if (is_array($config['installedpackages']['zabbixproxy'])){
+	// Check zabbix proxy config
+	if (is_array($config['installedpackages']['zabbixproxy'])) {
 		$zbproxy_config = $config['installedpackages']['zabbixproxy']['config'][0];
-		if ($zbproxy_config['proxyenabled']=="on"){
-			$Mode=(is_numericint($zbproxy_config['proxymode'])?$zbproxy_config['proxymode'] : 0);
-			$AdvancedParams=base64_decode($zbproxy_config['advancedparams']);
-		
+		if ($zbproxy_config['proxyenabled'] == "on") {
+			$Mode = (is_numericint($zbproxy_config['proxymode']) ? $zbproxy_config['proxymode'] : 0);
+			$AdvancedParams = base64_decode($zbproxy_config['advancedparams']);
+
 			$zbproxy_conf_file = <<< EOF
 Server={$zbproxy_config['server']}
 ServerPort={$zbproxy_config['serverport']}
@@ -209,7 +217,8 @@ DBName=/var/db/zabbix2/proxy.db
 LogFile=/var/log/zabbix2/zabbix_proxy.log
 ConfigFrequency={$zbproxy_config['configfrequency']}
 FpingLocation=/usr/local/sbin/fping
-#there's currently no fping6 (IPv6) dependency in the package, but if there was, the binary would likely also be in /usr/local/sbin
+# There's currently no fping6 (IPv6) dependency in the package,
+# but if there was, the binary would likely also be in /usr/local/sbin.
 Fping6Location=/usr/local/sbin/fping6
 ProxyMode={$Mode}
 {$AdvancedParams}
@@ -218,19 +227,19 @@ EOF;
 			file_put_contents(ZABBIX_PROXY_BASE . "/etc/" . $zabbix2_pkg_base . "/zabbix_proxy.conf", strtr($zbproxy_conf_file, array("\r" => "")));
 		}
 	}
-	/* check zabbix agent settings*/
-	if (is_array($config['installedpackages']['zabbixagent'])){
+	// Check zabbix agent settings
+	if (is_array($config['installedpackages']['zabbixagent'])) {
 		$zbagent_config = $config['installedpackages']['zabbixagent']['config'][0];
-		if ($zbagent_config['agentenabled']=="on"){
-			$RefreshActChecks=(preg_match("/(\d+)/",$zbagent_config['refreshactchecks'],$matches)? $matches[1] : "120");
-			$BufferSend=(preg_match("/(\d+)/",$zbagent_config['buffersend'],$matches)? $matches[1]  : "5"  );
-			$BufferSize=(preg_match("/(\d+)/",$zbagent_config['buffersize'],$matches)? $matches[1]  : "100");
-			$StartAgents=(preg_match("/(\d+)/",$zbagent_config['startagents'],$matches)? $matches[1] :"3" );
-			$UserParams=base64_decode($zbagent_config['userparams']);
-			$ListenIp=($zbagent_config['listenip'] != ''? $zbagent_config['listenip'] : "0.0.0.0");
-			$ListenPort=($zbagent_config['listenport'] != ''? $zbagent_config['listenport'] : "10050");
-			$TimeOut=($zbagent_config['timeout'] != ''? $zbagent_config['timeout'] : "3");
-	
+		if ($zbagent_config['agentenabled'] == "on") {
+			$RefreshActChecks = (preg_match("/(\d+)/", $zbagent_config['refreshactchecks'], $matches) ? $matches[1] : "120");
+			$BufferSend = (preg_match("/(\d+)/", $zbagent_config['buffersend'], $matches) ? $matches[1] : "5");
+			$BufferSize = (preg_match("/(\d+)/", $zbagent_config['buffersize'], $matches) ? $matches[1] : "100");
+			$StartAgents = (preg_match("/(\d+)/", $zbagent_config['startagents'], $matches) ? $matches[1] : "3");
+			$UserParams = base64_decode($zbagent_config['userparams']);
+			$ListenIp = $zbagent_config['listenip'] ?: "0.0.0.0";
+			$ListenPort = $zbagent_config['listenport'] ?: "10050";
+			$TimeOut = $zbagent_config['timeout'] ?: "3";
+
 			$zbagent_conf_file = <<< EOF
 Server={$zbagent_config['server']}
 ServerActive={$zbagent_config['serveractive']}
@@ -249,33 +258,35 @@ StartAgents={$StartAgents}
 {$UserParams}
 
 EOF;
-		file_put_contents(ZABBIX_AGENT_BASE . "/etc/" . $zabbix2_pkg_base . "/zabbix_agentd.conf",  strtr($zbagent_conf_file, array("\r" => "")));
+			file_put_contents(ZABBIX_AGENT_BASE . "/etc/" . $zabbix2_pkg_base . "/zabbix_agentd.conf",  strtr($zbagent_conf_file, array("\r" => "")));
 		}
 	}
+
 	$want_sysctls = array(
 		'kern.ipc.shmall' => '2097152',
 		'kern.ipc.shmmax' => '2147483648',
 		'kern.ipc.semmsl' => '250'
 	);
 	$sysctls = array();
-	#check sysctl file values
+	// Check sysctl file values
 	$sc_file="";
 	if (file_exists("/etc/sysctl.conf")) {
 		$sc = file("/etc/sysctl.conf");
 		foreach ($sc as $line) {
 			list($sysk, $sysv) = explode("=", $line, 2);
-			if (preg_match("/\w/",$line) && !array_key_exists($sysk, $want_sysctls))
-				$sc_file.=$line;
+			if (preg_match("/\w/", $line) && !array_key_exists($sysk, $want_sysctls)) {
+				$sc_file .= $line;
 			}
+		}
 	}
-	foreach ($want_sysctls as $ws=> $wv) {
+	foreach ($want_sysctls as $ws => $wv) {
 		$sc_file .= "{$ws}={$wv}\n";
-		exec("/sbin/sysctl {$ws}={$wv}");
+		mwexec("/sbin/sysctl {$ws}={$wv}");
 	}
 	file_put_contents("/etc/sysctl.conf", $sc_file);
 
-	#check bootloader values
-	$lt_file="";
+	// Check bootloader values
+	$lt_file = "";
 	$want_tunables = array(
 		'kern.ipc.semopm' => '100',
 		'kern.ipc.semmni' => '128',
@@ -287,110 +298,91 @@ EOF;
 		$lt = file("/boot/loader.conf");
 		foreach ($lt as $line) {
 			list($tunable, $val) = explode("=", $line, 2);
-			if (preg_match("/\w/",$line) && !array_key_exists($tunable, $want_tunables))
-				$lt_file.=$line;
+			if (preg_match("/\w/", $line) && !array_key_exists($tunable, $want_tunables)) {
+				$lt_file .= $line;
+			}
 		}
 	}
 	foreach ($want_tunables as $wt => $wv) {
-		$lt_file.= "{$wt}={$wv}\n";
+		$lt_file .= "{$wt}={$wv}\n";
 	}
 	file_put_contents("/boot/loader.conf", $lt_file);
 
-	/*check startup script files*/
-	/* create a few directories and ensure the sample files are in place */
-	if (!is_dir(ZABBIX_PROXY_BASE . "/etc/" . $zabbix2_pkg_base))
-		exec("/bin/mkdir -p " . ZABBIX_PROXY_BASE . "/etc/" . $zabbix2_pkg_base);
-
-	$dir_checks  = <<< EOF
-if [ ! -d /var/log/zabbix2 ]
- then
- /bin/mkdir -p /var/log/zabbix2
- /usr/sbin/chmod 755 /var/log/zabbix2
- fi
-/usr/sbin/chown -R zabbix:zabbix /var/log/zabbix2
-
-if [ ! -d /var/run/zabbix2 ]
- then
- /bin/mkdir -p /var/run/zabbix2
- /usr/sbin/chmod 755 /var/run/zabbix2
- fi
-/usr/sbin/chown -R zabbix:zabbix /var/run/zabbix2
-
-if [ ! -d /var/db/zabbix2 ]
- then
- /bin/mkdir -p /var/db/zabbix2
- /usr/sbin/chmod 755 /var/db/zabbix2
- fi
-/usr/sbin/chown -R zabbix:zabbix /var/db/zabbix2
+	// Check startup script files
+	// Create a few directories and ensure the sample files are in place
+	if (!is_dir(ZABBIX_PROXY_BASE . "/etc/" . $zabbix2_pkg_base)) {
+		mwexec("/bin/mkdir -p " . ZABBIX_PROXY_BASE . "/etc/" . $zabbix2_pkg_base);
+	}
+
+	$dir_checks = <<< EOF
+
+	if [ ! -d /var/log/zabbix2 ]; then
+		/bin/mkdir -p /var/log/zabbix2
+		/usr/sbin/chmod 755 /var/log/zabbix2
+	fi
+	/usr/sbin/chown -R zabbix:zabbix /var/log/zabbix2
+
+	if [ ! -d /var/run/zabbix2 ]; then
+		/bin/mkdir -p /var/run/zabbix2
+		/usr/sbin/chmod 755 /var/run/zabbix2
+	fi
+	/usr/sbin/chown -R zabbix:zabbix /var/run/zabbix2
+
+	if [ ! -d /var/db/zabbix2 ]; then
+		/bin/mkdir -p /var/db/zabbix2
+		/usr/sbin/chmod 755 /var/db/zabbix2
+	fi
+	/usr/sbin/chown -R zabbix:zabbix /var/db/zabbix2
 
 EOF;
- 
-	$zproxy_rcfile="/usr/local/etc/rc.d/zabbix2_proxy.sh";
-	if (is_array($zbproxy_config) && $zbproxy_config['proxyenabled']=="on"){
-		$zproxy_start= strtr($dir_checks, array("\r" => "")). "\necho \"Starting Zabbix Proxy\"...\n";
-		/* start zabbix proxy */
+
+	$zproxy_rcfile = "/usr/local/etc/rc.d/zabbix2_proxy.sh";
+	if (is_array($zbproxy_config) && $zbproxy_config['proxyenabled'] == "on") {
+		$zproxy_start = strtr($dir_checks, array("\r" => "")). "\necho \"Starting Zabbix Proxy\"...\n";
 		$zproxy_start .= ZABBIX_PROXY_BASE . "/sbin/zabbix_proxy\n";
-	
+
 		$zproxy_stop  = "echo \"Stopping Zabbix Proxy\"\n";
 		$zproxy_stop .= "/usr/bin/killall zabbix_proxy\n";
 		$zproxy_stop .= "/bin/sleep 5\n";
 
-		/* write out rc.d start/stop file */
 		write_rcfile(array(
 			"file" => "zabbix2_proxy.sh",
 			"start" => $zproxy_start,
 			"stop" => $zproxy_stop
 			)
 		);
-		mwexec("{$zproxy_rcfile} restart");
-	}else{
-		if (file_exists($zproxy_rcfile)){
-		mwexec("{$zproxy_rcfile} stop");
-		unlink($zproxy_rcfile);
+		restart_service("zabbix_proxy");
+	} else {
+		if (is_service_running("zabbix_proxy")) {
+			stop_service("zabbix_proxy");
 		}
+		unlink_if_exists($zproxy_rcfile);
 	}
-	
+
 	$zagent_rcfile="/usr/local/etc/rc.d/zabbix2_agentd.sh";
-	if (is_array($zbagent_config) && $zbagent_config['agentenabled']=="on"){
+	if (is_array($zbagent_config) && $zbagent_config['agentenabled']=="on") {
 		$zagent_start .= strtr($dir_checks, array("\r" => "")). "\necho \"Starting Zabbix Agent...\"\n";
 		$zagent_start .= ZABBIX_AGENT_BASE . "/sbin/zabbix_agentd\n";
-	
+
 		$zagent_stop  = "echo \"Stopping Zabbix Agent...\"\n";
 		$zagent_stop .= "/usr/bin/killall zabbix_agentd\n";
 		$zagent_stop .= "/bin/sleep 5\n";
-	
-		/* write out rc.d start/stop file */
+
 		write_rcfile(array(
-						"file" => "zabbix2_agentd.sh",
-						"start" => "$zagent_start",
-						"stop" => "$zagent_stop"
-				)
+			"file" => "zabbix2_agentd.sh",
+			"start" => $zagent_start,
+			"stop" => $zagent_stop
+			)
 		);
-		mwexec("{$zagent_rcfile} restart");	
-	}else{
-		if (file_exists($zagent_rcfile)){
-		mwexec("{$zagent_rcfile} stop");
-		unlink($zagent_rcfile);
+		restart_service("zabbix_agentd");
+	} else {
+		if (is_service_running("zabbix_agentd")) {
+			stop_service("zabbix_agentd");
 		}
+		unlink_if_exists($zagent_rcfile);
 	}
-		
-	conf_mount_ro();
-}
 
-function php_zabbix2_pfs_version(){
-	$pfs_version = substr(trim(file_get_contents("/etc/version")),0,3);
-	return $pfs_version;
-}
-
-function php_zabbix2_pkg_base($pfs_version){
-	if ($pfs_version >= 2.2){
-		// pfSense 2.2 with zabbix 2.4
-		$zabbix2_pkg_base = "zabbix24";
-	}else{
-		// pfSense 2.1 with zabbix 2.2
-		$zabbix2_pkg_base = "zabbix22";
-	}
-	return $zabbix2_pkg_base;
+	conf_mount_ro();
 }
 
 ?>
diff --git a/pkg_config.10.xml b/pkg_config.10.xml
index e45aee77..acdd4171 100644
--- a/pkg_config.10.xml
+++ b/pkg_config.10.xml
@@ -1580,7 +1580,7 @@
 		<website>http://www.zabbix.com/product.php</website>
 		<category>Services</category>
 		<config_file>https://packages.pfsense.org/packages/config/zabbix2/zabbix2-agent.xml</config_file>
-		<version>zabbix24-agent-2.4.3 pkg v0.8.3</version>
+		<version>0.8.4</version>
 		<status>BETA</status>
 		<required_version>2.2</required_version>
 		<configurationfile>zabbix2-agent.xml</configurationfile>
@@ -1605,7 +1605,7 @@
 		<website>http://www.zabbix.com/product.php</website>
 		<category>Services</category>
 		<config_file>https://packages.pfsense.org/packages/config/zabbix2/zabbix2-proxy.xml</config_file>
-		<version>zabbix24-proxy-2.4.3 pkg v0.8.3</version>
+		<version>0.8.4</version>
 		<status>BETA</status>
 		<required_version>2.2</required_version>
 		<configurationfile>zabbix2-proxy.xml</configurationfile>
diff --git a/pkg_config.8.xml b/pkg_config.8.xml
index e10734cb..77d621d2 100644
--- a/pkg_config.8.xml
+++ b/pkg_config.8.xml
@@ -1676,7 +1676,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.5 pkg v0.8.3</version>
+		<version>zabbix2-agent-2.2.5 pkg v0.8.4</version>
 		<status>BETA</status>
 		<required_version>2.0</required_version>
 		<configurationfile>zabbix2-agent.xml</configurationfile>
@@ -1694,7 +1694,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.5 pkg v0.8.3</version>
+		<version>zabbix2-proxy-2.2.5 pkg v0.8.4</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 ba250597..b96ee100 100644
--- a/pkg_config.8.xml.amd64
+++ b/pkg_config.8.xml.amd64
@@ -1663,7 +1663,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.5 pkg v0.8.3</version>
+		<version>zabbix2-agent-2.2.5 pkg v0.8.4</version>
 		<status>BETA</status>
 		<required_version>2.0</required_version>
 		<configurationfile>zabbix2-agent.xml</configurationfile>
@@ -1681,7 +1681,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.5 pkg v0.8.3</version>
+		<version>zabbix2-proxy-2.2.5 pkg v0.8.4</version>
 		<status>BETA</status>
 		<required_version>2.0</required_version>
 		<configurationfile>zabbix2-proxy.xml</configurationfile>