squid3 - merge squid3 and squid-reverse in one package

1 files changed, 76 insertions, 60 deletions

diff --git a/config/squid-reverse/squid_auth.xml b/config/squid-reverse/squid_auth.xml
index 8d6e046e..e04dbfba 100644
--- a/config/squid-reverse/squid_auth.xml
+++ b/config/squid-reverse/squid_auth.xml
@@ -55,15 +55,15 @@
 			<url>/pkg_edit.php?xml=squid.xml&amp;id=0</url>
 		</tab>
 		<tab>
-			<text>Upstream Proxy</text>
+			<text>Upstream</text>
 			<url>/pkg_edit.php?xml=squid_upstream.xml&amp;id=0</url>
 		</tab>
 		<tab>
-			<text>Cache Mgmt</text>
+			<text>Cache</text>
 			<url>/pkg_edit.php?xml=squid_cache.xml&amp;id=0</url>
 		</tab>
 		<tab>
-			<text>Access Control</text>
+			<text>ACLs</text>
 			<url>/pkg_edit.php?xml=squid_nac.xml&amp;id=0</url>
 		</tab>
 		<tab>
@@ -71,21 +71,25 @@
 			<url>/pkg_edit.php?xml=squid_traffic.xml&amp;id=0</url>
 		</tab>
 		<tab>
-			<text>Reverse Settings</text>
-			<url>/pkg_edit.php?xml=squid_reverse.xml&amp;id=0</url>
-		</tab>		
-		<tab>
-			<text>Auth Settings</text>
+			<text>Authentication</text>
 			<url>/pkg_edit.php?xml=squid_auth.xml&amp;id=0</url>
 			<active/>
 		</tab>
 		<tab>
-			<text>Local Users</text>
+			<text>Users</text>
 			<url>/pkg.php?xml=squid_users.xml</url>
 		</tab>
+		<tab>
+			<text>Sync</text>
+			<url>/pkg_edit.php?xml=squid_sync.xml</url>
+		</tab>
 	</tabs>
 	<fields>
 		<field>
+			<name>Squid Authentication General Settings</name>
+			<type>listtopic</type>
+		</field>
+		<field>
 			<fielddescr>Authentication method</fielddescr>
 			<fieldname>auth_method</fieldname>
 			<description>Select an authentication method. This will allow users to be authenticated by local or external services.</description>
@@ -102,17 +106,6 @@
 			<onchange>on_auth_method_changed()</onchange>
 		</field>
 		<field>
-			<fielddescr>LDAP version</fielddescr>
-			<fieldname>ldap_version</fieldname>
-			<description>Enter LDAP protocol version (2 or 3).</description>
-			<type>select</type>
-			<default_value>2</default_value>
-			<options>
-			<option><name>2</name><value>2</value></option>
-			<option><name>3</name><value>3</value></option>
-			</options>
-		</field>
-		<field>
 			<fielddescr>Authentication server</fielddescr>
 			<fieldname>auth_server</fieldname>
 			<description>Enter here the IP or hostname of the server that will perform the authentication.</description>
@@ -127,11 +120,57 @@
 			<size>60</size>
 		</field>
 		<field>
-			<fielddescr>NT domain</fielddescr>
-			<fieldname>auth_ntdomain</fieldname>
-			<description>Enter here the NT domain.</description>
+			<fielddescr>Authentication prompt</fielddescr>
+			<fieldname>auth_prompt</fieldname>
+			<description>This string will be displayed at the top of the authentication request window.</description>
+			<type>input</type>
+			<default_value>Please enter your credentials to access the proxy</default_value>
+		</field>
+		<field>
+			<fielddescr>Authentication processes</fielddescr>
+			<fieldname>auth_processes</fieldname>
+			<description>The number of authenticator processes to spawn. If many authentications are expected within a short timeframe, increase this number accordingly.</description>
 			<type>input</type>
 			<size>60</size>
+			<default_value>5</default_value>
+		</field>
+		<field>
+			<fielddescr>Authentication TTL</fielddescr>
+			<fieldname>auth_ttl</fieldname>
+			<description>This specifies for how long (in minutes) the proxy server assumes an externally validated username and password combination is valid (Time To Live).  When the TTL expires, the user will be prompted for credentials again.</description>
+			<type>input</type>
+			<size>60</size>
+			<default_value>60</default_value>
+		</field>
+		<field>
+			<fielddescr>Requiere authentication for unrestricted hosts</fielddescr>
+			<fieldname>unrestricted_auth</fieldname>
+			<description>If this option is enabled, even users tagged as unrestricted through access control are required to authenticate to use the proxy.</description>
+			<type>checkbox</type>
+		</field>
+		<field>
+			<fielddescr>Subnets that don't need authentication</fielddescr>
+			<fieldname>no_auth_hosts</fieldname>
+			<description>Enter each subnet or IP address on a new line (in CIDR format, e.g.: 10.5.0.0/16, 192.168.1.50/32) that should not be asked for authentication to access the proxy.</description>
+			<type>textarea</type>
+			<cols>50</cols>
+			<rows>5</rows>
+			<encoding>base64</encoding>
+		</field>
+		<field>
+			<name>Squid Authentication Ldap Settings</name>
+			<type>listtopic</type>
+		</field>
+		<field>
+			<fielddescr>LDAP version</fielddescr>
+			<fieldname>ldap_version</fieldname>
+			<description>Enter LDAP protocol version (2 or 3).</description>
+			<type>select</type>
+			<default_value>2</default_value>
+			<options>
+			<option><name>2</name><value>2</value></option>
+			<option><name>3</name><value>3</value></option>
+			</options>
 		</field>
 		<field>
 			<fielddescr>LDAP server user DN</fielddescr>
@@ -171,10 +210,14 @@
 			<default_value>(&amp;(objectClass=person)(uid=%s))</default_value>
 		</field>
 		<field>
-			<fielddescr>RADIUS secret</fielddescr>
-			<fieldname>radius_secret</fieldname>
-			<description>The RADIUS secret for RADIUS authentication.</description>
-			<type>password</type>
+			<name>Squid Authentication NT Domain Settings</name>
+			<type>listtopic</type>
+		</field>
+		<field>
+			<fielddescr>NT domain</fielddescr>
+			<fieldname>auth_ntdomain</fieldname>
+			<description>Enter here the NT domain.</description>
+			<type>input</type>
 			<size>60</size>
 		</field>
 		<field>
@@ -185,42 +228,15 @@
 			<size>60</size>
 		</field>
 		<field>
-			<fielddescr>Authentication prompt</fielddescr>
-			<fieldname>auth_prompt</fieldname>
-			<description>This string will be displayed at the top of the authentication request window.</description>
-			<type>input</type>
-			<default_value>Please enter your credentials to access the proxy</default_value>
-		</field>
-		<field>
-			<fielddescr>Authentication processes</fielddescr>
-			<fieldname>auth_processes</fieldname>
-			<description>The number of authenticator processes to spawn. If many authentications are expected within a short timeframe, increase this number accordingly.</description>
-			<type>input</type>
-			<size>60</size>
-			<default_value>5</default_value>
+			<name>Squid Authentication Radius Settings</name>
+			<type>listtopic</type>
 		</field>
 		<field>
-			<fielddescr>Authentication TTL</fielddescr>
-			<fieldname>auth_ttl</fieldname>
-			<description>This specifies for how long (in minutes) the proxy server assumes an externally validated username and password combination is valid (Time To Live).  When the TTL expires, the user will be prompted for credentials again.</description>
-			<type>input</type>
+			<fielddescr>RADIUS secret</fielddescr>
+			<fieldname>radius_secret</fieldname>
+			<description>The RADIUS secret for RADIUS authentication.</description>
+			<type>password</type>
 			<size>60</size>
-			<default_value>60</default_value>
-		</field>
-		<field>
-			<fielddescr>Requiere authentication for unrestricted hosts</fielddescr>
-			<fieldname>unrestricted_auth</fieldname>
-			<description>If this option is enabled, even users tagged as unrestricted through access control are required to authenticate to use the proxy.</description>
-			<type>checkbox</type>
-		</field>
-		<field>
-			<fielddescr>Subnets that don't need authentication</fielddescr>
-			<fieldname>no_auth_hosts</fieldname>
-			<description>Enter each subnet or IP address on a new line (in CIDR format, e.g.: 10.5.0.0/16, 192.168.1.50/32) that should not be asked for authentication to access the proxy.</description>
-			<type>textarea</type>
-			<cols>50</cols>
-			<rows>5</rows>
-			<encoding>base64</encoding>
 		</field>
 	</fields>
 	<custom_php_validation_command>