From: conan (aka Fernando L. Canizo) <[email protected]> 05eb43f5fc00889420e03845b5059d80bf1663ad reverted a previous implementation of 3674.
3674 was encoding the password field when it was meant to be disabled (password='!'), and then, in Auth.pm we were trying to compare an encoded '!' with '!', which will never succeed. This gets sure we encode only provided passwords and also includes an auto generated login. Signed-off-by: Frédéric Demians <[email protected]> --- C4/Members.pm | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/C4/Members.pm b/C4/Members.pm index a151e03..e5db97f 100644 --- a/C4/Members.pm +++ b/C4/Members.pm @@ -800,8 +800,10 @@ Returns the borrowernumber sub AddMember { my (%data) = @_; my $dbh = C4::Context->dbh; - $data{'userid'} = '' unless $data{'password'}; - $data{'password'} = md5_base64( $data{'password'} ) if $data{'password'}; + # generate a proper login if none provided + $data{'userid'} = Generate_Userid($data{'borrowernumber'}, $data{'firstname'}, $data{'surname'}) if $data{'userid'} eq ''; + # create a disabled account if no password provided + $data{'password'} = ($data{'password'})? md5_base64($data{'password'}) : '!'; $data{'borrowernumber'}=InsertInTable("borrowers",\%data); # mysql_insertid is probably bad. not necessarily accurate and mysql-specific at best. logaction("MEMBERS", "CREATE", $data{'borrowernumber'}, "") if C4::Context->preference("BorrowersLog"); @@ -842,7 +844,7 @@ sub Generate_Userid { do { $firstname =~ s/[[:digit:][:space:][:blank:][:punct:][:cntrl:]]//g; $surname =~ s/[[:digit:][:space:][:blank:][:punct:][:cntrl:]]//g; - $newuid = lc("$firstname.$surname"); + $newuid = lc(($firstname)? "$firstname.$surname" : $surname); $newuid .= $offset unless $offset == 0; $offset++; -- 1.7.4 _______________________________________________ Koha-patches mailing list [email protected] http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-patches website : http://www.koha-community.org/ git : http://git.koha-community.org/ bugs : http://bugs.koha-community.org/
