From mboxrd@z Thu Jan  1 00:00:00 1970
From: git@ipfire.org
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated.
 928eba27a5e15074d8e5b7d8b9f6892d122bf40f
Date: Tue, 19 Jan 2016 01:07:52 +0100
Message-ID: <20160119000752.8993921A01@argus.ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0226267505982917112=="
List-Id: <ipfire-scm.lists.ipfire.org>

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

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, next has been updated
       via  928eba27a5e15074d8e5b7d8b9f6892d122bf40f (commit)
       via  bcb30674e2f7f3fe4989bffe5fbc43d44be86633 (commit)
      from  857b2c795e2c982cb5967725ba01a1e3c29d43f5 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 928eba27a5e15074d8e5b7d8b9f6892d122bf40f
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Tue Jan 19 00:07:07 2016 +0000

    core97: Ship updated webaccess.cgi
   =20
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit bcb30674e2f7f3fe4989bffe5fbc43d44be86633
Author: Erik Kapfer <erik.kapfer(a)ipfire.org>
Date:   Mon Jan 18 10:14:10 2016 +0100

    webaccess.cgi: Fixed language settings.
   =20
    Fix for #10879. Added also use strict.
   =20
    Signed-off-by: Erik Kapfer <erik.kapfer(a)ipfire.org>
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

-----------------------------------------------------------------------

Summary of changes:
 config/rootfiles/core/97/filelists/files |  1 +
 html/cgi-bin/webaccess.cgi               | 25 ++++++++++++++++++-------
 2 files changed, 19 insertions(+), 7 deletions(-)

Difference in files:
diff --git a/config/rootfiles/core/97/filelists/files b/config/rootfiles/core=
/97/filelists/files
index af53bb3..40bbbcf 100644
--- a/config/rootfiles/core/97/filelists/files
+++ b/config/rootfiles/core/97/filelists/files
@@ -2,6 +2,7 @@ etc/system-release
 etc/issue
 srv/web/ipfire/cgi-bin/ovpnmain.cgi
 srv/web/ipfire/cgi-bin/qos.cgi
+srv/web/ipfire/cgi-bin/webaccess.cgi
 usr/bin/pgrep
 usr/local/bin/qosctrl
 usr/local/bin/timectrl
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";
 }


hooks/post-receive
--
IPFire 2.x development tree

--===============0226267505982917112==--