From mboxrd@z Thu Jan  1 00:00:00 1970
From: Erik Kapfer <erik.kapfer@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH] webaccess.cgi: Fixed language settings.
Date: Mon, 18 Jan 2016 10:14:10 +0100
Message-ID: <1453108450-17427-1-git-send-email-erik.kapfer@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============5283223866313221732=="
List-Id: <development.lists.ipfire.org>

--===============5283223866313221732==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Fix for #10879. Added also use strict.

Signed-off-by: Erik Kapfer <erik.kapfer(a)ipfire.org>
---
 html/cgi-bin/webaccess.cgi | 25 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/html/cgi-bin/webaccess.cgi b/html/cgi-bin/webaccess.cgi
index afa3770..0d50f01 100644
--- a/html/cgi-bin/webaccess.cgi
+++ b/html/cgi-bin/webaccess.cgi
@@ -19,8 +19,18 @@
 #                                                                           =
  #
 ############################################################################=
###
=20
+use strict;
+
+#usable only the following on debugging purpose
+#use warnings;
+#use CGI::Carp 'fatalsToBrowser';
 use CGI;
=20
+require '/var/ipfire/general-functions.pl';
+require "${General::swroot}/lang.pl";
+require "${General::swroot}/header.pl";
+
+
 my $swroot =3D "/var/ipfire";
 my $apdir  =3D "$swroot/proxy/advanced";
 my $group_def_file =3D "$apdir/cre/classrooms";
@@ -31,6 +41,7 @@ my $acl_src_noaccess_mac =3D "$apdir/acls/src_noaccess_mac.=
acl";
 my $banner =3D "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 %proxysettings;
+my %temp;
=20
 my %acl=3D();
 my @group_defs=3D();
@@ -49,8 +60,8 @@ require "${swroot}/lang.pl";
=20
 foreach (@groups)
 {
-	if ($cgiparams{$_} eq $tr{'advproxy mode deny'})  { $acl{$_}=3D'on'; }
-	if ($cgiparams{$_} eq $tr{'advproxy mode allow'}) { $acl{$_}=3D'off'; }
+       if ($cgiparams{$_} eq $Lang::tr{'advproxy mode deny'}) { $acl{$_}=3D'=
on'; }
+       if ($cgiparams{$_} eq $Lang::tr{'advproxy mode allow'}) { $acl{$_}=3D=
'off'; }
 }
=20
 &read_all_groups;
@@ -144,7 +155,7 @@ if (($is_supervisor) && ((defined($proxysettings{'SUPERVI=
SOR_PASSWORD'})) && (!(
 {
 print <<END
                   <td align=3D'center'>
-                     <font face=3D'verdana,arial,helvetica' color=3D'#000000=
' size=3D'2'>$tr{'advproxy supervisor password'}:</font>
+                     <font face=3D'verdana,arial,helvetica' color=3D'#000000=
' size=3D'2'>$Lang::tr{'advproxy supervisor password'}:</font>
                   </td>
                   <td align=3D'center'><input type=3D'password' name=3D'PASS=
WORD' size=3D'15'></td>
 END
@@ -176,11 +187,11 @@ END
 			if ((defined($acl{$_})) && ($acl{$_} eq 'on'))
 			{
 			print "</td><td width=3D'120' align=3D'center'>";
-				print "<input type=3D'submit' name=3D'$_' value=3D' $tr{'advproxy mode a=
llow'} '>";
+				print "<input type=3D'submit' name=3D'$_' value=3D' $Lang::tr{'advproxy =
mode allow'} '>";
 			print "</td><td width=3D'16' bgcolor=3D'#D00000'>&nbsp;</td>\n";
 			} else {
 			print "</td><td width=3D'120' align=3D'center'>";
-				print "<input type=3D'submit' name=3D'$_' value=3D' $tr{'advproxy mode d=
eny'} '>";
+				print "<input type=3D'submit' name=3D'$_' value=3D' $Lang::tr{'advproxy =
mode deny'} '>";
 			print "</td><td width=3D'16' bgcolor=3D'#00A000'>&nbsp;</td>\n";
 			}
 		}
@@ -199,14 +210,14 @@ END
 } else {
             print "      <tr>\n";
             print "         <td align=3D'center'>\n";
-            print "            <font face=3D'verdana,arial,helvetica' color=
=3D'#000000' size=3D'2'>$tr{'advproxy no cre groups'}</font>\n";
+            print "            <font face=3D'verdana,arial,helvetica' color=
=3D'#000000' size=3D'2'>$Lang::tr{'advproxy no cre groups'}</font>\n";
             print "         </td>\n";
             print "      </tr>\n";
 }
 } else {
             print "      <tr>\n";
             print "         <td align=3D'center'>\n";
-            print "            <font face=3D'verdana,arial,helvetica' color=
=3D'#000000' size=3D'2'>$tr{'advproxy cre disabled'}</font>\n";
+            print "            <font face=3D'verdana,arial,helvetica' color=
=3D'#000000' size=3D'2'>$Lang::tr{'advproxy cre disabled'}</font>\n";
             print "         </td>\n";
             print "      </tr>\n";
 }
--=20
2.4.4


--===============5283223866313221732==--