* [PATCH] Added language support for chpasswd.cgi
@ 2017-10-04 13:03 Erik Kapfer
2017-10-04 15:51 ` Michael Tremer
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Erik Kapfer @ 2017-10-04 13:03 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 6796 bytes --]
---
html/cgi-bin/chpasswd.cgi | 57 +++++++++++++++++++++++++++--------------------
1 file changed, 33 insertions(+), 24 deletions(-)
diff --git a/html/cgi-bin/chpasswd.cgi b/html/cgi-bin/chpasswd.cgi
index 0a66062..00494f2 100644
--- a/html/cgi-bin/chpasswd.cgi
+++ b/html/cgi-bin/chpasswd.cgi
@@ -19,15 +19,26 @@
# #
###############################################################################
+use strict;
+
+#usable only the following on debugging purpose
+#use warnings;
+#use CGI::Carp 'fatalsToBrowser';
+
use CGI qw(param);
use Apache::Htpasswd;
use Crypt::PasswdMD5;
-$swroot = "/var/ipfire";
-
my %cgiparams;
my %mainsettings;
my %proxysettings;
+my %netsettings;
+my %temp;
+my $swroot;
+my $errormessage;
+my $language;
+
+$swroot = "/var/ipfire";
$proxysettings{'NCSA_MIN_PASS_LEN'} = 6;
@@ -38,12 +49,10 @@ $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 '/var/ipfire/general-functions.pl';
+require "${General::swroot}/lang.pl";
+require "${General::swroot}/header.pl";
my $userdb = "$swroot/proxy/advanced/ncsa/passwd";
@@ -53,26 +62,26 @@ my $success = 0;
&getcgihash(\%cgiparams);
-if ($cgiparams{'SUBMIT'} eq $tr{'advproxy chgwebpwd change password'})
+if ($cgiparams{'SUBMIT'} eq $Lang::tr{'advproxy chgwebpwd change password'})
{
if ($cgiparams{'USERNAME'} eq '')
{
- $errormessage = $tr{'advproxy errmsg no username'};
+ $errormessage = $Lang::tr{'advproxy errmsg no username'};
goto ERROR;
}
if (($cgiparams{'OLD_PASSWORD'} eq '') || ($cgiparams{'NEW_PASSWORD_1'} eq '') || ($cgiparams{'NEW_PASSWORD_2'} eq ''))
{
- $errormessage = $tr{'advproxy errmsg no password'};
+ $errormessage = $Lang::tr{'advproxy errmsg no password'};
goto ERROR;
}
if (!($cgiparams{'NEW_PASSWORD_1'} eq $cgiparams{'NEW_PASSWORD_2'}))
{
- $errormessage = $tr{'advproxy errmsg passwords different'};
+ $errormessage = $Lang::tr{'advproxy errmsg passwords different'};
goto ERROR;
}
if (length($cgiparams{'NEW_PASSWORD_1'}) < $proxysettings{'NCSA_MIN_PASS_LEN'})
{
- $errormessage = $tr{'advproxy errmsg password length 1'}.$proxysettings{'NCSA_MIN_PASS_LEN'}.$tr{'advproxy errmsg password length 2'};
+ $errormessage = $Lang::tr{'advproxy errmsg password length 1'}.$proxysettings{'NCSA_MIN_PASS_LEN'}.$Lang::tr{'advproxy errmsg password length 2'};
goto ERROR;
}
@@ -81,14 +90,14 @@ if ($cgiparams{'SUBMIT'} eq $tr{'advproxy chgwebpwd change password'})
# Check if a user with this name exists
my $old_password = $htpasswd->fetchPass($cgiparams{'USERNAME'});
if (!$old_password) {
- $errormessage = $tr{'advproxy errmsg invalid user'};
+ $errormessage = $Lang::tr{'advproxy errmsg invalid user'};
goto ERROR;
}
# Reset password
if (!$htpasswd->htpasswd($cgiparams{'USERNAME'}, $cgiparams{'NEW_PASSWORD_1'},
$cgiparams{'OLD_PASSWORD'})) {
- $errormessage = $tr{'advproxy errmsg password incorrect'};
+ $errormessage = $Lang::tr{'advproxy errmsg password incorrect'};
goto ERROR;
}
@@ -103,7 +112,7 @@ print "Cache-control: no-cache\n";
print "Connection: close\n";
print "Content-type: text/html\n\n";
-print <<END
+print <<END;
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
@@ -124,7 +133,7 @@ print <<END
<tr>
<td nowrap bgcolor="#993333" align="center" >
<font face="trebuchet ms, helvetica, sans-serif" color="#FFFFFF" size="4">
- <b>$tr{'advproxy chgwebpwd change web password'}</b>
+ <b>$Lang::tr{'advproxy chgwebpwd change web password'}</b>
</font>
</td>
</tr>
@@ -134,7 +143,7 @@ print <<END
<tr>
<td nowrap bgcolor="#FFFFFF" align="left">
<font face="trebuchet ms, helvetica, sans-serif" color="#666666" size="2">
- <b>$tr{'advproxy chgwebpwd username'}:</b>
+ <b>$Lang::tr{'advproxy chgwebpwd username'}:</b>
</font>
</td>
<td ><input type="text" name="USERNAME" value="$cgiparams{'USERNAME'}" size="30"></td>
@@ -142,7 +151,7 @@ print <<END
<tr>
<td nowrap bgcolor="#FFFFFF" align="left">
<font face="trebuchet ms, helvetica, sans-serif" color="#666666" size="2">
- <b>$tr{'advproxy chgwebpwd old password'}:</b>
+ <b>$Lang::tr{'advproxy chgwebpwd old password'}:</b>
</font>
</td>
<td><input type="password" name="OLD_PASSWORD" value="$cgiparams{'OLD_PASSWORD'}" size="30"></td>
@@ -150,7 +159,7 @@ print <<END
<tr>
<td nowrap bgcolor="#FFFFFF" align="left">
<font face="trebuchet ms, helvetica, sans-serif" color="#666666" size="2">
- <b>$tr{'advproxy chgwebpwd new password'}:</b>
+ <b>$Lang::tr{'advproxy chgwebpwd new password'}:</b>
</font>
</td>
<td><input type="password" name="NEW_PASSWORD_1" value="$cgiparams{'NEW_PASSWORD_1'}" size="30"></td>
@@ -158,7 +167,7 @@ print <<END
<tr>
<td nowrap bgcolor="#FFFFFF" align="left">
<font face="trebuchet ms, helvetica, sans-serif" color="#666666" size="2">
- <b>$tr{'advproxy chgwebpwd new password confirm'}:</b>
+ <b>$Lang::tr{'advproxy chgwebpwd new password confirm'}:</b>
</font>
</td>
<td><input type="password" name="NEW_PASSWORD_2" value="$cgiparams{'NEW_PASSWORD_2'}" size="30"></td>
@@ -166,7 +175,7 @@ print <<END
</table>
<table width="100%" cellspacing="7" cellpadding="7">
<tr>
- <td align="center"><br><input type='submit' name='SUBMIT' value="$tr{'advproxy chgwebpwd change password'}"></td>
+ <td align="center"><br><input type='submit' name='SUBMIT' value="$Lang::tr{'advproxy chgwebpwd change password'}"></td>
</tr>
</table>
</td>
@@ -180,7 +189,7 @@ if ($errormessage)
<tr>
<td nowrap bgcolor="#FF0000" align="center">
<font face="trebuchet ms, helvetica, sans-serif" color="#FFFFFF" size="2">
- <b>$tr{'advproxy chgwebpwd ERROR'}</b> $errormessage
+ <b>$Lang::tr{'advproxy chgwebpwd ERROR'}</b> $errormessage
</font>
</td>
</tr>
@@ -194,7 +203,7 @@ if ($success)
<tr>
<td nowrap bgcolor="#00C000" align="center">
<font face="trebuchet ms, helvetica, sans-serif" color="#FFFFFF" size="2">
- <b>$tr{'advproxy chgwebpwd SUCCESS'}</b> $tr{'advproxy errmsg change success'}
+ <b>$Lang::tr{'advproxy chgwebpwd SUCCESS'}</b> $Lang::tr{'advproxy errmsg change success'}
</font>
</td>
</tr>
--
2.7.4
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] Added language support for chpasswd.cgi
2017-10-04 13:03 [PATCH] Added language support for chpasswd.cgi Erik Kapfer
@ 2017-10-04 15:51 ` Michael Tremer
2017-10-06 14:13 ` ummeegge
2017-10-06 8:28 ` [PATCH] Deleted unneeded path to $swroot Erik Kapfer
2017-10-06 14:07 ` [PATCH] chpasswd: Use well known 'General::swroot' instead of 'swroot' Erik Kapfer
2 siblings, 1 reply; 5+ messages in thread
From: Michael Tremer @ 2017-10-04 15:51 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 7525 bytes --]
Hi,
good patch.
On Wed, 2017-10-04 at 15:03 +0200, Erik Kapfer wrote:
> ---
> html/cgi-bin/chpasswd.cgi | 57 +++++++++++++++++++++++++++-------------------
> -
> 1 file changed, 33 insertions(+), 24 deletions(-)
>
> diff --git a/html/cgi-bin/chpasswd.cgi b/html/cgi-bin/chpasswd.cgi
> index 0a66062..00494f2 100644
> --- a/html/cgi-bin/chpasswd.cgi
> +++ b/html/cgi-bin/chpasswd.cgi
> @@ -19,15 +19,26 @@
> #
> #
> #############################################################################
> ##
>
> +use strict;
> +
> +#usable only the following on debugging purpose
> +#use warnings;
> +#use CGI::Carp 'fatalsToBrowser';
> +
> use CGI qw(param);
> use Apache::Htpasswd;
> use Crypt::PasswdMD5;
>
> -$swroot = "/var/ipfire";
> -
> my %cgiparams;
> my %mainsettings;
> my %proxysettings;
> +my %netsettings;
> +my %temp;
> +my $swroot;
> +my $errormessage;
> +my $language;
> +
> +$swroot = "/var/ipfire";
You could have dropped the $swroot variable and use $General::swroot like you
did with many other variables.
Would you send an updated patch?
-Michael
>
> $proxysettings{'NCSA_MIN_PASS_LEN'} = 6;
>
> @@ -38,12 +49,10 @@ $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 '/var/ipfire/general-functions.pl';
> +require "${General::swroot}/lang.pl";
> +require "${General::swroot}/header.pl";
>
> my $userdb = "$swroot/proxy/advanced/ncsa/passwd";
>
> @@ -53,26 +62,26 @@ my $success = 0;
>
> &getcgihash(\%cgiparams);
>
> -if ($cgiparams{'SUBMIT'} eq $tr{'advproxy chgwebpwd change password'})
> +if ($cgiparams{'SUBMIT'} eq $Lang::tr{'advproxy chgwebpwd change password'})
> {
> if ($cgiparams{'USERNAME'} eq '')
> {
> - $errormessage = $tr{'advproxy errmsg no username'};
> + $errormessage = $Lang::tr{'advproxy errmsg no username'};
> goto ERROR;
> }
> if (($cgiparams{'OLD_PASSWORD'} eq '') ||
> ($cgiparams{'NEW_PASSWORD_1'} eq '') || ($cgiparams{'NEW_PASSWORD_2'} eq ''))
> {
> - $errormessage = $tr{'advproxy errmsg no password'};
> + $errormessage = $Lang::tr{'advproxy errmsg no password'};
> goto ERROR;
> }
> if (!($cgiparams{'NEW_PASSWORD_1'} eq $cgiparams{'NEW_PASSWORD_2'}))
> {
> - $errormessage = $tr{'advproxy errmsg passwords different'};
> + $errormessage = $Lang::tr{'advproxy errmsg passwords
> different'};
> goto ERROR;
> }
> if (length($cgiparams{'NEW_PASSWORD_1'}) <
> $proxysettings{'NCSA_MIN_PASS_LEN'})
> {
> - $errormessage = $tr{'advproxy errmsg password length
> 1'}.$proxysettings{'NCSA_MIN_PASS_LEN'}.$tr{'advproxy errmsg password length
> 2'};
> + $errormessage = $Lang::tr{'advproxy errmsg password length
> 1'}.$proxysettings{'NCSA_MIN_PASS_LEN'}.$Lang::tr{'advproxy errmsg password
> length 2'};
> goto ERROR;
> }
>
> @@ -81,14 +90,14 @@ if ($cgiparams{'SUBMIT'} eq $tr{'advproxy chgwebpwd change
> password'})
> # Check if a user with this name exists
> my $old_password = $htpasswd->fetchPass($cgiparams{'USERNAME'});
> if (!$old_password) {
> - $errormessage = $tr{'advproxy errmsg invalid user'};
> + $errormessage = $Lang::tr{'advproxy errmsg invalid user'};
> goto ERROR;
> }
>
> # Reset password
> if (!$htpasswd->htpasswd($cgiparams{'USERNAME'},
> $cgiparams{'NEW_PASSWORD_1'},
> $cgiparams{'OLD_PASSWORD'})) {
> - $errormessage = $tr{'advproxy errmsg password incorrect'};
> + $errormessage = $Lang::tr{'advproxy errmsg password
> incorrect'};
> goto ERROR;
> }
>
> @@ -103,7 +112,7 @@ print "Cache-control: no-cache\n";
> print "Connection: close\n";
> print "Content-type: text/html\n\n";
>
> -print <<END
> +print <<END;
> <html>
> <head>
> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
> @@ -124,7 +133,7 @@ print <<END
> <tr>
> <td nowrap bgcolor="#993333" align="center" >
> <font face="trebuchet ms, helvetica, sans-serif"
> color="#FFFFFF" size="4">
> - <b>$tr{'advproxy chgwebpwd change web password'}</b>
> + <b>$Lang::tr{'advproxy chgwebpwd change web
> password'}</b>
> </font>
> </td>
> </tr>
> @@ -134,7 +143,7 @@ print <<END
> <tr>
> <td nowrap bgcolor="#FFFFFF"
> align="left">
> <font face="trebuchet ms, helvetica,
> sans-serif" color="#666666" size="2">
> - <b>$tr{'advproxy chgwebpwd
> username'}:</b>
> + <b>$Lang::tr{'advproxy chgwebpwd
> username'}:</b>
> </font>
> </td>
> <td ><input type="text"
> name="USERNAME" value="$cgiparams{'USERNAME'}" size="30"></td>
> @@ -142,7 +151,7 @@ print <<END
> <tr>
> <td nowrap bgcolor="#FFFFFF"
> align="left">
> <font face="trebuchet ms, helvetica,
> sans-serif" color="#666666" size="2">
> - <b>$tr{'advproxy chgwebpwd old
> password'}:</b>
> + <b>$Lang::tr{'advproxy chgwebpwd old
> password'}:</b>
> </font>
> </td>
> <td><input type="password"
> name="OLD_PASSWORD" value="$cgiparams{'OLD_PASSWORD'}" size="30"></td>
> @@ -150,7 +159,7 @@ print <<END
> <tr>
> <td nowrap bgcolor="#FFFFFF"
> align="left">
> <font face="trebuchet ms, helvetica,
> sans-serif" color="#666666" size="2">
> - <b>$tr{'advproxy chgwebpwd new
> password'}:</b>
> + <b>$Lang::tr{'advproxy chgwebpwd new
> password'}:</b>
> </font>
> </td>
> <td><input type="password"
> name="NEW_PASSWORD_1" value="$cgiparams{'NEW_PASSWORD_1'}" size="30"></td>
> @@ -158,7 +167,7 @@ print <<END
> <tr>
> <td nowrap bgcolor="#FFFFFF"
> align="left">
> <font face="trebuchet ms, helvetica,
> sans-serif" color="#666666" size="2">
> - <b>$tr{'advproxy chgwebpwd new
> password confirm'}:</b>
> + <b>$Lang::tr{'advproxy chgwebpwd new
> password confirm'}:</b>
> </font>
> </td>
> <td><input type="password"
> name="NEW_PASSWORD_2" value="$cgiparams{'NEW_PASSWORD_2'}" size="30"></td>
> @@ -166,7 +175,7 @@ print <<END
> </table>
> <table width="100%" cellspacing="7"
> cellpadding="7">
> <tr>
> - <td align="center"><br><input
> type='submit' name='SUBMIT' value="$tr{'advproxy chgwebpwd change
> password'}"></td>
> + <td align="center"><br><input
> type='submit' name='SUBMIT' value="$Lang::tr{'advproxy chgwebpwd change
> password'}"></td>
> </tr>
> </table>
> </td>
> @@ -180,7 +189,7 @@ if ($errormessage)
> <tr>
> <td nowrap bgcolor="#FF0000" align="center">
> <font face="trebuchet ms, helvetica, sans-serif"
> color="#FFFFFF" size="2">
> - <b>$tr{'advproxy chgwebpwd ERROR'}</b> $errormessage
> + <b>$Lang::tr{'advproxy chgwebpwd ERROR'}</b> $errormessage
> </font>
> </td>
> </tr>
> @@ -194,7 +203,7 @@ if ($success)
> <tr>
> <td nowrap bgcolor="#00C000" align="center">
> <font face="trebuchet ms, helvetica, sans-serif"
> color="#FFFFFF" size="2">
> - <b>$tr{'advproxy chgwebpwd SUCCESS'}</b> $tr{'advproxy errmsg
> change success'}
> + <b>$Lang::tr{'advproxy chgwebpwd SUCCESS'}</b>
> $Lang::tr{'advproxy errmsg change success'}
> </font>
> </td>
> </tr>
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH] Deleted unneeded path to $swroot.
2017-10-04 13:03 [PATCH] Added language support for chpasswd.cgi Erik Kapfer
2017-10-04 15:51 ` Michael Tremer
@ 2017-10-06 8:28 ` Erik Kapfer
2017-10-06 14:07 ` [PATCH] chpasswd: Use well known 'General::swroot' instead of 'swroot' Erik Kapfer
2 siblings, 0 replies; 5+ messages in thread
From: Erik Kapfer @ 2017-10-06 8:28 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 6884 bytes --]
---
html/cgi-bin/chpasswd.cgi | 56 +++++++++++++++++++++++++++--------------------
1 file changed, 32 insertions(+), 24 deletions(-)
diff --git a/html/cgi-bin/chpasswd.cgi b/html/cgi-bin/chpasswd.cgi
index 0a66062..a00f9cb 100644
--- a/html/cgi-bin/chpasswd.cgi
+++ b/html/cgi-bin/chpasswd.cgi
@@ -19,15 +19,24 @@
# #
###############################################################################
+use strict;
+
+#usable only the following on debugging purpose
+#use warnings;
+#use CGI::Carp 'fatalsToBrowser';
+
use CGI qw(param);
use Apache::Htpasswd;
use Crypt::PasswdMD5;
-$swroot = "/var/ipfire";
-
my %cgiparams;
my %mainsettings;
my %proxysettings;
+my %netsettings;
+my %temp;
+my $swroot;
+my $errormessage;
+my $language;
$proxysettings{'NCSA_MIN_PASS_LEN'} = 6;
@@ -38,12 +47,10 @@ $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 '/var/ipfire/general-functions.pl';
+require "${General::swroot}/lang.pl";
+require "${General::swroot}/header.pl";
my $userdb = "$swroot/proxy/advanced/ncsa/passwd";
@@ -53,26 +60,26 @@ my $success = 0;
&getcgihash(\%cgiparams);
-if ($cgiparams{'SUBMIT'} eq $tr{'advproxy chgwebpwd change password'})
+if ($cgiparams{'SUBMIT'} eq $Lang::tr{'advproxy chgwebpwd change password'})
{
if ($cgiparams{'USERNAME'} eq '')
{
- $errormessage = $tr{'advproxy errmsg no username'};
+ $errormessage = $Lang::tr{'advproxy errmsg no username'};
goto ERROR;
}
if (($cgiparams{'OLD_PASSWORD'} eq '') || ($cgiparams{'NEW_PASSWORD_1'} eq '') || ($cgiparams{'NEW_PASSWORD_2'} eq ''))
{
- $errormessage = $tr{'advproxy errmsg no password'};
+ $errormessage = $Lang::tr{'advproxy errmsg no password'};
goto ERROR;
}
if (!($cgiparams{'NEW_PASSWORD_1'} eq $cgiparams{'NEW_PASSWORD_2'}))
{
- $errormessage = $tr{'advproxy errmsg passwords different'};
+ $errormessage = $Lang::tr{'advproxy errmsg passwords different'};
goto ERROR;
}
if (length($cgiparams{'NEW_PASSWORD_1'}) < $proxysettings{'NCSA_MIN_PASS_LEN'})
{
- $errormessage = $tr{'advproxy errmsg password length 1'}.$proxysettings{'NCSA_MIN_PASS_LEN'}.$tr{'advproxy errmsg password length 2'};
+ $errormessage = $Lang::tr{'advproxy errmsg password length 1'}.$proxysettings{'NCSA_MIN_PASS_LEN'}.$Lang::tr{'advproxy errmsg password length 2'};
goto ERROR;
}
@@ -81,14 +88,14 @@ if ($cgiparams{'SUBMIT'} eq $tr{'advproxy chgwebpwd change password'})
# Check if a user with this name exists
my $old_password = $htpasswd->fetchPass($cgiparams{'USERNAME'});
if (!$old_password) {
- $errormessage = $tr{'advproxy errmsg invalid user'};
+ $errormessage = $Lang::tr{'advproxy errmsg invalid user'};
goto ERROR;
}
# Reset password
if (!$htpasswd->htpasswd($cgiparams{'USERNAME'}, $cgiparams{'NEW_PASSWORD_1'},
$cgiparams{'OLD_PASSWORD'})) {
- $errormessage = $tr{'advproxy errmsg password incorrect'};
+ $errormessage = $Lang::tr{'advproxy errmsg password incorrect'};
goto ERROR;
}
@@ -103,7 +110,7 @@ print "Cache-control: no-cache\n";
print "Connection: close\n";
print "Content-type: text/html\n\n";
-print <<END
+print <<END;
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
@@ -124,7 +131,7 @@ print <<END
<tr>
<td nowrap bgcolor="#993333" align="center" >
<font face="trebuchet ms, helvetica, sans-serif" color="#FFFFFF" size="4">
- <b>$tr{'advproxy chgwebpwd change web password'}</b>
+ <b>$Lang::tr{'advproxy chgwebpwd change web password'}</b>
</font>
</td>
</tr>
@@ -134,7 +141,7 @@ print <<END
<tr>
<td nowrap bgcolor="#FFFFFF" align="left">
<font face="trebuchet ms, helvetica, sans-serif" color="#666666" size="2">
- <b>$tr{'advproxy chgwebpwd username'}:</b>
+ <b>$Lang::tr{'advproxy chgwebpwd username'}:</b>
</font>
</td>
<td ><input type="text" name="USERNAME" value="$cgiparams{'USERNAME'}" size="30"></td>
@@ -142,7 +149,7 @@ print <<END
<tr>
<td nowrap bgcolor="#FFFFFF" align="left">
<font face="trebuchet ms, helvetica, sans-serif" color="#666666" size="2">
- <b>$tr{'advproxy chgwebpwd old password'}:</b>
+ <b>$Lang::tr{'advproxy chgwebpwd old password'}:</b>
</font>
</td>
<td><input type="password" name="OLD_PASSWORD" value="$cgiparams{'OLD_PASSWORD'}" size="30"></td>
@@ -150,7 +157,7 @@ print <<END
<tr>
<td nowrap bgcolor="#FFFFFF" align="left">
<font face="trebuchet ms, helvetica, sans-serif" color="#666666" size="2">
- <b>$tr{'advproxy chgwebpwd new password'}:</b>
+ <b>$Lang::tr{'advproxy chgwebpwd new password'}:</b>
</font>
</td>
<td><input type="password" name="NEW_PASSWORD_1" value="$cgiparams{'NEW_PASSWORD_1'}" size="30"></td>
@@ -158,7 +165,7 @@ print <<END
<tr>
<td nowrap bgcolor="#FFFFFF" align="left">
<font face="trebuchet ms, helvetica, sans-serif" color="#666666" size="2">
- <b>$tr{'advproxy chgwebpwd new password confirm'}:</b>
+ <b>$Lang::tr{'advproxy chgwebpwd new password confirm'}:</b>
</font>
</td>
<td><input type="password" name="NEW_PASSWORD_2" value="$cgiparams{'NEW_PASSWORD_2'}" size="30"></td>
@@ -166,7 +173,7 @@ print <<END
</table>
<table width="100%" cellspacing="7" cellpadding="7">
<tr>
- <td align="center"><br><input type='submit' name='SUBMIT' value="$tr{'advproxy chgwebpwd change password'}"></td>
+ <td align="center"><br><input type='submit' name='SUBMIT' value="$Lang::tr{'advproxy chgwebpwd change password'}"></td>
</tr>
</table>
</td>
@@ -180,7 +187,7 @@ if ($errormessage)
<tr>
<td nowrap bgcolor="#FF0000" align="center">
<font face="trebuchet ms, helvetica, sans-serif" color="#FFFFFF" size="2">
- <b>$tr{'advproxy chgwebpwd ERROR'}</b> $errormessage
+ <b>$Lang::tr{'advproxy chgwebpwd ERROR'}</b> $errormessage
</font>
</td>
</tr>
@@ -194,7 +201,7 @@ if ($success)
<tr>
<td nowrap bgcolor="#00C000" align="center">
<font face="trebuchet ms, helvetica, sans-serif" color="#FFFFFF" size="2">
- <b>$tr{'advproxy chgwebpwd SUCCESS'}</b> $tr{'advproxy errmsg change success'}
+ <b>$Lang::tr{'advproxy chgwebpwd SUCCESS'}</b> $Lang::tr{'advproxy errmsg change success'}
</font>
</td>
</tr>
@@ -287,3 +294,4 @@ sub getcgihash
}
# -------------------------------------------------------------------
+
--
2.7.4
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH] chpasswd: Use well known 'General::swroot' instead of 'swroot' .
2017-10-04 13:03 [PATCH] Added language support for chpasswd.cgi Erik Kapfer
2017-10-04 15:51 ` Michael Tremer
2017-10-06 8:28 ` [PATCH] Deleted unneeded path to $swroot Erik Kapfer
@ 2017-10-06 14:07 ` Erik Kapfer
2 siblings, 0 replies; 5+ messages in thread
From: Erik Kapfer @ 2017-10-06 14:07 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 1322 bytes --]
---
html/cgi-bin/chpasswd.cgi | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/html/cgi-bin/chpasswd.cgi b/html/cgi-bin/chpasswd.cgi
index a00f9cb..6aa57d0 100644
--- a/html/cgi-bin/chpasswd.cgi
+++ b/html/cgi-bin/chpasswd.cgi
@@ -34,15 +34,14 @@ my %mainsettings;
my %proxysettings;
my %netsettings;
my %temp;
-my $swroot;
my $errormessage;
my $language;
$proxysettings{'NCSA_MIN_PASS_LEN'} = 6;
### Initialize environment
-&readhash("${swroot}/main/settings", \%mainsettings);
-&readhash("${swroot}/proxy/advanced/settings", \%proxysettings);
+&readhash("${General::swroot}/main/settings", \%mainsettings);
+&readhash("${General::swroot}/proxy/advanced/settings", \%proxysettings);
$language = $mainsettings{'LANGUAGE'};
### Initialize language
@@ -52,9 +51,9 @@ require '/var/ipfire/general-functions.pl';
require "${General::swroot}/lang.pl";
require "${General::swroot}/header.pl";
-my $userdb = "$swroot/proxy/advanced/ncsa/passwd";
+my $userdb = "${General::swroot}/proxy/advanced/ncsa/passwd";
-&readhash("$swroot/ethernet/settings", \%netsettings);
+&readhash("${General::swroot}/ethernet/settings", \%netsettings);
my $success = 0;
@@ -295,3 +294,4 @@ sub getcgihash
# -------------------------------------------------------------------
+
--
2.7.4
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] Added language support for chpasswd.cgi
2017-10-04 15:51 ` Michael Tremer
@ 2017-10-06 14:13 ` ummeegge
0 siblings, 0 replies; 5+ messages in thread
From: ummeegge @ 2017-10-06 14:13 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 399 bytes --]
Hi Michael,
sorry for the two patches, the 'general::swroot' part has been missing by accident :-| . Hope this is OK now.
Greetings,
UE
Am 04.10.2017 um 17:51 schrieb Michael Tremer:
> Hi,
>
> good patch.
>
> You could have dropped the $swroot variable and use $General::swroot like you
> did with many other variables.
>
> Would you send an updated patch?
>
> -Michael
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2017-10-06 14:13 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-10-04 13:03 [PATCH] Added language support for chpasswd.cgi Erik Kapfer
2017-10-04 15:51 ` Michael Tremer
2017-10-06 14:13 ` ummeegge
2017-10-06 8:28 ` [PATCH] Deleted unneeded path to $swroot Erik Kapfer
2017-10-06 14:07 ` [PATCH] chpasswd: Use well known 'General::swroot' instead of 'swroot' Erik Kapfer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox