From 6c68959174b1994ff525cf9c40ced18b838b73ff Mon Sep 17 00:00:00 2001 From: maniacikarus Date: Thu, 7 Feb 2008 17:58:09 +0000 Subject: [PATCH] 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 --- html/cgi-bin/proxy.cgi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/html/cgi-bin/proxy.cgi b/html/cgi-bin/proxy.cgi index b639c638d..fbf98d0b1 100644 --- 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'); }