aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordoktornotor <notordoktor@gmail.com>2015-09-25 00:35:59 +0200
committerdoktornotor <notordoktor@gmail.com>2015-09-25 00:35:59 +0200
commit7f2357adb08547e8c49134e2d504c980ff394f0a (patch)
treec2f82309c90a03281ff546887f93e31bb189999a
parente0ace79852acd6c851cbdb35a1e50af6e37ed453 (diff)
downloadpfsense-packages-7f2357adb08547e8c49134e2d504c980ff394f0a.tar.gz
pfsense-packages-7f2357adb08547e8c49134e2d504c980ff394f0a.tar.bz2
pfsense-packages-7f2357adb08547e8c49134e2d504c980ff394f0a.zip
squid3 - code style fixes
-rwxr-xr-xconfig/squid3/34/squid_reverse_redir.xml133
1 files changed, 67 insertions, 66 deletions
diff --git a/config/squid3/34/squid_reverse_redir.xml b/config/squid3/34/squid_reverse_redir.xml
index de25f56a..71653899 100755
--- a/config/squid3/34/squid_reverse_redir.xml
+++ b/config/squid3/34/squid_reverse_redir.xml
@@ -3,30 +3,29 @@
<?xml-stylesheet type="text/xsl" href="../xsl/package.xsl"?>
<packagegui>
<copyright>
- <![CDATA[
+<![CDATA[
/* $Id$ */
-/* ============================================================================ */
+/* ====================================================================================== */
/*
squid_reverse_redir.xml
- part of pfSense (http://www.pfSense.com)
+ part of pfSense (https://www.pfSense.org/)
Copyright (C) 2013 Gekkenhuis
+ Copyright (C) 2015 ESF, LLC
All rights reserved.
-
- Based on m0n0wall (http://m0n0.ch/wall)
- Copyright (C) 2003-2006 Manuel Kasper <mk@neon1.net>.
- 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.
+ 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
@@ -38,16 +37,13 @@
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>
<name>squidreverseredir</name>
- <version>none</version>
- <title>Reverse Proxy server: Redirects</title>
+ <version>0.3.5</version>
+ <title>Reverse Proxy Server: Redirects</title>
<include_file>/usr/local/pkg/squid.inc</include_file>
<tabs>
<tab>
@@ -68,7 +64,7 @@
<active/>
</tab>
<tab>
- <text>Real time</text>
+ <text>Real Time</text>
<url>/squid_monitor.php?menu=reverse</url>
</tab>
<tab>
@@ -82,13 +78,13 @@
<fieldname>enable</fieldname>
</columnitem>
<columnitem>
- <fielddescr>Redirect Name</fielddescr>
- <fieldname>name</fieldname>
+ <fielddescr>Redirect Name</fielddescr>
+ <fieldname>name</fieldname>
+ </columnitem>
+ <columnitem>
+ <fielddescr>Redirect To</fielddescr>
+ <fieldname>redirurl</fieldname>
</columnitem>
- <columnitem>
- <fielddescr>Redirect to</fielddescr>
- <fieldname>redirurl</fieldname>
- </columnitem>
<columnitem>
<fielddescr>Description</fielddescr>
<fieldname>description</fieldname>
@@ -100,83 +96,88 @@
<type>listtopic</type>
</field>
<field>
- <fielddescr>Enable this redirect</fielddescr>
+ <fielddescr>Enable This Redirect</fielddescr>
<fieldname>enable</fieldname>
- <description><![CDATA[If this field is checked, then this redirect will be available for reverse config.]]></description>
+ <description>If checked, then this redirect will be available for reverse config.</description>
<type>checkbox</type>
</field>
<field>
- <fielddescr>Redirect name</fielddescr>
+ <fielddescr>Redirect Name</fielddescr>
<fieldname>name</fieldname>
- <description><![CDATA[Name to identify this redirect on squid reverse conf<br/>
- example: REDIR1]]></description>
+ <description>
+ <![CDATA[
+ Enter the name to identify this redirect in Squid reverse configuration.<br />
+ Example: REDIR1
+ ]]>
+ </description>
<type>input</type>
<size>20</size>
</field>
<field>
<fielddescr>Redirect Description</fielddescr>
<fieldname>description</fieldname>
- <description><![CDATA[Redirect Description (optional)]]></description>
+ <description>Redirect Description (Optional)</description>
<type>input</type>
<size>60</size>
</field>
<field>
<fielddescr>Redirect Protocol</fielddescr>
<fieldname>protocol</fieldname>
- <description><![CDATA[Protocol to redirect on.<br/>
- Use CTRL + click to select multiple]]></description>
+ <description>
+ <![CDATA[
+ Select the protocol to redirect on.<br/>
+ Use CTRL + click to select multiple options.
+ ]]>
+ </description>
<type>select</type>
<multiple/>
<size>03</size>
- <options>
- <option>
- <name>HTTP</name>
- <value>HTTP</value>
- </option>
- <option>
- <name>HTTPS</name>
- <value>HTTPS</value>
- </option>
- </options>
+ <options>
+ <option><name>HTTP</name><value>HTTP</value></option>
+ <option><name>HTTPS</name><value>HTTPS</value></option>
+ </options>
</field>
<field>
- <fielddescr>Blocked domains</fielddescr>
+ <fielddescr>Blocked Domains</fielddescr>
<fieldname>none</fieldname>
- <description>Domains to redirect for</description>
+ <description>Domains to redirect for.</description>
<type>rowhelper</type>
<rowhelper>
<rowhelperfield>
- <fielddescr><![CDATA[<strong>Domains to match</strong><br/><br/>
- Samples: mydomain.com sub.mydomain.com www.mydomain.com<br/><br/>
- Do not enter http:&#47;&#47; or https:&#47;&#47; here! only the hostname is required.]]></fielddescr>
- <fieldname>uri</fieldname>
- <type>input</type>
- <size>60</size>
- </rowhelperfield>
+ <fielddescr>
+ <![CDATA[
+ Enter the domains to match here.<br/>
+ Example: example.com sub.example.com www.example.com<br/><br/>
+ Do <strong>NOT</strong> enter http:// or https:// here! Only the hostname is required.
+ ]]>
+ </fielddescr>
+ <fieldname>uri</fieldname>
+ <type>input</type>
+ <size>60</size>
+ </rowhelperfield>
</rowhelper>
</field>
<field>
- <fielddescr>Path regex</fielddescr>
+ <fielddescr>Path Regex</fielddescr>
<fieldname>pathregex</fieldname>
- <description><![CDATA[Path regex to match<br/><br/>]]>
- Enter &#94;&#47;&#36; to match the domain only.</description>
+ <description>
+ <![CDATA[
+ Enter the path regex to match here.<br/>
+ Hint: Enter ^/$ to match the domain only.
+ ]]>
+ </description>
<type>input</type>
<size>60</size>
</field>
<field>
- <fielddescr>URL to redirect to</fielddescr>
+ <fielddescr>URL to Redirect To</fielddescr>
<fieldname>redirurl</fieldname>
- <description><![CDATA[URL to redirect to]]></description>
+ <description>Enter the URL to redirect to here.</description>
<type>input</type>
<size>60</size>
</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>