Bugzilla – Attachment 24906 Details for
Bug 8753
Add forgot password link to OPAC
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Improved UGLY code (sic).
Improved-UGLY-code-sic.patch (text/plain), 3.03 KB, created by
Blou
on 2014-01-30 21:32:21 UTC
(
hide
)
Description:
Improved UGLY code (sic).
Filename:
MIME Type:
Creator:
Blou
Created:
2014-01-30 21:32:21 UTC
Size:
3.03 KB
patch
obsolete
>From 2b90dd80e746e8eca1d21ecbf5c25c768280b7d4 Mon Sep 17 00:00:00 2001 >From: Blou <philippe.blouin@inlibro.com> >Date: Thu, 30 Jan 2014 16:31:59 -0500 >Subject: [PATCH] Improved UGLY code (sic). > >http://bugs.koha-community.org/show_bug.cgi?id=8753 >--- > opac/opac-password-recovery.pl | 50 +++++++++++++--------------------------- > 1 file changed, 16 insertions(+), 34 deletions(-) > >diff --git a/opac/opac-password-recovery.pl b/opac/opac-password-recovery.pl >index 3ae4cbf..d44d19d 100755 >--- a/opac/opac-password-recovery.pl >+++ b/opac/opac-password-recovery.pl >@@ -54,27 +54,14 @@ if ( $query->param('sendEmail') || $query->param('resendEmail') ) { > > #try with the main email > my $borrower_number; >+ $email ||= ''; # avoid undef > my %borrower_infos = GetMember( email => $email ); >- if (%borrower_infos) { >- $borrower_number = GetMember( email => $email )->{'borrowernumber'}; >+ %borrower_infos = GetMember( emailpro => $email ) unless %borrower_infos; >+ %borrower_infos = GetMember( B_email => $email ) unless %borrower_infos; >+ if(%borrower_infos) { >+ $borrower_number = $borrower_infos{'borrowernumber'}; > $username = GetMemberDetails($borrower_number)->{'userid'}; > } >- else { >- #try with the secondary email >- %borrower_infos = GetMember( emailpro => $email ); >- if (%borrower_infos) { >- $borrower_number = GetMember( emailpro => $email )->{'borrowernumber'}; >- $username = GetMemberDetails($borrower_number)->{'userid'}; >- } >- else { >- #try when the other contact email >- %borrower_infos = GetMember( B_email => $email ); >- if (%borrower_infos) { >- $borrower_number = GetMember( B_email => $email )->{'borrowernumber'}; >- $username = GetMemberDetails($borrower_number)->{'userid'}; >- } >- } >- } > > if ( !$email || !$username || !$borrower_number ) { > $hasError = 1; >@@ -100,22 +87,17 @@ if ( $query->param('sendEmail') || $query->param('resendEmail') ) { > email => HTML::Entities::encode($email), > ); > } >- else { >- #generate uuid and send recovery email >- if ( SendPasswordRecoveryEmail( $borrower_number, $email, $query ) ) { >- # if it works.... >- $template->param( >- mail_sent => 1, >- email => $email >- ); >- } >- else { >- # if it doesnt work.... >- $template->param( >- password_recovery => 1, >- sendmailError => 1 >- ); >- } >+ elsif ( SendPasswordRecoveryEmail( $borrower_number, $email, $query ) ) {#generate uuid and send recovery email >+ $template->param( >+ mail_sent => 1, >+ email => $email >+ ); >+ } >+ else {# if it doesnt work.... >+ $template->param( >+ password_recovery => 1, >+ sendmailError => 1 >+ ); > } > } > elsif ( $query->param('passwordReset') ) { >-- >1.7.10.4
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 8753
:
21502
|
21512
|
21521
|
21849
|
22175
|
22430
|
24586
|
24780
|
24781
|
24846
|
24853
|
24854
|
24855
|
24862
|
24906
|
24907
|
24908
|
25038
|
25039
|
25051
|
29111
|
33175
|
33176
|
34472
|
36819
|
37492
|
39049
|
39144
|
39165
|
39166
|
39167
|
39168
|
39827
|
41181
|
41192
|
41193
|
41455
|
41686
|
41687
|
41688
|
41706
|
43017
|
43183
|
43576
|
44305
|
44306
|
44307
|
44308
|
44309
|
44310
|
44311
|
44323
|
44324
|
44325
|
44326
|
44327
|
44329
|
44330
|
45209
|
45210
|
45211
|
45212
|
45213
|
45214
|
45215
|
45223
|
45224
|
45225
|
45226
|
45227
|
45228
|
45229
|
45230
|
46379
|
47164
|
47165
|
47166
|
47167
|
47168
|
47169
|
47170
|
47171
|
47357
|
47366