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.
 1f15cc0993aebc53870c685836db2eaeafdc767a
Date: Sat, 13 Jun 2015 15:23:11 +0200
Message-ID: <20150613132311.4EE6022309@argus.ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============3699297387704593414=="
List-Id: <ipfire-scm.lists.ipfire.org>

--===============3699297387704593414==
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  1f15cc0993aebc53870c685836db2eaeafdc767a (commit)
      from  31a849dd53128b3460f3d6f620a9ca286379e729 (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 1f15cc0993aebc53870c685836db2eaeafdc767a
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Sat Jun 13 15:22:37 2015 +0200

    webaccess.cgi: Fix loading language
   =20
    Fixes #10879
   =20
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

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

Summary of changes:
 html/cgi-bin/webaccess.cgi | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

Difference in files:
diff --git a/html/cgi-bin/webaccess.cgi b/html/cgi-bin/webaccess.cgi
index b381717..afa3770 100644
--- a/html/cgi-bin/webaccess.cgi
+++ b/html/cgi-bin/webaccess.cgi
@@ -30,7 +30,6 @@ my $acl_src_noaccess_mac =3D "$apdir/acls/src_noaccess_mac.=
acl";
=20
 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 %mainsettings;
 my %proxysettings;
=20
 my %acl=3D();
@@ -38,18 +37,10 @@ my @group_defs=3D();
 my @groups=3D();
=20
 ### Initialize environment
-&readhash("${swroot}/main/settings", \%mainsettings);
 &readhash("${swroot}/proxy/advanced/settings", \%proxysettings);
-$language =3D $mainsettings{'LANGUAGE'};
=20
 ### Initialize language
-if ($language =3D~ /^(\w+)$/) {$language =3D $1;}
- #
- # Uncomment this to force a certain language:
- # $language=3D'en';
- #
-require "${swroot}/langs/en.pl";
-require "${swroot}/langs/${language}.pl";
+require "${swroot}/lang.pl";
=20
 &getcgihash(\%cgiparams);
=20


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

--===============3699297387704593414==--