X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=members%2Fmember-password.pl;h=f18db8063735e12549f5af511612b1cca4ee74b7;hb=0865bd7727a69edadb4fb22d02321447fce14b37;hp=183d2d34842a7f8a53ea71ececb5d36f3dec8b41;hpb=b5970e02b2d715cfd51d2519f4f715dc993ef682;p=koha.git

diff --git a/members/member-password.pl b/members/member-password.pl
index 183d2d3484..f18db80637 100755
--- a/members/member-password.pl
+++ b/members/member-password.pl
@@ -9,6 +9,7 @@ use C4::Auth;
 use C4::Output;
 use C4::Context;
 use C4::Members;
+use C4::Branch;
 use C4::Circulation;
 use CGI;
 
@@ -44,7 +45,7 @@ if(( $member ne $loggedinuser ) && ($bor->{'category_type'} eq 'S' ) ) {
 }
 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'));
@@ -76,9 +77,16 @@ if ( $newpassword  && ! $errormsg ) {
 	$defaultnewpassword.=substr($chars, int(rand(length($chars))),1);
     }
 	
-	my $borrowercategory = GetBorrowercategory( $bor->{'categorycode'} );
-my $category_type = $borrowercategory->{'category_type'};
-( $template->param( adultborrower => 1 ) ) if ( $category_type eq 'A' );
+    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;
 	
     $template->param( othernames => $bor->{'othernames'},
 	    surname     => $bor->{'surname'},
@@ -87,7 +95,7 @@ my $category_type = $borrowercategory->{'category_type'};
 	    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'},
@@ -95,8 +103,10 @@ my $category_type = $borrowercategory->{'category_type'};
 	    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'),
 	    defaultnewpassword => $defaultnewpassword 
 	);