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

(-)a/C4/Auth_with_ldap.pm (-1 / +1 lines)
Lines 223-229 sub checkpw_ldap { Link Here
223
		return(1, $cardnumber, $local_userid);
223
		return(1, $cardnumber, $local_userid);
224
        }
224
        }
225
    } elsif ($config{replicate}) { # A2, C2
225
    } elsif ($config{replicate}) { # A2, C2
226
        $borrowernumber = C4::Members::AddMember(%borrower) or die "AddMember failed";
226
        Koha::Patron->new( \%borrower )->store;
227
        C4::Members::Messaging::SetMessagingPreferencesFromDefaults( { borrowernumber => $borrowernumber, categorycode => $borrower{'categorycode'} } );
227
        C4::Members::Messaging::SetMessagingPreferencesFromDefaults( { borrowernumber => $borrowernumber, categorycode => $borrower{'categorycode'} } );
228
   } else {
228
   } else {
229
        return 0;   # B2, D2
229
        return 0;   # B2, D2
(-)a/C4/Members.pm (-7 lines)
Lines 405-417 sub AddMember { Link Here
405
        );
405
        );
406
    }
406
    }
407
407
408
    # trim whitespace from data which has some non-whitespace in it.
409
    foreach my $field_name (keys(%data)) {
410
        if ( defined $data{$field_name} && $data{$field_name} =~ /\S/ ) {
411
            $data{$field_name} =~ s/^\s*|\s*$//g;
412
        }
413
    }
414
415
    my $p = Koha::Patron->new( { userid => $data{userid}, firstname => $data{firstname}, surname => $data{surname} } );
408
    my $p = Koha::Patron->new( { userid => $data{userid}, firstname => $data{firstname}, surname => $data{surname} } );
416
    # generate a proper login if none provided
409
    # generate a proper login if none provided
417
    $data{'userid'} = $p->generate_userid
410
    $data{'userid'} = $p->generate_userid
(-)a/Koha/Patron.pm (-1 / +18 lines)
Lines 104-109 sub fixup_cardnumber { Link Here
104
    $self->cardnumber($max+1);
104
    $self->cardnumber($max+1);
105
}
105
}
106
106
107
# trim whitespace from data which has some non-whitespace in it.
108
# Could be moved to Koha::Object if need to be reused
109
sub trim_whitespaces {
110
    my( $self ) = @_;
111
112
    my $schema  = Koha::Database->new->schema;
113
    my @columns = $schema->source('Borrowers')->columns;
114
115
    for my $column( @columns ) {
116
        my $value = $self->$column;
117
        if ( defined $value ) {
118
            $value =~ s/^\s*|\s*$//g;
119
            $self->$column($value);
120
        }
121
    }
122
    return $self;
123
}
124
107
sub store {
125
sub store {
108
    my( $self ) = @_;
126
    my( $self ) = @_;
109
127
110
- 

Return to bug 20287