Fixed proxy.cgi to disable transparent mode when proxy is off

git-svn-id: http://svn.ipfire.org/svn/ipfire/branches/2.1/trunk@1187 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8

diff --git a/html/cgi-bin/proxy.cgi b/html/cgi-bin/proxy.cgi
index b639c638daa5ffa4fbf8577d1f07a7a0afdd2ae1..fbf98d0b18ca7d7ac8437236013e7227e220b18b 100644 (file)
--- a/html/cgi-bin/proxy.cgi
+++ b/html/cgi-bin/proxy.cgi
@@ -607,12 +607,12 @@ ERROR:
                if ($proxysettings{'ENABLE'} eq 'on') {
                        system ('/usr/bin/touch', "${General::swroot}/proxy/enable");
                        system ('/usr/local/bin/squidctrl', 'enable'); }
-               if ($proxysettings{'TRANSPARENT'} eq 'on') {
+               if ($proxysettings{'TRANSPARENT'} eq 'on' && $proxysettings{'ENABLE'} eq 'on') {
                        system ('/usr/bin/touch', "${General::swroot}/proxy/transparent"); }
                if ($proxysettings{'ENABLE_BLUE'} eq 'on') {
                        system ('/usr/bin/touch', "${General::swroot}/proxy/enable_blue");
                        system ('/usr/local/bin/squidctrl', 'enable'); }
-               if ($proxysettings{'TRANSPARENT_BLUE'} eq 'on') {
+               if ($proxysettings{'TRANSPARENT_BLUE'} eq 'on' && $proxysettings{'ENABLE_BLUE'} eq 'on') {
                        system ('/usr/bin/touch', "${General::swroot}/proxy/transparent_blue"); }
 
                if ($proxysettings{'ACTION'} eq $Lang::tr{'advproxy save and restart'}) { system('/usr/local/bin/squidctrl restart >/dev/null 2>&1'); }