X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=members%2Fmember-password.pl;h=67f96db9335ddcd1652002f4aeeebbed3525120f;hb=d3df54d05245b3fa11f052b4c09104bdd2531e31;hp=0ee5337cbcc9f5367e83da8978efcf4bd58d2b18;hpb=52c933c41393dd1b3f3888ce98bda3e4091c1e01;p=koha.git

diff --git a/members/member-password.pl b/members/member-password.pl
index 0ee5337cbc..67f96db933 100755
--- a/members/member-password.pl
+++ b/members/member-password.pl
@@ -5,10 +5,13 @@
 #converted to using templates 3/16/03 by mwhansen@hmc.edu
 
 use strict;
+use warnings;
+
 use C4::Auth;
 use C4::Output;
 use C4::Context;
 use C4::Members;
+use C4::Branch;
 use C4::Circulation;
 use CGI;
 
@@ -37,14 +40,14 @@ my $member=$input->param('member');
 my $cardnumber = $input->param('cardnumber');
 my $destination = $input->param('destination');
 my $errormsg;
-my ($bor)=GetMember($member);
+my ($bor)=GetMember('borrowernumber' => $member);
 if(( $member ne $loggedinuser ) && ($bor->{'category_type'} eq 'S' ) ) {
 	$errormsg = 'NOPERMISSION' unless($staffflags->{'superlibrarian'} || $staffflags->{'staffaccess'} );
 	# need superlibrarian for koha-conf.xml fakeuser.
 }
 my $newpassword = $input->param('newpassword');
 my $minpw = C4::Context->preference('minPasswordLength');
-$errormsg = 'SHORTPASSWORD' if( $newpassword && $minpw & (length($newpassword) < $minpw ) );
+$errormsg = 'SHORTPASSWORD' if( $newpassword && $minpw && (length($newpassword) < $minpw ) );
 
 if ( $newpassword  && ! $errormsg ) {
     my $digest=md5_base64($input->param('newpassword'));
@@ -70,12 +73,19 @@ if ( $newpassword  && ! $errormsg ) {
     my $userid = $bor->{'userid'};
 
     my $chars='abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789';
-    my $length=int(rand(2))+4;
+    my $length=int(rand(2))+C4::Context->preference("minPasswordLength");
     my $defaultnewpassword='';
     for (my $i=0; $i<$length; $i++) {
 	$defaultnewpassword.=substr($chars, int(rand(length($chars))),1);
     }
 	
+    if ( $bor->{'category_type'} eq 'C') {
+        my  ( $catcodes, $labels ) =  GetborCatFromCatType( 'A', 'WHERE category_type = ?' );
+        my $cnt = scalar(@$catcodes);
+        $template->param( 'CATCODE_MULTI' => 1) if $cnt > 1;
+        $template->param( 'catcode' =>    $catcodes->[0])  if $cnt == 1;
+    }
+	
 $template->param( adultborrower => 1 ) if ( $bor->{'category_type'} eq 'A' );
 my ($picture, $dberror) = GetPatronImage($bor->{'cardnumber'});
 $template->param( picture => 1 ) if $picture;
@@ -87,14 +97,16 @@ $template->param( picture => 1 ) if $picture;
 	    cardnumber => $bor->{'cardnumber'},
 	    categorycode => $bor->{'categorycode'},
 	    category_type => $bor->{'category_type'},
-	    category_description => $bor->{'description'},
+	    categoryname => $bor->{'description'},
 	    address => $bor->{'address'},
 	    address2 => $bor->{'address2'},
 	    city => $bor->{'city'},
 	    zipcode => $bor->{'zipcode'},
+	    country => $bor->{'country'},
 	    phone => $bor->{'phone'},
 	    email => $bor->{'email'},
 	    branchcode => $bor->{'branchcode'},
+	    branchname => GetBranchName($bor->{'branchcode'}),
 	    userid      => $bor->{'userid'},
 	    destination => $destination,
 		is_child        => ($bor->{'category_type'} eq 'C'),