From: <dot...@us...> - 2009-08-14 20:44:26
|
Revision: 3440 http://ipcop.svn.sourceforge.net/ipcop/?rev=3440&view=rev Author: dotzball Date: 2009-08-14 20:44:18 +0000 (Fri, 14 Aug 2009) Log Message: ----------- Fix default proxy port in "Allowed standard ports". Modified Paths: -------------- ipcop/trunk/html/cgi-bin/proxy.cgi Modified: ipcop/trunk/html/cgi-bin/proxy.cgi =================================================================== --- ipcop/trunk/html/cgi-bin/proxy.cgi 2009-08-14 09:33:33 UTC (rev 3439) +++ ipcop/trunk/html/cgi-bin/proxy.cgi 2009-08-14 20:44:18 UTC (rev 3440) @@ -45,7 +45,7 @@ my $throttle_dskimg="b5t|bin|bwt|ccd|cdi|cue|gho|img|iso|mds|nrg|pqi"; my $throttle_mmedia="aiff?|asf|avi|divx|mov|mp3|mpe?g|qt|ra?m"; -my $def_ports_safe="80 # http\n21 # ftp\n443 # https\n1025-65535 # unprivileged ports\n800 # Squids port (for icons)\n"; +my $def_ports_safe="80 # http\n21 # ftp\n443 # https\n1025-65535 # unprivileged ports\n8080 # Squids port (for icons)\n"; my $def_ports_ssl="443 # https\n"; my @useragent=(); @@ -343,14 +343,14 @@ } if ($proxysettings{'ACTION'} eq $Lang::tr{'save'}) -{ - if ($proxysettings{'ENABLED_GREEN_1'} !~ /^(on|off)$/ || - $proxysettings{'TRANSPARENT_GREEN_1'} !~ /^(on|off)$/ || - $proxysettings{'ENABLED_BLUE_1'} !~ /^(on|off)$/ || +{ + if ($proxysettings{'ENABLED_GREEN_1'} !~ /^(on|off)$/ || + $proxysettings{'TRANSPARENT_GREEN_1'} !~ /^(on|off)$/ || + $proxysettings{'ENABLED_BLUE_1'} !~ /^(on|off)$/ || $proxysettings{'TRANSPARENT_BLUE_1'} !~ /^(on|off)$/ ) { $errormessage = $Lang::tr{'invalid input'}; goto ERROR; - } + } if (!(&General::validport($proxysettings{'PROXY_PORT'}))) { $errormessage = $Lang::tr{'errmsg invalid proxy port'}; @@ -370,7 +370,7 @@ { $errormessage = $Lang::tr{'errmsg mem cache size'}; goto ERROR; - } + } my @free = `/usr/bin/free`; $free[1] =~ m/(\d+)/; $cachemem = int $1 / 2048; @@ -440,8 +440,8 @@ } } } - if ((!($proxysettings{'AUTH_MAX_USERIP'} eq '')) && - ((!($proxysettings{'AUTH_MAX_USERIP'} =~ /^\d+/)) || ($proxysettings{'AUTH_MAX_USERIP'} < 1) || ($proxysettings{'AUTH_MAX_USERIP'} > 255))) + if ((!($proxysettings{'AUTH_MAX_USERIP'} eq '')) && + ((!($proxysettings{'AUTH_MAX_USERIP'} =~ /^\d+/)) || ($proxysettings{'AUTH_MAX_USERIP'} < 1) || ($proxysettings{'AUTH_MAX_USERIP'} > 255))) { $errormessage = $Lang::tr{'errmsg max userip'}; goto ERROR; @@ -1315,7 +1315,7 @@ # ------------------------------------------------------------------- -print <<END +print <<END <table width='100%'> <tr> @@ -1503,7 +1503,7 @@ <td width='10%'><input type='checkbox' name='THROTTLE_MMEDIA' $checked{'THROTTLE_MMEDIA'}{'on'} /></td> <td width='15%'> </td> <td width='10%'> </td> -</tr> +</tr> </table> <hr size='1'/> <table width='100%'> @@ -2944,7 +2944,7 @@ { @temp = split(/\//); if ( - ($temp[0] ne $netsettings{'GREEN_1_NETADDRESS'}) && ($temp[1] ne $netsettings{'GREEN_1_NETMASK'}) && + ($temp[0] ne $netsettings{'GREEN_1_NETADDRESS'}) && ($temp[1] ne $netsettings{'GREEN_1_NETMASK'}) && ($temp[0] ne $netsettings{'BLUE_1_NETADDRESS'}) && ($temp[1] ne $netsettings{'BLUE_1_NETMASK'}) ) { @@ -3215,7 +3215,7 @@ print MSNTCONF "allowusers $ntlmdir/msntauth.allowusers\n"; } else { print MSNTCONF "denyusers $ntlmdir/msntauth.denyusers\n"; - } + } } close(MSNTCONF); } @@ -3298,7 +3298,7 @@ if ($proxysettings{'ENABLE_BROWSER_CHECK'} eq 'on') { print FILE "acl with_allowed_useragents browser $browser_regexp\n\n"; } - print FILE "acl within_timeframe time "; + print FILE "acl within_timeframe time "; if ($proxysettings{'TIME_MON'} eq 'on') { print FILE "M"; } if ($proxysettings{'TIME_TUE'} eq 'on') { print FILE "T"; } if ($proxysettings{'TIME_WED'} eq 'on') { print FILE "W"; } @@ -3530,7 +3530,7 @@ print FILE "delay_access 2 deny all\n"; } - print FILE "delay_initial_bucket_level 100\n"; + print FILE "delay_initial_bucket_level 100\n"; print FILE "\n"; } @@ -3642,7 +3642,7 @@ if (($proxysettings{'AUTH_METHOD'} eq 'ntlm') && ($proxysettings{'NTLM_ENABLE_INT_AUTH'} eq 'on')) { if ($proxysettings{'NTLM_ENABLE_ACL'} eq 'on') - { + { if (($proxysettings{'NTLM_USER_ACL'} eq 'positive') && (!-z "$ntlmdir/msntauth.allowusers")) { print FILE " for_acl_users"; @@ -3687,7 +3687,7 @@ if (($proxysettings{'AUTH_METHOD'} eq 'ntlm') && ($proxysettings{'NTLM_ENABLE_INT_AUTH'} eq 'on')) { if ($proxysettings{'NTLM_ENABLE_ACL'} eq 'on') - { + { if (($proxysettings{'NTLM_USER_ACL'} eq 'positive') && (!-z "$ntlmdir/msntauth.allowusers")) { print FILE " for_acl_users"; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |