From mboxrd@z Thu Jan 1 00:00:00 1970 From: Erik Kapfer To: development@lists.ipfire.org Subject: [PATCH] Deleted unneeded path to $swroot. Date: Fri, 06 Oct 2017 10:28:21 +0200 Message-ID: <1507278501-19274-1-git-send-email-erik.kapfer@ipfire.org> In-Reply-To: <1507122180-16347-1-git-send-email-erik.kapfer@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0367042869085821298==" List-Id: --===============0367042869085821298== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable --- 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 @@ # = # ############################################################################= ### =20 +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; =20 -$swroot =3D "/var/ipfire"; - my %cgiparams; my %mainsettings; my %proxysettings; +my %netsettings; +my %temp; +my $swroot; +my $errormessage; +my $language; =20 $proxysettings{'NCSA_MIN_PASS_LEN'} =3D 6; =20 @@ -38,12 +47,10 @@ $language =3D $mainsettings{'LANGUAGE'}; =20 ### Initialize language if ($language =3D~ /^(\w+)$/) {$language =3D $1;} - # - # Uncomment this to force a certain language: - # $language=3D'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"; =20 my $userdb =3D "$swroot/proxy/advanced/ncsa/passwd"; =20 @@ -53,26 +60,26 @@ my $success =3D 0; =20 &getcgihash(\%cgiparams); =20 -if ($cgiparams{'SUBMIT'} eq $tr{'advproxy chgwebpwd change password'}) +if ($cgiparams{'SUBMIT'} eq $Lang::tr{'advproxy chgwebpwd change password'}) { if ($cgiparams{'USERNAME'} eq '') { - $errormessage =3D $tr{'advproxy errmsg no username'}; + $errormessage =3D $Lang::tr{'advproxy errmsg no username'}; goto ERROR; } if (($cgiparams{'OLD_PASSWORD'} eq '') || ($cgiparams{'NEW_PASSWORD_1'} eq = '') || ($cgiparams{'NEW_PASSWORD_2'} eq '')) { - $errormessage =3D $tr{'advproxy errmsg no password'}; + $errormessage =3D $Lang::tr{'advproxy errmsg no password'}; goto ERROR; } if (!($cgiparams{'NEW_PASSWORD_1'} eq $cgiparams{'NEW_PASSWORD_2'})) { - $errormessage =3D $tr{'advproxy errmsg passwords different'}; + $errormessage =3D $Lang::tr{'advproxy errmsg passwords different'}; goto ERROR; } if (length($cgiparams{'NEW_PASSWORD_1'}) < $proxysettings{'NCSA_MIN_PASS_LE= N'}) { - $errormessage =3D $tr{'advproxy errmsg password length 1'}.$proxysettings{= 'NCSA_MIN_PASS_LEN'}.$tr{'advproxy errmsg password length 2'}; + $errormessage =3D $Lang::tr{'advproxy errmsg password length 1'}.$proxyset= tings{'NCSA_MIN_PASS_LEN'}.$Lang::tr{'advproxy errmsg password length 2'}; goto ERROR; } =20 @@ -81,14 +88,14 @@ if ($cgiparams{'SUBMIT'} eq $tr{'advproxy chgwebpwd chang= e password'}) # Check if a user with this name exists my $old_password =3D $htpasswd->fetchPass($cgiparams{'USERNAME'}); if (!$old_password) { - $errormessage =3D $tr{'advproxy errmsg invalid user'}; + $errormessage =3D $Lang::tr{'advproxy errmsg invalid user'}; goto ERROR; } =20 # Reset password if (!$htpasswd->htpasswd($cgiparams{'USERNAME'}, $cgiparams{'NEW_PASSWORD_1= '}, $cgiparams{'OLD_PASSWORD'})) { - $errormessage =3D $tr{'advproxy errmsg password incorrect'}; + $errormessage =3D $Lang::tr{'advproxy errmsg password incorrect'}; goto ERROR; } =20 @@ -103,7 +110,7 @@ print "Cache-control: no-cache\n"; print "Connection: close\n"; print "Content-type: text/html\n\n"; =20 -print < @@ -124,7 +131,7 @@ print < - $tr{'advproxy chgwebpwd change web password'} + $Lang::tr{'advproxy chgwebpwd change web password'} @@ -134,7 +141,7 @@ print < - $tr{'advproxy chgwebpwd username'}: + $Lang::tr{'advproxy chgwebpwd username'}: @@ -142,7 +149,7 @@ print < - $tr{'advproxy chgwebpwd old password'}: + $Lang::tr{'advproxy chgwebpwd old password'}: @@ -150,7 +157,7 @@ print < - $tr{'advproxy chgwebpwd new password'}: + $Lang::tr{'advproxy chgwebpwd new password'}: @@ -158,7 +165,7 @@ print < - $tr{'advproxy chgwebpwd new password confirm'}: + $Lang::tr{'advproxy chgwebpwd new password confirm'}: @@ -166,7 +173,7 @@ print < - +


@@ -180,7 +187,7 @@ if ($errormessage) - $tr{'advproxy chgwebpwd ERROR'} $errormessage + $Lang::tr{'advproxy chgwebpwd ERROR'} $errormessage @@ -194,7 +201,7 @@ if ($success) - $tr{'advproxy chgwebpwd SUCCESS'} $tr{'advproxy errmsg change succe= ss'} + $Lang::tr{'advproxy chgwebpwd SUCCESS'} $Lang::tr{'advproxy errmsg = change success'} @@ -287,3 +294,4 @@ sub getcgihash } =20 # ------------------------------------------------------------------- + --=20 2.7.4 --===============0367042869085821298==--