zabbix2-proxy - code style cleanup

- Fix copyright header
- Fix file permissions
- Nuke unused/useless tags
- Improve some descriptions
- Move Advanced Parameters to advancedfield

1 files changed, 61 insertions, 52 deletions

diff --git a/config/zabbix2/zabbix2-proxy.xml b/config/zabbix2/zabbix2-proxy.xml
index 00d9b106..ec86f525 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,6 @@
 	<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>
 	<menu>
 		<name>Zabbix-2 Proxy</name>
@@ -61,7 +64,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 +73,7 @@
 			<active />
 		</tab>
 	</tabs>
+	<advanced_options>enabled</advanced_options>
 	<fields>
 		<field>
 			<name>Zabbix2 Proxy Settings</name>
@@ -78,31 +82,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 +115,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 +140,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>