From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 13 Jun 2015 13:22:37 +0000 (+0200)
Subject: webaccess.cgi: Fix loading language
X-Git-Tag: v2.17-core92~10^2~51
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1f15cc0993aebc53870c685836db2eaeafdc767a;p=ipfire-2.x.git

webaccess.cgi: Fix loading language

Fixes #10879

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

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