From mboxrd@z Thu Jan  1 00:00:00 1970
From: Michael Tremer <michael.tremer@ipfire.org>
To: development@lists.ipfire.org
Subject: Re: [PATCH] webaccess.cgi: Fixed language settings.
Date: Tue, 19 Jan 2016 00:26:27 +0000
Message-ID: <1453163187.5665.126.camel@ipfire.org>
In-Reply-To: <1453108450-17427-1-git-send-email-erik.kapfer@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============3077294148302107752=="
List-Id: <development.lists.ipfire.org>

--===============3077294148302107752==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 7bit

Thanks. Merged.

On Mon, 2016-01-18 at 10:14 +0100, Erik Kapfer wrote:
> 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 @@
>  #                                                                   
>           #
>  ####################################################################
> ###########
>  
> +use strict;
> +
> +#usable only the following on debugging purpose
> +#use warnings;
> +#use CGI::Carp 'fatalsToBrowser';
>  use CGI;
>  
> +require '/var/ipfire/general-functions.pl';
> +require "${General::swroot}/lang.pl";
> +require "${General::swroot}/header.pl";
> +
> +
>  my $swroot = "/var/ipfire";
>  my $apdir  = "$swroot/proxy/advanced";
>  my $group_def_file = "$apdir/cre/classrooms";
> @@ -31,6 +41,7 @@ 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 %proxysettings;
> +my %temp;
>  
>  my %acl=();
>  my @group_defs=();
> @@ -49,8 +60,8 @@ require "${swroot}/lang.pl";
>  
>  foreach (@groups)
>  {
> -	if ($cgiparams{$_} eq $tr{'advproxy mode deny'})  {
> $acl{$_}='on'; }
> -	if ($cgiparams{$_} eq $tr{'advproxy mode allow'}) {
> $acl{$_}='off'; }
> +       if ($cgiparams{$_} eq $Lang::tr{'advproxy mode deny'}) {
> $acl{$_}='on'; }
> +       if ($cgiparams{$_} eq $Lang::tr{'advproxy mode allow'}) {
> $acl{$_}='off'; }
>  }
>  
>  &read_all_groups;
> @@ -144,7 +155,7 @@ if (($is_supervisor) &&
> ((defined($proxysettings{'SUPERVISOR_PASSWORD'})) && (!(
>  {
>  print <<END
>                    <td align='center'>
> -                     <font face='verdana,arial,helvetica'
> color='#000000' size='2'>$tr{'advproxy supervisor password'}:</font>
> +                     <font face='verdana,arial,helvetica'
> color='#000000' size='2'>$Lang::tr{'advproxy supervisor
> password'}:</font>
>                    </td>
>                    <td align='center'><input type='password'
> name='PASSWORD' size='15'></td>
>  END
> @@ -176,11 +187,11 @@ END
>  			if ((defined($acl{$_})) && ($acl{$_} eq
> 'on'))
>  			{
>  			print "</td><td width='120'
> align='center'>";
> -				print "<input type='submit'
> name='$_' value=' $tr{'advproxy mode allow'} '>";
> +				print "<input type='submit'
> name='$_' value=' $Lang::tr{'advproxy mode allow'} '>";
>  			print "</td><td width='16'
> bgcolor='#D00000'>&nbsp;</td>\n";
>  			} else {
>  			print "</td><td width='120'
> align='center'>";
> -				print "<input type='submit'
> name='$_' value=' $tr{'advproxy mode deny'} '>";
> +				print "<input type='submit'
> name='$_' value=' $Lang::tr{'advproxy mode deny'} '>";
>  			print "</td><td width='16'
> bgcolor='#00A000'>&nbsp;</td>\n";
>  			}
>  		}
> @@ -199,14 +210,14 @@ END
>  } else {
>              print "      <tr>\n";
>              print "         <td align='center'>\n";
> -            print "            <font face='verdana,arial,helvetica'
> color='#000000' size='2'>$tr{'advproxy no cre groups'}</font>\n";
> +            print "            <font face='verdana,arial,helvetica'
> color='#000000' size='2'>$Lang::tr{'advproxy no cre
> groups'}</font>\n";
>              print "         </td>\n";
>              print "      </tr>\n";
>  }
>  } else {
>              print "      <tr>\n";
>              print "         <td align='center'>\n";
> -            print "            <font face='verdana,arial,helvetica'
> color='#000000' size='2'>$tr{'advproxy cre disabled'}</font>\n";
> +            print "            <font face='verdana,arial,helvetica'
> color='#000000' size='2'>$Lang::tr{'advproxy cre
> disabled'}</font>\n";
>              print "         </td>\n";
>              print "      </tr>\n";
>  }

--===============3077294148302107752==
Content-Type: application/pgp-signature
Content-Transfer-Encoding: base64
Content-Disposition: attachment; filename="signature.asc"
MIME-Version: 1.0

LS0tLS1CRUdJTiBQR1AgU0lHTkFUVVJFLS0tLS0KVmVyc2lvbjogR251UEcgdjEKCmlRSWNCQUFC
Q2dBR0JRSlduWUt6QUFvSkVJQjU4UDl2a0FrSEVqOFAvMmltMW9CeVlMcDFWZGhoSVBybmlGWmUK
d09HdXZjeHFDZXZoUFRERlp0VG9zdFQ5cGFvWWpaaEdwUmZWSm9zKzFOekFic1JPc0RFQUFPWnVm
TDdwNTJ2dwoxdHB3cWRKMzJYdmlmRU5ScG1mdHJzZkNoY1pFemtJT1BIZnJySjd6QURMRE52VTUv
d3lHMWk2QXp1TVF5NkNJCjlNZS9EZ05QQVNFZ1lHNFpzMHJodk1qazAyd3FHaWNVQ3lDeXQ5TTJJ
SFZGNGlJdzFDK1lGZE5rb1VZeW9EYi8KV29uRDhEU2lRR2l1WHpUdVNnVUxxVVBSMU44OXVxamlY
bWFqUjRCV2tUSEhaTkU3aCtTdzFEMiswL2tGaE1GVgpjdlVlc3Q0ZDNIRGx5YW91Nng3ZWdMeUtz
R1E5RDVNTjVXRGEwMlBsOFFoQnp2NWtNZnFrdDR6c1VkOVZSRDBxCnZ4RXJjU3BJS1pML0l2SFkr
OC9aYkpsMk1YWEovR0pGVktkREFFbkJVU1pPNG1RZ0F0anQySUp1NFVIZUVsa3gKQmdPWGJXeWpX
RFQzbENvT25XLzlTSW16UEJtZUlwR0FLMWNJNVNxVGFpNCtsN2FZY0tkVER1dE4yNmU3V045UApF
Sk8yYUgyazdOd3pmWnNZbXh3clZqMzBPbEx5VWJTRjhmajY5MG81UTd6d2djMnk0Z1hvZ2VoeFJE
ZUJhT0w1CmFLdEV2QlFINnJtRUFkN0hYSnRCNFFvNWxzRnhhaFJJdm9wWlIvSDI0b3hvVjBxMkFU
U0Z0aUlmdGdQLzA1bDUKcGVFdTJzWXU5Qy9jWnlYM2RMcFdkWElFSExnOUxEeVNsSWRsSEhzSmIx
dVdJbzNjTEhpWlpXK2wrT2t0V3Vvdwp1N0tnVVFjL2ZRV2FPUE5MREMrTwo9djZzOQotLS0tLUVO
RCBQR1AgU0lHTkFUVVJFLS0tLS0K

--===============3077294148302107752==--