squid3 - code style fixes

1 files changed, 76 insertions, 71 deletions

diff --git a/config/squid3/34/squid_reverse_uri.xml b/config/squid3/34/squid_reverse_uri.xml
index 9a6f183f..164d6374 100755
--- a/config/squid3/34/squid_reverse_uri.xml
+++ b/config/squid3/34/squid_reverse_uri.xml
@@ -2,56 +2,52 @@
 <!DOCTYPE packagegui SYSTEM "../schema/packages.dtd">
 <?xml-stylesheet type="text/xsl" href="../xsl/package.xsl"?>
 <packagegui>
-        <copyright>
-        <![CDATA[
+	<copyright>
+<![CDATA[
 /* $Id$ */
-/* ========================================================================== */
+/* ====================================================================================== */
 /*
-    squid_reverse_general.xml
-    part of pfSense (http://www.pfSense.com)
-    Copyright (C) 2012-2014 Marcello Coutinho
-    All rights reserved.
-
-    Based on m0n0wall (http://m0n0.ch/wall)
-    Copyright (C) 2003-2006 Manuel Kasper <mk@neon1.net>.
-    All rights reserved.
-                                                                              */
-/* ========================================================================== */
+	squid_reverse_uri.xml
+	part of pfSense (https://www.pfSense.org/)
+	Copyright (C) 2012-2014 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.
-                                                                              */
-/* ========================================================================== */
-        ]]>
-        </copyright>
-    <description>Describe your package here</description>
-    <requirements>Describe your package requirements here</requirements>
-    <faq>Currently there are no FAQ items provided.</faq>
+	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>squidreverseuri</name>
-	<version>none</version>
-	<title>Reverse Proxy server: Mappings</title>
+	<version>0.3.5</version>
+	<title>Reverse Proxy Server: Mappings</title>
 	<include_file>/usr/local/pkg/squid.inc</include_file>
 	<tabs>
-	<tab>
-		<text>General</text>
+		<tab>
+			<text>General</text>
 			<url>/pkg_edit.php?xml=squid_reverse_general.xml&amp;id=0</url>
 		</tab>
 		<tab>
@@ -68,7 +64,7 @@
 			<url>/pkg.php?xml=squid_reverse_redir.xml</url>
 		</tab>
 		<tab>
-			<text>Real time</text>
+			<text>Real Time</text>
 			<url>/squid_monitor.php?menu=reverse</url>
 		</tab>
 		<tab>
@@ -92,68 +88,77 @@
 		<columnitem>
 			<fielddescr>Description</fielddescr>
 			<fieldname>description</fieldname>
-		</columnitem>	
+		</columnitem>
 	</adddeleteeditpagefields>
 	<fields>
-			<field>
+		<field>
 			<name>Squid Reverse Peer Mappings</name>
 			<type>listtopic</type>
 		</field>
-			<field>
-			<fielddescr>Enable this URI</fielddescr>
+		<field>
+			<fielddescr>Enable This URI</fielddescr>
 			<fieldname>enable</fieldname>
-			<description><![CDATA[If this field is checked, then this URI(Uniform Resource Name) will be available for reverse config.]]></description>
+			<description>If checked, then this URI (Uniform Resource Name) will be available for reverse proxy config.</description>
 			<type>checkbox</type>
 		</field>
 		<field>
-			<fielddescr>Group name</fielddescr>
+			<fielddescr>Group Name</fielddescr>
 			<fieldname>name</fieldname>
-			<description><![CDATA[Name to identify this URI on squid reverse conf<br>
-						example: URI1]]></description>
+			<description>
+				<![CDATA[
+				Name to identify this URI on Squid reverse proxy configuration.<br/>
+				Example: URI1
+				]]>
+			</description>
 			<type>input</type>
 			<size>20</size>
 		</field>
 		<field>
 			<fielddescr>Group Description</fielddescr>
 			<fieldname>description</fieldname>
-			<description><![CDATA[URI Group Description (optional)]]></description>
+			<description>URI Group Description (Optional)</description>
 			<type>input</type>
 			<size>60</size>
 		</field>
 		<field>
 			<fielddescr>Peers</fielddescr>
 			<fieldname>peers</fieldname>
-			<description><![CDATA[Apply this Group Mappings to selected Peers<br>
-							Use CTRL + click to select.]]></description>
-	    	<type>select_source</type>
-			<source><![CDATA[$config['installedpackages']['squidreversepeer']['config']]]></source>
+			<description>
+				<![CDATA[
+				Apply these group mappings to the selected peers.<br/>
+				Use CTRL + click to select multiple peers.
+				]]>
+			</description>
+			<type>select_source</type>
+			<source>$config['installedpackages']['squidreversepeer']['config']</source>
 			<source_name>name</source_name>
 			<source_value>name</source_value>
 			<multiple/>
 			<size>05</size>
 		</field>
-	<field>
-			<fielddescr><![CDATA[URIs]]></fielddescr>
+		<field>
+			<fielddescr>URIs</fielddescr>
 			<fieldname>none</fieldname>
-			<description><![CDATA[URI to publish]]></description>
+			<description>URI to publish.</description>
 			<type>rowhelper</type>
 			<rowhelper>
 				<rowhelperfield>
-				<fielddescr><![CDATA[<strong>Url regex to match</strong><br><br>
-									Samples: .mydomain.com .mydomain.com/test<br>
-									www.mydomain.com http://www.mydomain.com/ ^http://www.mydomain.com/.*$]]></fielddescr>
-				<fieldname>uri</fieldname>
-				<type>input</type>
-				<size>70</size>
-			</rowhelperfield>
+					<fielddescr>
+						<![CDATA[
+						Enter URL <strong>regex</strong> to match.<br/><br/>
+						Examples:<br/>
+						.mydomain.com .mydomain.com/test<br/>
+						www.mydomain.com http://www.mydomain.com/ ^http://www.mydomain.com/.*$
+						]]>
+					</fielddescr>
+					<fieldname>uri</fieldname>
+					<type>input</type>
+					<size>70</size>
+				</rowhelperfield>
 			</rowhelper>
-		</field>		
+		</field>
 	</fields>
-	<custom_php_command_before_form>
-	</custom_php_command_before_form>
-	<custom_php_validation_command>
-	</custom_php_validation_command>
 	<custom_php_resync_config_command>
 		squid_resync();
 	</custom_php_resync_config_command>
-</packagegui>
\ No newline at end of file
+</packagegui>