View | Details | Raw Unified | Return to bug 8753
Collapse All | Expand All

(-)a/opac/opac-password-recovery.pl (-35 / +16 lines)
Lines 54-80 if ( $query->param('sendEmail') || $query->param('resendEmail') ) { Link Here
54
54
55
    #try with the main email
55
    #try with the main email
56
    my $borrower_number;
56
    my $borrower_number;
57
    $email ||= ''; # avoid undef
57
    my %borrower_infos = GetMember( email => $email );
58
    my %borrower_infos = GetMember( email => $email );
58
    if (%borrower_infos) {
59
    %borrower_infos = GetMember( emailpro => $email ) unless %borrower_infos;
59
        $borrower_number = GetMember( email => $email )->{'borrowernumber'};
60
    %borrower_infos = GetMember( B_email => $email ) unless %borrower_infos;
61
    if(%borrower_infos) {
62
        $borrower_number = $borrower_infos{'borrowernumber'};
60
        $username = GetMemberDetails($borrower_number)->{'userid'};
63
        $username = GetMemberDetails($borrower_number)->{'userid'};
61
    }
64
    }
62
    else {
63
        #try with the secondary email
64
        %borrower_infos = GetMember( emailpro => $email );
65
        if (%borrower_infos) {
66
            $borrower_number = GetMember( emailpro => $email )->{'borrowernumber'};
67
            $username = GetMemberDetails($borrower_number)->{'userid'};
68
        }
69
        else {
70
            #try when the other contact email
71
            %borrower_infos = GetMember( B_email => $email );
72
            if (%borrower_infos) {
73
                $borrower_number = GetMember( B_email => $email )->{'borrowernumber'};
74
                $username = GetMemberDetails($borrower_number)->{'userid'};
75
            }
76
        }
77
    }
78
65
79
    if ( !$email || !$username || !$borrower_number ) {
66
    if ( !$email || !$username || !$borrower_number ) {
80
        $hasError        = 1;
67
        $hasError        = 1;
Lines 100-121 if ( $query->param('sendEmail') || $query->param('resendEmail') ) { Link Here
100
            email                   => HTML::Entities::encode($email),
87
            email                   => HTML::Entities::encode($email),
101
        );
88
        );
102
    }
89
    }
103
    else {
90
    elsif ( SendPasswordRecoveryEmail( $borrower_number, $email, $query ) ) {#generate uuid and send recovery email
104
        #generate uuid and send recovery email
91
        $template->param(
105
        if ( SendPasswordRecoveryEmail( $borrower_number, $email, $query ) ) {
92
            mail_sent => 1,
106
            # if it works....
93
            email     => $email
107
            $template->param(
94
        );
108
                mail_sent => 1,
95
    }
109
                email     => $email
96
    else {# if it doesnt work....
110
            );
97
        $template->param(
111
        }
98
            password_recovery => 1,
112
        else {
99
            sendmailError     => 1
113
            # if it doesnt work....
100
        );
114
            $template->param(
115
                password_recovery => 1,
116
                sendmailError     => 1
117
            );
118
        }
119
    }
101
    }
120
}
102
}
121
elsif ( $query->param('passwordReset') ) {
103
elsif ( $query->param('passwordReset') ) {
122
- 

Return to bug 8753