[Koha-patches] [PATCH] [SIGNED-OFF] Bug 3674: reimplementation

[Frédéric Demians]

From: conan (aka Fernando L. Canizo) <conan at lugmen.org.ar>

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 <f.demians at tamil.fr>
---
 C4/Members.pm |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/C4/Members.pm b/C4/Members.pm
index e03b40b..267e2d9 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");
-- 
1.7.5.1