diff --git a/docs/changelog/6.x.x.txt b/docs/changelog/6.x.x.txt index 20006ff6b..465d903c2 100644 --- a/docs/changelog/6.x.x.txt +++ b/docs/changelog/6.x.x.txt @@ -131,6 +131,8 @@ - fix [ 1172613 ] Header Tag Not Accessibility Friendly - fix [ 1340839 ] If can't use item in adminConsole don't display it - fix [ 1473937 ] scratch->set not taking. + - fix [ 1471909 ] createAccountSave not called - no validate email (Martin + Kamerbeek / Procolix) - Added a graphing engine and tied it into the Poll asset (Martin Kamerbeek / Procolix) 6.8.8 diff --git a/lib/WebGUI/Auth.pm b/lib/WebGUI/Auth.pm index d179d0cb2..84cb56f83 100644 --- a/lib/WebGUI/Auth.pm +++ b/lib/WebGUI/Auth.pm @@ -29,7 +29,7 @@ use WebGUI::User; use WebGUI::Operation::Shared; use WebGUI::Operation::Profile; use WebGUI::Workflow::Instance; - +use WebGUI::Inbox; =head1 NAME @@ -258,7 +258,11 @@ sub createAccountSave { my $authInfo = "\n\n".$i18n->get(50).": ".$username; $authInfo .= "\n".$i18n->get(51).": ".$password if($password); $authInfo .= "\n\n"; - WebGUI::MessageLog::addEntry($self->userId,"",$i18n->get(870),$self->getSetting("welcomeMessage").$authInfo); + WebGUI::Inbox->new($self->session)->addMessage({ + message => $self->getSetting("welcomeMessage").$authInfo, + subject => $i18n->get(870), + userId => $self->userId, + }); } $self->session->user({user=>$u}); $self->_logLogin($userId,"success"); diff --git a/lib/WebGUI/Auth/WebGUI.pm b/lib/WebGUI/Auth/WebGUI.pm index b16364239..873e552c7 100644 --- a/lib/WebGUI/Auth/WebGUI.pm +++ b/lib/WebGUI/Auth/WebGUI.pm @@ -195,7 +195,7 @@ sub createAccount { sub createAccountSave { my $self = shift; my $i18n = WebGUI::International->new($self->session); - + return $self->displayAccount if ($self->session->user->userId ne "1"); #Make sure anonymous registration is enabled @@ -208,7 +208,6 @@ sub createAccountSave { my $passConfirm = $self->session->form->process('authWebGUI.identifierConfirm'); my $error; - $error = $self->error unless($self->validUsername($username)); if ($self->session->setting->get("webguiUseCaptcha")) { unless ($self->session->form->process('authWebGUI.captcha', "Captcha")) { @@ -220,7 +219,6 @@ sub createAccountSave { $error .= $temp; return $self->createAccount($error) unless ($error eq ""); - #If Email address is not unique, a warning is displayed if($warning ne "" && !$self->session->form->process("confirm")){ return $self->createAccount('
  • '.$i18n->get(1078).'
  • ', 1); diff --git a/lib/WebGUI/Inbox.pm b/lib/WebGUI/Inbox.pm index fd295e0f0..bf8d57109 100644 --- a/lib/WebGUI/Inbox.pm +++ b/lib/WebGUI/Inbox.pm @@ -15,6 +15,7 @@ package WebGUI::Inbox; =cut use strict; +use WebGUI::Inbox::Message; =head1 NAME