checkmk- code style fixes, fix URL again to use last working stable release

1 files changed, 97 insertions, 72 deletions

diff --git a/config/checkmk-agent/checkmk_sync.xml b/config/checkmk-agent/checkmk_sync.xml
index 6603991d..ed99470a 100644
--- a/config/checkmk-agent/checkmk_sync.xml
+++ b/config/checkmk-agent/checkmk_sync.xml
@@ -2,47 +2,48 @@
 <!DOCTYPE packagegui SYSTEM "../schema/packages.dtd">
 <?xml-stylesheet type="text/xsl" href="../xsl/package.xsl"?>
 <packagegui>
-        <copyright>
-        <![CDATA[
-/* ========================================================================== */
+	<copyright>
+	<![CDATA[
+/* $Id$ */
+/* ====================================================================================== */
 /*
-    checkmk_sync.xml
-    part of pfSense (http://www.pfSense.com)
-    Copyright (C) 2013 Marcello Coutinho
-    All rights reserved.
-                                                                              */
-/* ========================================================================== */
+	checkmk.xml
+	part of pfSense (https://www.pfSense.org/)
+	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.
 
-     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.
-                                                                              */
-/* ========================================================================== */
-        ]]>
-        </copyright>
-    <description>Describe your package here</description>
-    <requirements>Describe your package requirements here</requirements>
-    <faq>Currently there are no FAQ items provided.</faq>
+	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>checkmksync</name>
-	<version>1.1</version>
-	<title>Check_mk Agent: Sync</title>
+	<version>0.1.4</version>
+	<title>check_mk Agent: Sync</title>
 	<include_file>/usr/local/pkg/checkmk.inc</include_file>
 	<tabs>
 		<tab>
@@ -59,8 +60,8 @@
 		<field>
 			<type>listtopic</type>
 			<fieldname>temp</fieldname>
-			<name>Enable checkmk configuration sync</name>
-		</field>		
+			<name>Enable check_mk configuration sync</name>
+		</field>
 		<field>
 			<fielddescr>Sync Option</fielddescr>
 			<fieldname>synconchanges</fieldname>
@@ -69,24 +70,48 @@
 			<required/>
 			<default_value>auto</default_value>
 			<options>
-				<option><name>Sync to configured system backup server</name><value>auto</value></option>
-				<option><name>Sync to host(s) defined below</name><value>manual</value></option>
-				<option><name>Do not sync this package configuration</name><value>disabled</value></option>
+				<option>
+					<name>Sync to configured system backup server</name>
+					<value>auto</value>
+				</option>
+				<option>
+					<name>Sync to host(s) defined below</name>
+					<value>manual</value>
+				</option>
+				<option>
+					<name>Do not sync this package configuration</name>
+					<value>disabled</value>
+				</option>
 			</options>
 		</field>
 		<field>
-			<fielddescr>Sync timeout</fielddescr>
+			<fielddescr>Sync Timeout</fielddescr>
 			<fieldname>synctimeout</fieldname>
 			<description>Select sync max wait time</description>
 			<type>select</type>
 			<required/>
 			<default_value>250</default_value>
 			<options>
-				<option><name>250 seconds(Default)</name><value>250</value></option>
-				<option><name>120 seconds</name><value>120</value></option>
-				<option><name>90 seconds</name><value>90</value></option>
-				<option><name>60 seconds</name><value>60</value></option>
-				<option><name>30 seconds</name><value>30</value></option>
+				<option>
+					<name>250 seconds (Default)</name>
+					<value>250</value>
+				</option>
+				<option>
+					<name>120 seconds</name>
+					<value>120</value>
+				</option>
+				<option>
+					<name>90 seconds</name>
+					<value>90</value>
+				</option>
+				<option>
+					<name>60 seconds</name>
+					<value>60</value>
+				</option>
+				<option>
+					<name>30 seconds</name>
+					<value>30</value>
+				</option>
 			</options>
 		</field>
 		<field>
@@ -94,36 +119,36 @@
 			<fieldname>none</fieldname>
 			<type>rowhelper</type>
 			<rowhelper>
-			<rowhelperfield>
-				<fielddescr>IP Address</fielddescr>
-				<fieldname>ipaddress</fieldname>
-				<description>IP Address of remote server</description>
-				<type>input</type>
-				<size>20</size>
-				<required/>
-			</rowhelperfield>
-			<rowhelperfield>
-				<fielddescr>User Name</fielddescr>
-				<fieldname>username</fieldname>
-				<description>user name of remote server</description>
-				<type>input</type>
-				<size>20</size>
-			</rowhelperfield>
-			<rowhelperfield>
-				<fielddescr>Password</fielddescr>
-				<fieldname>password</fieldname>
-				<description>Password for remote server.</description>
-				<type>password</type>
-				<size>20</size>
-				<required/>
-			</rowhelperfield>
+				<rowhelperfield>
+					<fielddescr>IP Address</fielddescr>
+					<fieldname>ipaddress</fieldname>
+					<description>IP Address of remote server</description>
+					<type>input</type>
+					<size>20</size>
+					<required/>
+				</rowhelperfield>
+				<rowhelperfield>
+					<fielddescr>Username</fielddescr>
+					<fieldname>username</fieldname>
+					<description>Username on remote server</description>
+					<type>input</type>
+					<size>20</size>
+				</rowhelperfield>
+				<rowhelperfield>
+					<fielddescr>Password</fielddescr>
+					<fieldname>password</fieldname>
+					<description>Password for remote server</description>
+					<type>password</type>
+					<size>20</size>
+					<required/>
+				</rowhelperfield>
 			</rowhelper>
 		</field>
 	</fields>
 	<custom_php_resync_config_command>
-		checkmk_sync_on_changes();		
+		checkmk_sync_on_changes();
 	</custom_php_resync_config_command>
-	<custom_php_command_before_form>	
+	<custom_php_command_before_form>
 		unset($_POST['temp']);
 	</custom_php_command_before_form>
-</packagegui>
\ No newline at end of file
+</packagegui>