fix [ 1216810 ] anonymous registration errors persist

This commit is contained in:
JT Smith 2005-10-17 13:59:50 +00:00
parent 7b5b5b0fac
commit 0815c61d9b
3 changed files with 7 additions and 10 deletions

View file

@ -40,6 +40,7 @@
- fix [ 1216810 ] anonymous registration errors persist - fix [ 1216810 ] anonymous registration errors persist
- fix [ 1327237 ] 6.7.5 Shortcuts - fix [ 1327237 ] 6.7.5 Shortcuts
- fix [ 1328105 ] Pages should contain "no-cache" tags - fix [ 1328105 ] Pages should contain "no-cache" tags
- fix [ 1216810 ] anonymous registration errors persist
6.7.6 6.7.6

View file

@ -177,9 +177,9 @@ sub createAccount {
} }
$vars->{'create.form.username'} = WebGUI::Form::text({"name"=>"authWebGUI.username","value"=>$session{form}{"authWebGUI.username"}}); $vars->{'create.form.username'} = WebGUI::Form::text({"name"=>"authWebGUI.username","value"=>$session{form}{"authWebGUI.username"}});
$vars->{'create.form.username.label'} = WebGUI::International::get(50); $vars->{'create.form.username.label'} = WebGUI::International::get(50);
$vars->{'create.form.password'} = WebGUI::Form::password({"name"=>"authWebGUI.identifier","value"=>$session{form}{"authWebGUI.identifier"}}); $vars->{'create.form.password'} = WebGUI::Form::password({"name"=>"authWebGUI.identifier"});
$vars->{'create.form.password.label'} = WebGUI::International::get(51); $vars->{'create.form.password.label'} = WebGUI::International::get(51);
$vars->{'create.form.passwordConfirm'} = WebGUI::Form::password({"name"=>"authWebGUI.identifierConfirm","value"=>$session{form}{"authWebGUI.identifierConfirm"}}); $vars->{'create.form.passwordConfirm'} = WebGUI::Form::password({"name"=>"authWebGUI.identifierConfirm"});
$vars->{'create.form.passwordConfirm.label'} = WebGUI::International::get(2,'AuthWebGUI'); $vars->{'create.form.passwordConfirm.label'} = WebGUI::International::get(2,'AuthWebGUI');
$vars->{'create.form.hidden'} = WebGUI::Form::hidden({"name"=>"confirm","value"=>$session{form}{confirm}}); $vars->{'create.form.hidden'} = WebGUI::Form::hidden({"name"=>"confirm","value"=>$session{form}{confirm}});
$vars->{'recoverPassword.isAllowed'} = $self->getSetting("passwordRecovery"); $vars->{'recoverPassword.isAllowed'} = $self->getSetting("passwordRecovery");
@ -199,14 +199,14 @@ sub createAccountSave {
my $passConfirm = $session{form}{'authWebGUI.identifierConfirm'}; my $passConfirm = $session{form}{'authWebGUI.identifierConfirm'};
my $error = $self->error if(!$self->validUsername($username)); my $error = $self->error if(!$self->validUsername($username));
$error.= $self->error if(!$self->_isValidPassword($password,$passConfirm));
my ($profile, $temp, $warning) = WebGUI::Operation::Profile::validateProfileData();
$error .= $temp;
if ($session{setting}{webguiUseCaptcha}) { if ($session{setting}{webguiUseCaptcha}) {
unless ($session{form}{'authWebGUI.captcha.validation'} eq Digest::MD5::md5_base64(lc($session{form}{'authWebGUI.captcha'}))) { unless ($session{form}{'authWebGUI.captcha.validation'} eq Digest::MD5::md5_base64(lc($session{form}{'authWebGUI.captcha'}))) {
$error .= WebGUI::International::get("captcha failure","AuthWebGUI"); $error .= WebGUI::International::get("captcha failure","AuthWebGUI");
} }
} }
$error.= $self->error if(!$self->_isValidPassword($password,$passConfirm));
my ($profile, $temp, $warning) = WebGUI::Operation::Profile::validateProfileData();
$error .= $temp;
return $self->createAccount($error) unless ($error eq ""); return $self->createAccount($error) unless ($error eq "");

View file

@ -186,10 +186,6 @@ A string containing the link to the tab-CascadingStyleSheet
default = extrasPath.'/tabs/tabs.css' default = extrasPath.'/tabs/tabs.css'
=head3 cancelUrl
A URL to go to when the cancel button is pressed.
=cut =cut
sub new { sub new {
@ -207,7 +203,7 @@ sub new {
} }
my $cancel = WebGUI::Form::button({ my $cancel = WebGUI::Form::button({
value=>WebGUI::International::get('cancel'), value=>WebGUI::International::get('cancel'),
extras=>q|onclick="location.href='|.$cancelUrl.q|'"| extras=>q|onclick="history.go(-1);"|
}); });
bless { _uiLevelOverride=>$uiLevelOverride, _cancel=>$cancel, _submit=>WebGUI::Form::submit(), _form=>WebGUI::Form::formHeader(), _hidden=>"", _tab=>\%tabs, _css=>$css }, $class; bless { _uiLevelOverride=>$uiLevelOverride, _cancel=>$cancel, _submit=>WebGUI::Form::submit(), _form=>WebGUI::Form::formHeader(), _hidden=>"", _tab=>\%tabs, _css=>$css }, $class;
} }