From 7a5dadc3175ccbdb05df182ef016171fac7061e2 Mon Sep 17 00:00:00 2001
From: wolfpac444 <wolfpac444>
Date: Tue, 27 May 2003 06:51:55 +0000
Subject: [PATCH] Fixed #465.

---
 .../default/en/members/member-password.tmpl   |  3 ++
 member-password.pl                            | 28 ++++++++++++++++---
 2 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/default/en/members/member-password.tmpl b/koha-tmpl/intranet-tmpl/default/en/members/member-password.tmpl
index 3b1243eb1e..94e9bba026 100644
--- a/koha-tmpl/intranet-tmpl/default/en/members/member-password.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/members/member-password.tmpl
@@ -9,6 +9,9 @@ Click <a href="/cgi-bin/koha/moremember.pl?bornum=<TMPL_VAR NAME=member>">here</
 	<h2><TMPL_VAR NAME="title"> <TMPL_VAR NAME="othernames"> <TMPL_VAR NAME="surname">, <TMPL_VAR NAME="firstname"></h2>
 	<form method=post>
 	<input type=hidden name=member value=<TMPL_VAR NAME=member>>
+	<TMPL_IF NAME="warn">
+		You have entered a UserID that already exists.  Please choose another one.<br>
+	</TMPL_IF>
 	New UserID: <input name=newuserid size=20 value=<TMPL_VAR NAME=userid>> <br>
 	New Password: <input name=newpassword size=20 value=<TMPL_VAR NAME=defaultnewpassword>>
 	<p>
diff --git a/member-password.pl b/member-password.pl
index a69a5b899d..59bd245e19 100755
--- a/member-password.pl
+++ b/member-password.pl
@@ -44,16 +44,36 @@ foreach (sort keys %$issues) {
     $i++;
 }
 
+my ($bor,$flags)=getpatroninformation(\%env, $member,'');
 my $newpassword = $input->param('newpassword');
 
 if ( $newpassword ) {
     my $digest=md5_base64($input->param('newpassword'));
     my $uid = $input->param('newuserid');
     my $dbh=C4::Context->dbh;
-    my $sth=$dbh->prepare("update borrowers set userid=?, password=? where borrowernumber=?");
-    $sth->execute($uid, $digest, $member);
+
+    #Make sure the userid chosen is unique. If it is not,
+    #Then we need to tell the user and have them create a new one.
+    my $sth2=$dbh->prepare("select * from borrowers where userid=?");
+    $sth2->execute($uid);
+
+    if ( $sth2->fetchrow ) {
+	#The userid exists so we should display a warning.
+	my $warn = 1;
+        $template->param( warn => $warn,
+		        othernames => $bor->{'othernames'},
+                        surname     => $bor->{'surname'},
+                        firstname   => $bor->{'firstname'},
+                        userid      => $bor->{'userid'},
+                        defaultnewpassword => $newpassword );
+    } else {
+	#Everything is good so we can update the information.
+	my $sth=$dbh->prepare("update borrowers set userid=?, password=? where borrowernumber=?");
+    	$sth->execute($uid, $digest, $member);
+	$template->param(newpassword => $newpassword);
+    }
+
 } else {
-    my ($bor,$flags)=getpatroninformation(\%env, $member,'');
     my $userid = $bor->{'userid'};
 
     my $chars='abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789';
@@ -71,6 +91,6 @@ if ( $newpassword ) {
 
 }
 
-$template->param( member => $member, newpassword => $newpassword );
+$template->param( member => $member );
 
 output_html_with_http_headers $input, $cookie, $template->output;
-- 
2.39.2