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

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt (+3 lines)
Lines 64-69 Link Here
64
                                [% IF field == "password_match" %]<li>Passwords do not match! <a href="#password">password</a></li>[% END %]
64
                                [% IF field == "password_match" %]<li>Passwords do not match! <a href="#password">password</a></li>[% END %]
65
                                [% IF field == "password_invalid" %]<li>Password does not meet minimum requirements! <a href="#password">password</a></li>[% END %]
65
                                [% IF field == "password_invalid" %]<li>Password does not meet minimum requirements! <a href="#password">password</a></li>[% END %]
66
                                [% IF field == "password_spaces" %]<li>Password contains leading and/or trailing spaces! <a href="#password">password</a></li>[% END %]
66
                                [% IF field == "password_spaces" %]<li>Password contains leading and/or trailing spaces! <a href="#password">password</a></li>[% END %]
67
                                [% IF field == "duplicate_email" %]
68
                                    <li>This email address already exists in our database.</li>
69
                                [% END %]
67
                            [% END %]
70
                            [% END %]
68
                        </ul>
71
                        </ul>
69
                        Please correct the errors and resubmit.
72
                        Please correct the errors and resubmit.
(-)a/opac/opac-memberentry.pl (-2 / +8 lines)
Lines 323-329 sub CheckForInvalidFields { Link Here
323
    my $borrower = shift;
323
    my $borrower = shift;
324
    my @invalidFields;
324
    my @invalidFields;
325
    if ($borrower->{'email'}) {
325
    if ($borrower->{'email'}) {
326
        push(@invalidFields, "email") if (!Email::Valid->address($borrower->{'email'}));
326
        unless ( Email::Valid->address($borrower->{'email'}) ) {
327
            push(@invalidFields, "email");
328
        } elsif ( C4::Context->preference("PatronSelfRegistrationEmailMustBeUnique") ) {
329
            my $patrons_with_same_email = Koha::Patrons->search( { email => $borrower->{email} })->count;
330
            if ( $patrons_with_same_email ) {
331
                push @invalidFields, "duplicate_email";
332
            }
333
        }
327
    }
334
    }
328
    if ($borrower->{'emailpro'}) {
335
    if ($borrower->{'emailpro'}) {
329
        push(@invalidFields, "emailpro") if (!Email::Valid->address($borrower->{'emailpro'}));
336
        push(@invalidFields, "emailpro") if (!Email::Valid->address($borrower->{'emailpro'}));
330
- 

Return to bug 16275