webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-28 03:33:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

webaccess.cgi: Fixed language settings.

Browse Source 
Fix for #10879. Added also use strict.

Signed-off-by: Erik Kapfer <erik.kapfer@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
This commit is contained in:
Erik Kapfer
2016-01-18 10:14:10 +01:00
committed by Michael Tremer
parent 857b2c795e
commit bcb30674e2
1 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
html/cgi-bin/webaccess.cgi
View File

@@ -19,8 +19,18 @@
# # # #
############################################################################### ###############################################################################
use strict;
#usable only the following on debugging purpose
#use warnings;
#use CGI::Carp 'fatalsToBrowser';
use CGI; use CGI;
require '/var/ipfire/general-functions.pl';
require "${General::swroot}/lang.pl";
require "${General::swroot}/header.pl";
my $swroot = "/var/ipfire"; my $swroot = "/var/ipfire";
my $apdir = "$swroot/proxy/advanced"; my $apdir = "$swroot/proxy/advanced";
my $group_def_file = "$apdir/cre/classrooms"; my $group_def_file = "$apdir/cre/classrooms";
@@ -31,6 +41,7 @@ my $acl_src_noaccess_mac = "$apdir/acls/src_noaccess_mac.acl";
my $banner = "A D V A N C E D &nbsp; P R O X Y &nbsp; - &nbsp; W E B &nbsp; A C C E S S &nbsp; M A N A G E R"; my $banner = "A D V A N C E D &nbsp; P R O X Y &nbsp; - &nbsp; W E B &nbsp; A C C E S S &nbsp; M A N A G E R";
my %cgiparams; my %cgiparams;
my %proxysettings; my %proxysettings;
my %temp;
my %acl=(); my %acl=();
my @group_defs=(); my @group_defs=();
@@ -49,8 +60,8 @@ require "${swroot}/lang.pl";
foreach (@groups) foreach (@groups)
{ {
if ($cgiparams{$_} eq $tr{'advproxy mode deny'}) { $acl{$_}='on'; } if ($cgiparams{$_} eq $Lang::tr{'advproxy mode deny'}) { $acl{$_}='on'; }
if ($cgiparams{$_} eq $tr{'advproxy mode allow'}) { $acl{$_}='off'; } if ($cgiparams{$_} eq $Lang::tr{'advproxy mode allow'}) { $acl{$_}='off'; }
} }
&read_all_groups; &read_all_groups;
@@ -144,7 +155,7 @@ if (($is_supervisor) && ((defined($proxysettings{'SUPERVISOR_PASSWORD'})) && (!(
{ {
print <<END print <<END
<td align='center'> <td align='center'>
<font face='verdana,arial,helvetica' color='#000000' size='2'>$tr{'advproxy supervisor password'}:</font> <font face='verdana,arial,helvetica' color='#000000' size='2'>$Lang::tr{'advproxy supervisor password'}:</font>
</td> </td>
<td align='center'><input type='password' name='PASSWORD' size='15'></td> <td align='center'><input type='password' name='PASSWORD' size='15'></td>
END END
@@ -176,11 +187,11 @@ END
if ((defined($acl{$_})) && ($acl{$_} eq 'on')) if ((defined($acl{$_})) && ($acl{$_} eq 'on'))
{ {
print "</td><td width='120' align='center'>"; print "</td><td width='120' align='center'>";
print "<input type='submit' name='$_' value=' $tr{'advproxy mode allow'} '>"; print "<input type='submit' name='$_' value=' $Lang::tr{'advproxy mode allow'} '>";
print "</td><td width='16' bgcolor='#D00000'>&nbsp;</td>\n"; print "</td><td width='16' bgcolor='#D00000'>&nbsp;</td>\n";
} else { } else {
print "</td><td width='120' align='center'>"; print "</td><td width='120' align='center'>";
print "<input type='submit' name='$_' value=' $tr{'advproxy mode deny'} '>"; print "<input type='submit' name='$_' value=' $Lang::tr{'advproxy mode deny'} '>";
print "</td><td width='16' bgcolor='#00A000'>&nbsp;</td>\n"; print "</td><td width='16' bgcolor='#00A000'>&nbsp;</td>\n";
} }
} }
@@ -199,14 +210,14 @@ END
} else { } else {
print " <tr>\n"; print " <tr>\n";
print " <td align='center'>\n"; print " <td align='center'>\n";
print " <font face='verdana,arial,helvetica' color='#000000' size='2'>$tr{'advproxy no cre groups'}</font>\n"; print " <font face='verdana,arial,helvetica' color='#000000' size='2'>$Lang::tr{'advproxy no cre groups'}</font>\n";
print " </td>\n"; print " </td>\n";
print " </tr>\n"; print " </tr>\n";
} }
} else { } else {
print " <tr>\n"; print " <tr>\n";
print " <td align='center'>\n"; print " <td align='center'>\n";
print " <font face='verdana,arial,helvetica' color='#000000' size='2'>$tr{'advproxy cre disabled'}</font>\n"; print " <font face='verdana,arial,helvetica' color='#000000' size='2'>$Lang::tr{'advproxy cre disabled'}</font>\n";
print " </td>\n"; print " </td>\n";
print " </tr>\n"; print " </tr>\n";
} }