]> git.ipfire.org Git - people/arne_f/ipfire-2.x.git/commitdiff
webaccess.cgi: Fix loading language
authorMichael Tremer <michael.tremer@ipfire.org>
Sat, 13 Jun 2015 13:22:37 +0000 (15:22 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Sat, 13 Jun 2015 13:22:37 +0000 (15:22 +0200)
Fixes #10879

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
html/cgi-bin/webaccess.cgi

index b38171762dafb736acd95cde6f5110bb9bf38f7c..afa3770cf93f05a7bd2635e30b0c08a8093952ad 100644 (file)
@@ -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);