From 3f91755ba0a47bee174f15d165a09cb98e0be368 Mon Sep 17 00:00:00 2001
From: Martin Fuchs <martin.fuchs@trendchiller.com>
Date: Sun, 11 Sep 2011 23:44:17 +0200
Subject: squid: enable fields by depencency and comment out unneccessary
 checks

---
 config/squid/squid.inc  | 2 ++
 config/squid/squid.xml  | 2 +-
 config/squid3/squid.inc | 2 ++
 config/squid3/squid.xml | 2 +-
 4 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/config/squid/squid.inc b/config/squid/squid.inc
index ad98ab14..d36c836a 100644
--- a/config/squid/squid.inc
+++ b/config/squid/squid.inc
@@ -324,6 +324,7 @@ function squid_validate_general($post, $input_errors) {
 		$input_errors[] = "You can not run squid on the same port as the webgui";
 	}
 
+/*
 	if (($post['transparent_proxy'] != 'on') && ($post['private_subnet_proxy_off'] == 'on')) {
 		$input_errors[] = "You can not bypass traffic to private subnets  without using the transparent proxy.";
 	}
@@ -334,6 +335,7 @@ function squid_validate_general($post, $input_errors) {
 	if (($post['transparent_proxy'] != 'on') && !empty($post['defined_ip_proxy_off_dest'])) {
 		$input_errors[] = "You can not bypass traffic to specific IPs without using the transparent proxy.";
 	}
+*/
 
 	foreach (array('defined_ip_proxy_off') as $hosts) {
 		foreach (explode(";", $post[$hosts]) as $host) {
diff --git a/config/squid/squid.xml b/config/squid/squid.xml
index 9cd0e3b3..26d95eb8 100644
--- a/config/squid/squid.xml
+++ b/config/squid/squid.xml
@@ -166,7 +166,7 @@
 			<fieldname>transparent_proxy</fieldname>
 			<description>If transparent mode is enabled, all requests for destination port 80 will be forwarded to the proxy server without any additional configuration necessary.</description>
 			<type>checkbox</type>
-			<enablefields>private_subnet_proxy_off</enablefields>			
+			<enablefields>private_subnet_proxy_off,defined_ip_proxy_off,defined_ip_proxy_off_dest</enablefields>			
 			<required/>
 		</field>
 		<field>
diff --git a/config/squid3/squid.inc b/config/squid3/squid.inc
index 417eaeae..1e720ae7 100644
--- a/config/squid3/squid.inc
+++ b/config/squid3/squid.inc
@@ -344,6 +344,7 @@ function squid_validate_general($post, $input_errors) {
 		$input_errors[] = "You can not run squid on the same port as the webgui";
 	}
 
+/*
 	if (($post['transparent_proxy'] != 'on') && ($post['private_subnet_proxy_off'] == 'on')) {
 		$input_errors[] = "You can not bypass traffic to private subnets  without using the transparent proxy.";
 	}
@@ -354,6 +355,7 @@ function squid_validate_general($post, $input_errors) {
 	if (($post['transparent_proxy'] != 'on') && !empty($post['defined_ip_proxy_off_dest'])) {
 		$input_errors[] = "You can not bypass traffic to specific IPs without using the transparent proxy.";
 	}
+*/
 
 	foreach (array('defined_ip_proxy_off') as $hosts) {
 		foreach (explode(";", $post[$hosts]) as $host) {
diff --git a/config/squid3/squid.xml b/config/squid3/squid.xml
index f07793bb..7d675265 100644
--- a/config/squid3/squid.xml
+++ b/config/squid3/squid.xml
@@ -166,7 +166,7 @@
 			<fieldname>transparent_proxy</fieldname>
 			<description>If transparent mode is enabled, all requests for destination port 80 will be forwarded to the proxy server without any additional configuration necessary.</description>
 			<type>checkbox</type>
-			<enablefields>private_subnet_proxy_off</enablefields>			
+			<enablefields>private_subnet_proxy_off,defined_ip_proxy_off,defined_ip_proxy_off_dest</enablefields>			
 			<required/>
 		</field>
 		<field>
-- 
cgit v1.2.3