* [PATCH] webaccess.cgi: Fixed language settings.
@ 2016-01-18 9:14 Erik Kapfer
2016-01-19 0:26 ` Michael Tremer
0 siblings, 1 reply; 2+ messages in thread
From: Erik Kapfer @ 2016-01-18 9:14 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 3858 bytes --]
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 P R O X Y - W E B A C C E S S 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'> </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'> </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";
}
--
2.4.4
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] webaccess.cgi: Fixed language settings.
2016-01-18 9:14 [PATCH] webaccess.cgi: Fixed language settings Erik Kapfer
@ 2016-01-19 0:26 ` Michael Tremer
0 siblings, 0 replies; 2+ messages in thread
From: Michael Tremer @ 2016-01-19 0:26 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 4062 bytes --]
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 P R O X Y - W E B
> A C C E S S 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'> </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'> </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";
> }
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-01-19 0:26 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-01-18 9:14 [PATCH] webaccess.cgi: Fixed language settings Erik Kapfer
2016-01-19 0:26 ` Michael Tremer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox