Lines 399-407
sub AddMember {
Link Here
|
399 |
} |
399 |
} |
400 |
} |
400 |
} |
401 |
|
401 |
|
|
|
402 |
my $p = Koha::Patron->new( { userid => $data{userid} } ); |
402 |
# generate a proper login if none provided |
403 |
# generate a proper login if none provided |
403 |
$data{'userid'} = Generate_Userid( $data{'borrowernumber'}, $data{'firstname'}, $data{'surname'} ) |
404 |
$data{'userid'} = Generate_Userid( $data{'borrowernumber'}, $data{'firstname'}, $data{'surname'} ) |
404 |
if ( $data{'userid'} eq '' || !Check_Userid( $data{'userid'} ) ); |
405 |
if ( $data{'userid'} eq '' || ! $p->has_valid_userid ); |
405 |
|
406 |
|
406 |
# add expiration date if it isn't already there |
407 |
# add expiration date if it isn't already there |
407 |
$data{dateexpiry} ||= $category->get_expiry_date; |
408 |
$data{dateexpiry} ||= $category->get_expiry_date; |
Lines 507-513
sub Check_Userid {
Link Here
|
507 |
$borrowernumber is optional (i.e. it can contain a blank value). A value is passed when generating a new userid for an existing borrower. When a new userid is created for a new borrower, a blank value is passed to this sub. |
508 |
$borrowernumber is optional (i.e. it can contain a blank value). A value is passed when generating a new userid for an existing borrower. When a new userid is created for a new borrower, a blank value is passed to this sub. |
508 |
|
509 |
|
509 |
return : |
510 |
return : |
510 |
new userid ($firstname.$surname if there is a $firstname, or $surname if there is no value in $firstname) plus offset (0 if the $newuid is unique, or a higher numeric value if Check_Userid finds an existing match for the $newuid in the database). |
511 |
new userid ($firstname.$surname if there is a $firstname, or $surname if there is no value in $firstname) plus offset (0 if the $newuid is unique, or a higher numeric value if not unique). |
511 |
|
512 |
|
512 |
=cut |
513 |
=cut |
513 |
|
514 |
|
Lines 515-530
sub Generate_Userid {
Link Here
|
515 |
my ($borrowernumber, $firstname, $surname) = @_; |
516 |
my ($borrowernumber, $firstname, $surname) = @_; |
516 |
my $newuid; |
517 |
my $newuid; |
517 |
my $offset = 0; |
518 |
my $offset = 0; |
518 |
#The script will "do" the following code and increment the $offset until Check_Userid = 1 (i.e. until $newuid comes back as unique) |
519 |
my $patron = Koha::Patron->new; |
|
|
520 |
#The script will "do" the following code and increment the $offset until the generated userid is unique |
519 |
do { |
521 |
do { |
520 |
$firstname =~ s/[[:digit:][:space:][:blank:][:punct:][:cntrl:]]//g; |
522 |
$firstname =~ s/[[:digit:][:space:][:blank:][:punct:][:cntrl:]]//g; |
521 |
$surname =~ s/[[:digit:][:space:][:blank:][:punct:][:cntrl:]]//g; |
523 |
$surname =~ s/[[:digit:][:space:][:blank:][:punct:][:cntrl:]]//g; |
522 |
$newuid = lc(($firstname)? "$firstname.$surname" : $surname); |
524 |
$newuid = lc(($firstname)? "$firstname.$surname" : $surname); |
523 |
$newuid = unac_string('utf-8',$newuid); |
525 |
$newuid = unac_string('utf-8',$newuid); |
524 |
$newuid .= $offset unless $offset == 0; |
526 |
$newuid .= $offset unless $offset == 0; |
|
|
527 |
$patron->userid( $newuid ); |
525 |
$offset++; |
528 |
$offset++; |
526 |
|
529 |
} while (! $patron->has_valid_userid ); |
527 |
} while (!Check_Userid($newuid,$borrowernumber)); |
|
|
528 |
|
530 |
|
529 |
return $newuid; |
531 |
return $newuid; |
530 |
} |
532 |
} |