oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Forward port fix for no email address during username/email address password recovery.

Browse source
This commit is contained in:
Colin Kuskie 2008-12-16 01:40:19 +00:00
parent 7addce2dd6
commit da10f64d29
3 changed files with 14 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
docs/changelog/7.x.x.txt
View file

@ -13,6 +13,7 @@
- fixed #4136: Shortcut doesn't display all properties in override - fixed #4136: Shortcut doesn't display all properties in override
- fixed #8838: Gallery Cross Publish template is broken - fixed #8838: Gallery Cross Publish template is broken
- fixed #8898: versioning problem - fixed #8898: versioning problem
- fixed #9315: Password Recovery
7.6.6 7.6.6
- fixed #8792: Image Preview gives ERROR in Collateral Manager - fixed #8792: Image Preview gives ERROR in Collateral Manager

9
lib/WebGUI/Auth/WebGUI.pm
View file

@ -900,7 +900,7 @@ sub profileRecoverPasswordFinish {
my $username; my $username;
if ($self->getSetting('passwordRecoveryRequireUsername')) { if ($self->getSetting('passwordRecoveryRequireUsername')) {
$username = $self->session->form->process('authWebGUI.username'); $username = $self->session->form->process('authWebGUI.username');
return $self->recoverPassword($i18n2->get('password recovery no username')) unless defined $username; return $self->recoverPassword($i18n->get('password recovery no username', 'AuthWebGUI')) unless defined $username;
} }
my @fields = @{WebGUI::ProfileField->getPasswordRecoveryFields($self->session)}; my @fields = @{WebGUI::ProfileField->getPasswordRecoveryFields($self->session)};
@ -1011,7 +1011,6 @@ sub emailRecoverPasswordFinish {
return $self->displayLogin unless ($self->session->setting->get('webguiPasswordRecovery') ne '') and $self->isVisitor; return $self->displayLogin unless ($self->session->setting->get('webguiPasswordRecovery') ne '') and $self->isVisitor;
my $i18n = WebGUI::International->new($self->session); my $i18n = WebGUI::International->new($self->session);
my $i18n2 = WebGUI::International->new($self->session, 'AuthWebGUI');
my $session = $self->session; my $session = $self->session;
my ($form) = $session->quick(qw/form/); my ($form) = $session->quick(qw/form/);
my $email = $form->param('email'); my $email = $form->param('email');
@ -1032,7 +1031,7 @@ sub emailRecoverPasswordFinish {
# Make sure the user is Active # Make sure the user is Active
if ( $user->status ne "Active" ) { if ( $user->status ne "Active" ) {
return $self->recoverPassword( $i18n2->get( 'password recovery disabled' ) ); return $self->recoverPassword( $i18n->get( 'password recovery disabled', 'AuthWebGUI' ) );
} }
# generate information necessry to proceed # generate information necessry to proceed
@ -1041,6 +1040,10 @@ sub emailRecoverPasswordFinish {
my $userId = $user->userId; #get the user guid my $userId = $user->userId; #get the user guid
$email = $user->profileField('email'); $email = $user->profileField('email');
if ( ! $email ) {
return $self->recoverPassword( $i18n->get( 'no email address', 'AuthWebGUI' ) );
}
my $authsettings = $self->getParams($userId); my $authsettings = $self->getParams($userId);
$authsettings->{emailRecoverPasswordVerificationNumber} = $recoveryGuid; $authsettings->{emailRecoverPasswordVerificationNumber} = $recoveryGuid;

7
lib/WebGUI/i18n/English/AuthWebGUI.pm
View file

@ -724,6 +724,13 @@ our $I18N = {
lastUpdated => 0, lastUpdated => 0,
context => q{Error message when a user tries to recover password for a disabled account}, context => q{Error message when a user tries to recover password for a disabled account},
}, },
'no email address' => {
message => q{There is no email address registered for this account. Password recovery via email is not possible.},
lastUpdated => 1229391388,
context => q{Error message when a user tries to recover password and they don't have an email address},
},
}; };
1; 1;