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 < +print < > > > @@ -124,7 +133,7 @@ print < > > color="#FFFFFF" size="4"> > - $tr{'advproxy chgwebpwd change web password'} > + $Lang::tr{'advproxy chgwebpwd change web > password'} > > > > @@ -134,7 +143,7 @@ print < > align="left"> > > - $tr{'advproxy chgwebpwd > username'}: > + $Lang::tr{'advproxy chgwebpwd > username'}: > > > name="USERNAME" value="$cgiparams{'USERNAME'}" size="30"> > @@ -142,7 +151,7 @@ print < > align="left"> > > - $tr{'advproxy chgwebpwd old > password'}: > + $Lang::tr{'advproxy chgwebpwd old > password'}: > > > name="OLD_PASSWORD" value="$cgiparams{'OLD_PASSWORD'}" size="30"> > @@ -150,7 +159,7 @@ print < > align="left"> > > - $tr{'advproxy chgwebpwd new > password'}: > + $Lang::tr{'advproxy chgwebpwd new > password'}: > > > name="NEW_PASSWORD_1" value="$cgiparams{'NEW_PASSWORD_1'}" size="30"> > @@ -158,7 +167,7 @@ print < > align="left"> > > - $tr{'advproxy chgwebpwd new > password confirm'}: > + $Lang::tr{'advproxy chgwebpwd new > password confirm'}: > > > name="NEW_PASSWORD_2" value="$cgiparams{'NEW_PASSWORD_2'}" size="30"> > @@ -166,7 +175,7 @@ print < > cellpadding="7"> > > - > + > >

type='submit' name='SUBMIT' value="$tr{'advproxy chgwebpwd change > password'}">

type='submit' name='SUBMIT' value="$Lang::tr{'advproxy chgwebpwd change > password'}">

> > @@ -180,7 +189,7 @@ if ($errormessage) > > > color="#FFFFFF" size="2"> > - $tr{'advproxy chgwebpwd ERROR'} $errormessage > + $Lang::tr{'advproxy chgwebpwd ERROR'} $errormessage > > > > @@ -194,7 +203,7 @@ if ($success) > > > color="#FFFFFF" size="2"> > - $tr{'advproxy chgwebpwd SUCCESS'} $tr{'advproxy errmsg > change success'} > + $Lang::tr{'advproxy chgwebpwd SUCCESS'} > $Lang::tr{'advproxy errmsg change success'} > > >