new i18n api requiring $session
This commit is contained in:
Colin Kuskie
parent
877bf082a0
commit
01d95a265e
141 changed files with 2266 additions and 1745 deletions
|
|
@ -42,15 +42,16 @@ sub _isValidPassword {
|
|||
WebGUI::Macro::negate(\$confirm);
|
||||
my $error = "";
|
||||
|
||||
my $i18n = WebGUI::International->new($self->session,'AuthWebGUI');
|
||||
if ($password ne $confirm) {
|
||||
$error .= '<li>'.WebGUI::International::get(3,'AuthWebGUI').'</li>';
|
||||
$error .= '<li>'.$i18n->get(3).'</li>';
|
||||
}
|
||||
if ($password eq "") {
|
||||
$error .= '<li>'.WebGUI::International::get(4,'AuthWebGUI').'</li>';
|
||||
$error .= '<li>'.$i18n->get(4).'</li>';
|
||||
}
|
||||
|
||||
if ($self->getSetting("passwordLength") && length($password) < $self->getSetting("passwordLength")){
|
||||
$error .= '<li>'.WebGUI::International::get(7,'AuthWebGUI')." ".$self->getSetting("passwordLength").'</li>';
|
||||
$error .= '<li>'.$i18n->get(7)." ".$self->getSetting("passwordLength").'</li>';
|
||||
}
|
||||
|
||||
$self->error($error);
|
||||
|
|
@ -81,14 +82,15 @@ sub addUserForm {
|
|||
my $self = shift;
|
||||
my $userData = $self->getParams;
|
||||
my $f = WebGUI::HTMLForm->new($self->session);
|
||||
my $i18n = WebGUI::International->new($self->session);
|
||||
$f->password(
|
||||
name=>"authWebGUI.identifier",
|
||||
label=>WebGUI::International::get(51),
|
||||
label=>$i18n->get(51),
|
||||
value=>"password"
|
||||
);
|
||||
$f->interval(
|
||||
-name=>"authWebGUI.passwordTimeout",
|
||||
-label=>WebGUI::International::get(16,'AuthWebGUI'),
|
||||
-label=>$i18n->get(16,'AuthWebGUI'),
|
||||
-value=>$userData->{passwordTimeout},
|
||||
-defaultValue=>$self->session->setting->get("webguiPasswordTimeout")
|
||||
);
|
||||
|
|
@ -99,7 +101,7 @@ sub addUserForm {
|
|||
$f->yesNo(
|
||||
-name=>"authWebGUI.changeUsername",
|
||||
-value=>$userChange,
|
||||
-label=>WebGUI::International::get(21,'AuthWebGUI')
|
||||
-label=>$i18n->get(21,'AuthWebGUI')
|
||||
);
|
||||
my $passwordChange = $self->session->setting->get("webguiChangePassword");
|
||||
if($passwordChange || $passwordChange eq "0"){
|
||||
|
|
@ -108,7 +110,7 @@ sub addUserForm {
|
|||
$f->yesNo(
|
||||
-name=>"authWebGUI.changePassword",
|
||||
-value=>$passwordChange,
|
||||
-label=>WebGUI::International::get(20,'AuthWebGUI')
|
||||
-label=>$i18n->get(20,'AuthWebGUI')
|
||||
);
|
||||
return $f->printRowsOnly;
|
||||
}
|
||||
|
|
@ -164,6 +166,7 @@ sub createAccount {
|
|||
} elsif (!$self->session->setting->get("anonymousRegistration")) {
|
||||
return $self->displayLogin;
|
||||
}
|
||||
my $i18n = WebGUI::International->new($self->session);
|
||||
$vars->{'create.message'} = $_[0] if ($_[0]);
|
||||
my $storage = WebGUI::Storage::Image->createTemp;
|
||||
my ($filename, $challenge) = $storage->addFileFromCaptcha;
|
||||
|
|
@ -172,18 +175,18 @@ sub createAccount {
|
|||
$vars->{'create.form.captcha'} = WebGUI::Form::text($self->session,{"name"=>"authWebGUI.captcha", size=>6, maxlength=>6})
|
||||
.WebGUI::Form::hidden($self->session,{name=>"authWebGUI.captcha.validation", value=>Digest::MD5::md5_base64(lc($challenge))})
|
||||
.'<img src="'.$storage->getUrl($filename).'" border="0" alt="captcha" align="middle" />';
|
||||
$vars->{'create.form.captcha.label'} = WebGUI::International::get("captcha label","AuthWebGUI");
|
||||
$vars->{'create.form.captcha.label'} = $i18n->get("captcha label","AuthWebGUI");
|
||||
}
|
||||
$vars->{'create.form.username'} = WebGUI::Form::text($self->session,{"name"=>"authWebGUI.username","value"=>$self->session->form->process(""authWebGUI.username"}"));
|
||||
$vars->{'create.form.username.label'} = WebGUI::International::get(50);
|
||||
$vars->{'create.form.username.label'} = $i18n->get(50);
|
||||
$vars->{'create.form.password'} = WebGUI::Form::password($self->session,{"name"=>"authWebGUI.identifier"});
|
||||
$vars->{'create.form.password.label'} = WebGUI::International::get(51);
|
||||
$vars->{'create.form.password.label'} = $i18n->get(51);
|
||||
$vars->{'create.form.passwordConfirm'} = WebGUI::Form::password($self->session,{"name"=>"authWebGUI.identifierConfirm"});
|
||||
$vars->{'create.form.passwordConfirm.label'} = WebGUI::International::get(2,'AuthWebGUI');
|
||||
$vars->{'create.form.passwordConfirm.label'} = $i18n->get(2,'AuthWebGUI');
|
||||
$vars->{'create.form.hidden'} = WebGUI::Form::hidden($self->session,{"name"=>"confirm","value"=>$self->session->form->process("confirm")});
|
||||
$vars->{'recoverPassword.isAllowed'} = $self->getSetting("passwordRecovery");
|
||||
$vars->{'recoverPassword.url'} = $self->session->url->page('op=auth;method=recoverPassword');
|
||||
$vars->{'recoverPassword.label'} = WebGUI::International::get(59);
|
||||
$vars->{'recoverPassword.label'} = $i18n->get(59);
|
||||
return $self->SUPER::createAccount("createAccountSave",$vars);
|
||||
}
|
||||
|
||||
|
|
@ -198,10 +201,11 @@ sub createAccountSave {
|
|||
my $passConfirm = $self->session->form->get('authWebGUI.identifierConfirm');
|
||||
|
||||
my $error;
|
||||
my $i18n = WebGUI::International->new($self->session);
|
||||
$error = $self->error unless($self->validUsername($username));
|
||||
if ($self->session->setting->get("webguiUseCaptcha")) {
|
||||
unless ($self->session->form->get('authWebGUI.captcha.validation') eq Digest::MD5::md5_base64(lc($self->session->form->get('authWebGUI.captcha')))) {
|
||||
$error .= WebGUI::International::get("captcha failure","AuthWebGUI");
|
||||
$error .= $i18n->get("captcha failure","AuthWebGUI");
|
||||
}
|
||||
}
|
||||
$error .= $self->error unless($self->_isValidPassword($password,$passConfirm));
|
||||
|
|
@ -213,7 +217,7 @@ sub createAccountSave {
|
|||
#If Email address is not unique, a warning is displayed
|
||||
if($warning ne "" && !$self->session->form->process("confirm")){
|
||||
$self->session->form->process("confirm") = 1;
|
||||
return $self->createAccount('<li>'.WebGUI::International::get(1078).'</li>');
|
||||
return $self->createAccount('<li>'.$i18n->get(1078).'</li>');
|
||||
}
|
||||
|
||||
my $properties;
|
||||
|
|
@ -229,8 +233,8 @@ sub createAccountSave {
|
|||
$self->saveParams($self->userId,"WebGUI",{emailValidationKey=>$key});
|
||||
WebGUI::Mail::send(
|
||||
$profile->{email},
|
||||
WebGUI::International::get('email address validation email subject','AuthWebGUI'),
|
||||
WebGUI::International::get('email address validation email body','AuthWebGUI')."\n\n".$self->session->url->getSiteURL().$self->session->url->page("op=auth;method=validateEmail;key=".$key),
|
||||
$i18n->get('email address validation email subject','AuthWebGUI'),
|
||||
$i18n->get('email address validation email body','AuthWebGUI')."\n\n".$self->session->url->getSiteURL().$self->session->url->page("op=auth;method=validateEmail;key=".$key),
|
||||
);
|
||||
$self->user->status("Deactivated");
|
||||
$self->session->var->end($self->session->var->get("sessionId"));
|
||||
|
|
@ -238,7 +242,7 @@ sub createAccountSave {
|
|||
my $u = WebGUI::User->new($self->session,1);
|
||||
$self->{user} = $u;
|
||||
$self->logout;
|
||||
return $self->displayLogin(WebGUI::International::get('check email for validation','AuthWebGUI'));
|
||||
return $self->displayLogin($i18n->get('check email for validation','AuthWebGUI'));
|
||||
}
|
||||
return "";
|
||||
}
|
||||
|
|
@ -262,22 +266,23 @@ sub displayAccount {
|
|||
my $self = shift;
|
||||
my $vars;
|
||||
return $self->displayLogin($_[0]) if ($self->userId eq '1');
|
||||
my $i18n = WebGUI::International->new($self->session);
|
||||
my $userData = $self->getParams;
|
||||
$vars->{'account.message'} = $_[0] if ($_[0]);
|
||||
$vars->{'account.noform'} = 1;
|
||||
if($userData->{changeUsername} || (!defined $userData->{changeUsername} && $self->session->setting->get("webguiChangeUsername"))){
|
||||
$vars->{'account.form.username'} = WebGUI::Form::text($self->session,{"name"=>"authWebGUI.username","value"=>$self->username});
|
||||
$vars->{'account.form.username.label'} = WebGUI::International::get(50);
|
||||
$vars->{'account.form.username.label'} = $i18n->get(50);
|
||||
$vars->{'account.noform'} = 0;
|
||||
}
|
||||
if($userData->{changePassword} || (!defined $userData->{changePassword} && $self->session->setting->get("webguiChangePassword"))){
|
||||
$vars->{'account.form.password'} = WebGUI::Form::password($self->session,{"name"=>"authWebGUI.identifier","value"=>"password"});
|
||||
$vars->{'account.form.password.label'} = WebGUI::International::get(51);
|
||||
$vars->{'account.form.password.label'} = $i18n->get(51);
|
||||
$vars->{'account.form.passwordConfirm'} = WebGUI::Form::password($self->session,{"name"=>"authWebGUI.identifierConfirm","value"=>"password"});
|
||||
$vars->{'account.form.passwordConfirm.label'} = WebGUI::International::get(2,'AuthWebGUI');
|
||||
$vars->{'account.form.passwordConfirm.label'} = $i18n->get(2,'AuthWebGUI');
|
||||
$vars->{'account.noform'} = 0;
|
||||
}
|
||||
$vars->{'account.nofields'} = WebGUI::International::get(22,'AuthWebGUI');
|
||||
$vars->{'account.nofields'} = $i18n->get(22,'AuthWebGUI');
|
||||
return $self->SUPER::displayAccount("updateAccount",$vars);
|
||||
}
|
||||
|
||||
|
|
@ -293,10 +298,11 @@ sub displayLogin {
|
|||
my $self = shift;
|
||||
my $vars;
|
||||
return $self->displayAccount($_[0]) if ($self->userId ne "1");
|
||||
my $i18n = WebGUI::International->new($self->session);
|
||||
$vars->{'login.message'} = $_[0] if ($_[0]);
|
||||
$vars->{'recoverPassword.isAllowed'} = $self->getSetting("passwordRecovery");
|
||||
$vars->{'recoverPassword.url'} = $self->session->url->page('op=auth;method=recoverPassword');
|
||||
$vars->{'recoverPassword.label'} = WebGUI::International::get(59);
|
||||
$vars->{'recoverPassword.label'} = $i18n->get(59);
|
||||
return $self->SUPER::displayLogin("login",$vars);
|
||||
}
|
||||
|
||||
|
|
@ -348,93 +354,94 @@ sub editUserFormSave {
|
|||
|
||||
sub editUserSettingsForm {
|
||||
my $self = shift;
|
||||
my $i18n = WebGUI::International->new($self->session,'AuthWebGUI');
|
||||
my $f = WebGUI::HTMLForm->new($self->session);
|
||||
$f->text(
|
||||
-name=>"webguiPasswordLength",
|
||||
-value=>$self->session->setting->get("webguiPasswordLength"),
|
||||
-label=>WebGUI::International::get(15,'AuthWebGUI'),
|
||||
-label=>$i18n->get(15),
|
||||
-size=>5,
|
||||
-maxLength=>5,
|
||||
);
|
||||
$f->interval(
|
||||
-name=>"webguiPasswordTimeout",
|
||||
-label=>WebGUI::International::get(16,'AuthWebGUI'),
|
||||
-label=>$i18n->get(16),
|
||||
-value=>$self->session->setting->get("webguiPasswordTimeout")
|
||||
);
|
||||
$f->yesNo(
|
||||
-name=>"webguiExpirePasswordOnCreation",
|
||||
-value=>$self->session->setting->get("webguiExpirePasswordOnCreation"),
|
||||
-label=>WebGUI::International::get(9,'AuthWebGUI')
|
||||
-label=>$i18n->get(9)
|
||||
);
|
||||
$f->yesNo(
|
||||
-name=>"webguiSendWelcomeMessage",
|
||||
-value=>$self->session->setting->get("webguiSendWelcomeMessage"),
|
||||
-label=>WebGUI::International::get(868)
|
||||
-label=>$i18n->get(868,'WebGUI')
|
||||
);
|
||||
$f->textarea(
|
||||
-name=>"webguiWelcomeMessage",
|
||||
-value=>$self->session->setting->get("webguiWelcomeMessage"),
|
||||
-label=>WebGUI::International::get(869)
|
||||
-label=>$i18n->get(869,'WebGUI')
|
||||
);
|
||||
$f->yesNo(
|
||||
-name=>"webguiChangeUsername",
|
||||
-value=>$self->session->setting->get("webguiChangeUsername"),
|
||||
-label=>WebGUI::International::get(19,'AuthWebGUI')
|
||||
-label=>$i18n->get(19)
|
||||
);
|
||||
$f->yesNo(
|
||||
-name=>"webguiChangePassword",
|
||||
-value=>$self->session->setting->get("webguiChangePassword"),
|
||||
-label=>WebGUI::International::get(18,'AuthWebGUI')
|
||||
-label=>$i18n->get(18)
|
||||
);
|
||||
$f->yesNo(
|
||||
-name=>"webguiPasswordRecovery",
|
||||
-value=>$self->session->setting->get("webguiPasswordRecovery"),
|
||||
-label=>WebGUI::International::get(6,'AuthWebGUI')
|
||||
-label=>$i18n->get(6)
|
||||
);
|
||||
$f->textarea(
|
||||
-name=>"webguiRecoverPasswordEmail",
|
||||
-label=>WebGUI::International::get(134),
|
||||
-label=>$i18n->get(134, 'WebGUI'),
|
||||
-value=>$self->session->setting->get("webguiRecoverPasswordEmail")
|
||||
);
|
||||
$f->yesNo(
|
||||
-name=>"webguiValidateEmail",
|
||||
-value=>$self->session->setting->get("webguiValidateEmail"),
|
||||
-label=>WebGUI::International::get('validate email','AuthWebGUI')
|
||||
-label=>$i18n->get('validate email')
|
||||
);
|
||||
$f->yesNo(
|
||||
-name=>"webguiUseCaptcha",
|
||||
-value=>$self->session->setting->get("webguiUseCaptcha"),
|
||||
-label=>WebGUI::International::get('use captcha','AuthWebGUI')
|
||||
-label=>$i18n->get('use captcha')
|
||||
);
|
||||
$f->template(
|
||||
-name=>"webguiAccountTemplate",
|
||||
-value=>$self->session->setting->get("webguiAccountTemplate"),
|
||||
-namespace=>"Auth/WebGUI/Account",
|
||||
-label=>WebGUI::International::get("account template","AuthWebGUI")
|
||||
-label=>$i18n->get("account template")
|
||||
);
|
||||
$f->template(
|
||||
-name=>"webguiCreateAccountTemplate",
|
||||
-value=>$self->session->setting->get("webguiCreateAccountTemplate"),
|
||||
-namespace=>"Auth/WebGUI/Create",
|
||||
-label=>WebGUI::International::get("create account template","AuthWebGUI")
|
||||
-label=>$i18n->get("create account template")
|
||||
);
|
||||
$f->template(
|
||||
-name=>"webguiExpiredPasswordTemplate",
|
||||
-value=>$self->session->setting->get("webguiExpiredPasswordTemplate"),
|
||||
-namespace=>"Auth/WebGUI/Expired",
|
||||
-label=>WebGUI::International::get("expired password template","AuthWebGUI")
|
||||
-label=>$i18n->get("expired password template")
|
||||
);
|
||||
$f->template(
|
||||
-name=>"webguiLoginTemplate",
|
||||
-value=>$self->session->setting->get("webguiLoginTemplate"),
|
||||
-namespace=>"Auth/WebGUI/Login",
|
||||
-label=>WebGUI::International::get("login template","AuthWebGUI")
|
||||
-label=>$i18n->get("login template")
|
||||
);
|
||||
$f->template(
|
||||
-name=>"webguiPasswordRecoveryTemplate",
|
||||
-value=>$self->session->setting->get("webguiPasswordRecoveryTemplate"),
|
||||
-namespace=>"Auth/WebGUI/Recovery",
|
||||
-label=>WebGUI::International::get("password recovery template","AuthWebGUI")
|
||||
-label=>$i18n->get("password recovery template")
|
||||
);
|
||||
return $f->printRowsOnly;
|
||||
}
|
||||
|
|
@ -471,7 +478,8 @@ sub login {
|
|||
if(!$self->authenticate($self->session->form->process("username"),$self->session->form->process("identifier"))){
|
||||
$self->session->http->setStatus("401","Incorrect Credentials");
|
||||
$self->session->errorHandler->security("login to account ".$self->session->form->process("username")." with invalid information.");
|
||||
return $self->displayLogin("<h1>".WebGUI::International::get(70)."</h1>".$self->error);
|
||||
my $i18n = WebGUI::International->new($self->session);
|
||||
return $self->displayLogin("<h1>".$i18n->get(70)."</h1>".$self->error);
|
||||
}
|
||||
|
||||
my $userData = $self->getParams;
|
||||
|
|
@ -504,7 +512,8 @@ sub recoverPassword {
|
|||
return $self->displayLogin if($self->userId ne "1");
|
||||
my $template = 'Auth/WebGUI/Recovery';
|
||||
my $vars;
|
||||
$vars->{title} = WebGUI::International::get(71);
|
||||
my $i18n = WebGUI::International->new($self->session);
|
||||
$vars->{title} = $i18n->get(71);
|
||||
$vars->{'recover.form.header'} = "\n\n".WebGUI::Form::formHeader($self->session,{});
|
||||
$vars->{'recover.form.hidden'} = WebGUI::Form::hidden($self->session,{"name"=>"op","value"=>"auth"});
|
||||
$vars->{'recover.form.hidden'} .= WebGUI::Form::hidden($self->session,{"name"=>"method","value"=>"recoverPasswordFinish"});
|
||||
|
|
@ -512,21 +521,22 @@ sub recoverPassword {
|
|||
$vars->{'recover.form.submit'} = WebGUI::Form::submit($self->session,{});
|
||||
$vars->{'recover.form.footer'} = WebGUI::Form::formFooter($self->session,);
|
||||
$vars->{'login.url'} = $self->session->url->page('op=auth;method=init');
|
||||
$vars->{'login.label'} = WebGUI::International::get(58);
|
||||
$vars->{'login.label'} = $i18n->get(58);
|
||||
|
||||
$vars->{'anonymousRegistration.isAllowed'} = ($self->session->setting->get("anonymousRegistration"));
|
||||
$vars->{'createAccount.url'} = $self->session->url->page('op=auth=;method=createAccount');
|
||||
$vars->{'createAccount.label'} = WebGUI::International::get(67);
|
||||
$vars->{'createAccount.label'} = $i18n->get(67);
|
||||
$vars->{'recover.message'} = $_[0] if ($_[0]);
|
||||
$vars->{'recover.form.email'} = WebGUI::Form::text($self->session,{"name"=>"email"});
|
||||
$vars->{'recover.form.email.label'} = WebGUI::International::get(56);
|
||||
$vars->{'recover.form.email.label'} = $i18n->get(56);
|
||||
return WebGUI::Asset::Template->new($self->session,$self->getPasswordRecoveryTemplateId)->process($vars);
|
||||
}
|
||||
|
||||
#-------------------------------------------------------------------
|
||||
sub recoverPasswordFinish {
|
||||
my $self = shift;
|
||||
return $self->recoverPassword('<ul><li>'.WebGUI::International::get(743).'</li></ul>') if ($self->session->form->process("email") eq "");
|
||||
my $i18n = WebGUI::International->new($self->session);
|
||||
return $self->recoverPassword('<ul><li>'.$i18n->get(743).'</li></ul>') if ($self->session->form->process("email") eq "");
|
||||
return $self->displayLogin unless ($self->session->setting->get("webguiPasswordRecovery"));
|
||||
|
||||
my($sth,$username,$userId,$password,$flag,$message,$output,$encryptedPassword,$authMethod);
|
||||
|
|
@ -544,15 +554,15 @@ sub recoverPasswordFinish {
|
|||
_logSecurityMessage();
|
||||
$self->session->errorHandler->security("recover a password. Password emailed to: ".$self->session->form->process("email"));
|
||||
$message = $self->session->setting->get("webguiRecoverPasswordEmail");
|
||||
$message .= "\n".WebGUI::International::get(50).": ".$username."\n";
|
||||
$message .= WebGUI::International::get(51).": ".$password."\n";
|
||||
WebGUI::Mail::send($self->session->form->process("email"),WebGUI::International::get(74),$message);
|
||||
$message .= "\n".$i18n->get(50).": ".$username."\n";
|
||||
$message .= $i18n->get(51).": ".$password."\n";
|
||||
WebGUI::Mail::send($self->session->form->process("email"),$i18n->get(74),$message);
|
||||
$flag++;
|
||||
}
|
||||
$sth->finish();
|
||||
|
||||
return $self->displayLogin('<ul><li>'.WebGUI::International::get(75).'</li></ul>') if($flag);
|
||||
return $self->recoverPassword('<ul><li>'.WebGUI::International::get(76).'</li></ul>');
|
||||
return $self->displayLogin('<ul><li>'.$i18n->get(75).'</li></ul>') if($flag);
|
||||
return $self->recoverPassword('<ul><li>'.$i18n->get(76).'</li></ul>');
|
||||
}
|
||||
|
||||
#-------------------------------------------------------------------
|
||||
|
|
@ -560,7 +570,8 @@ sub resetExpiredPassword {
|
|||
my $self = shift;
|
||||
my $vars;
|
||||
|
||||
$vars->{displayTitle} = '<h3>'.WebGUI::International::get(8,'AuthWebGUI').'</h3>';
|
||||
my $i18n = WebGUI::International->new($self->session);
|
||||
$vars->{displayTitle} = '<h3>'.$i18n->get(8,'AuthWebGUI').'</h3>';
|
||||
$vars->{'expired.message'} = $_[0] if($_[0]);
|
||||
$vars->{'expired.form.header'} = "\n\n".WebGUI::Form::formHeader($self->session,{});
|
||||
$vars->{'expired.form.hidden'} = WebGUI::Form::hidden($self->session,{"name"=>"op","value"=>"auth"});
|
||||
|
|
@ -568,11 +579,11 @@ sub resetExpiredPassword {
|
|||
$vars->{'expired.form.hidden'} .= WebGUI::Form::hidden($self->session,{"name"=>"uid","value"=>$self->session->form->process("uid")});
|
||||
|
||||
$vars->{'expired.form.oldPassword'} = WebGUI::Form::password($self->session,{"name"=>"oldPassword"});
|
||||
$vars->{'expired.form.oldPassword.label'} = WebGUI::International::get(10,'AuthWebGUI');
|
||||
$vars->{'expired.form.oldPassword.label'} = $i18n->get(10,'AuthWebGUI');
|
||||
$vars->{'expired.form.password'} = WebGUI::Form::password($self->session,{"name"=>"identifier"});
|
||||
$vars->{'expired.form.password.label'} = WebGUI::International::get(11,'AuthWebGUI');
|
||||
$vars->{'expired.form.password.label'} = $i18n->get(11,'AuthWebGUI');
|
||||
$vars->{'expired.form.passwordConfirm'} = WebGUI::Form::password($self->session,{"name"=>"identifierConfirm"});
|
||||
$vars->{'expired.form.passwordConfirm.label'} = WebGUI::International::get(2,'AuthWebGUI');
|
||||
$vars->{'expired.form.passwordConfirm.label'} = $i18n->get(2,'AuthWebGUI');
|
||||
$vars->{'expired.form.submit'} = WebGUI::Form::submit($self->session,{});
|
||||
$vars->{'expired.form.footer'} = WebGUI::Form::formFooter($self->session,);
|
||||
|
||||
|
|
@ -585,14 +596,15 @@ sub resetExpiredPasswordSave {
|
|||
my ($error,$u,$properties,$msg);
|
||||
|
||||
$u = WebGUI::User->new($self->session,$self->session->form->process("uid"));
|
||||
my $i18n = WebGUI::International->new($self->session);
|
||||
$self->session->form->process("username") = $u->username;
|
||||
|
||||
$error .= $self->error if(!$self->authenticate($u->username,$self->session->form->process("oldPassword")));
|
||||
$error .= '<li>'.WebGUI::International::get(5,'AuthWebGUI').'</li>' if($self->session->form->process("identifier") eq "password");
|
||||
$error .= '<li>'.WebGUI::International::get(12,'AuthWebGUI').'</li>' if ($self->session->form->process("oldPassword") eq $self->session->form->process("identifier"));
|
||||
$error .= '<li>'.$i18n->get(5,'AuthWebGUI').'</li>' if($self->session->form->process("identifier") eq "password");
|
||||
$error .= '<li>'.$i18n->get(12,'AuthWebGUI').'</li>' if ($self->session->form->process("oldPassword") eq $self->session->form->process("identifier"));
|
||||
$error .= $self->error if(!$self->_isValidPassword($self->session->form->process("identifier"),$self->session->form->process("identifierConfirm")));
|
||||
|
||||
return $self->resetExpiredPassword("<h1>".WebGUI::International::get(70)."</h1>".$error) if($error ne "");
|
||||
return $self->resetExpiredPassword("<h1>".$i18n->get(70)."</h1>".$error) if($error ne "");
|
||||
|
||||
$properties->{identifier} = Digest::MD5::md5_base64($self->session->form->process("identifier"));
|
||||
$properties->{passwordLastUpdated} =$self->session->datetime->time();
|
||||
|
|
@ -602,7 +614,7 @@ sub resetExpiredPasswordSave {
|
|||
|
||||
$msg = $self->login;
|
||||
if($msg eq ""){
|
||||
$msg = "<li>".WebGUI::International::get(17,'AuthWebGUI').'</li>';
|
||||
$msg = "<li>".$i18n->get(17,'AuthWebGUI').'</li>';
|
||||
}
|
||||
return $self->displayLogin($msg);
|
||||
}
|
||||
|
|
@ -630,10 +642,11 @@ sub validateEmail {
|
|||
sub updateAccount {
|
||||
my $self = shift;
|
||||
|
||||
my $i18n = WebGUI::International->new($self->session);
|
||||
my $username = $self->session->form->get('authWebGUI.username');
|
||||
my $password = $self->session->form->get('authWebGUI.identifier');
|
||||
my $passConfirm = $self->session->form->get('authWebGUI.identifierConfirm');
|
||||
my $display = '<li>'.WebGUI::International::get(81).'</li>';
|
||||
my $display = '<li>'.$i18n->get(81).'</li>';
|
||||
my $error = "";
|
||||
|
||||
if($self->userId eq '1'){
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue