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

diff --git a/members/member-password.pl b/members/member-password.pl
index 70a93f2088..67f96db933 100755
--- a/members/member-password.pl
+++ b/members/member-password.pl
@@ -5,11 +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::Interface::CGI::Output;
 use C4::Context;
 use C4::Members;
+use C4::Branch;
 use C4::Circulation;
 use CGI;
 
@@ -20,7 +22,7 @@ my $input = new CGI;
 my $theme = $input->param('theme') || "default";
 			# only used if allowthemeoverride is set
 
-my ($template, $loggedinuser, $cookie)
+my ($template, $loggedinuser, $cookie, $staffflags)
     = get_template_and_user({template_name => "members/member-password.tmpl",
 			     query => $input,
 			     type => "intranet",
@@ -31,58 +33,92 @@ my ($template, $loggedinuser, $cookie)
 
 my $flagsrequired;
 $flagsrequired->{borrowers}=1;
-my ($loggedinuser, $cookie, $sessionID) = checkauth($input, 0, $flagsrequired);
+
+#my ($loggedinuser, $cookie, $sessionID) = checkauth($input, 0, $flagsrequired);
 
 my $member=$input->param('member');
-my %env;
-$env{'nottodayissues'}=1;
-my %member2;
-$member2{'borrowernumber'}=$member;
-my $issues=GetBorrowerIssues(\%member2);
-my $i=0;
-foreach (sort keys %$issues) {
-    $i++;
+my $cardnumber = $input->param('cardnumber');
+my $destination = $input->param('destination');
+my $errormsg;
+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 ($bor,$flags)=GetMemberDetails( $member,'');
 my $newpassword = $input->param('newpassword');
+my $minpw = C4::Context->preference('minPasswordLength');
+$errormsg = 'SHORTPASSWORD' if( $newpassword && $minpw && (length($newpassword) < $minpw ) );
 
-if ( $newpassword ) {
-	my $digest=md5_base64($input->param('newpassword'));
-	my $uid = $input->param('newuserid');
-	my $dbh=C4::Context->dbh;
-	if (changepassword($uid,$member,$digest)) {
+if ( $newpassword  && ! $errormsg ) {
+    my $digest=md5_base64($input->param('newpassword'));
+    my $uid = $input->param('newuserid');
+    my $dbh=C4::Context->dbh;
+    if (changepassword($uid,$member,$digest)) {
 		$template->param(newpassword => $newpassword);
-		print $input->redirect("/cgi-bin/koha/members/moremember.pl?borrowernumber=$member");
-	} else {
-        $template->param(othernames => $bor->{'othernames'},
+		if ($destination eq 'circ') {
+		    print $input->redirect("/cgi-bin/koha/circ/circulation.pl?findborrower=$cardnumber");		
+		} else {
+		    print $input->redirect("/cgi-bin/koha/members/moremember.pl?borrowernumber=$member");
+		}
+    } else {
+			$errormsg = 'BADUSERID';
+    	    $template->param(othernames => $bor->{'othernames'},
 						surname     => $bor->{'surname'},
 						firstname   => $bor->{'firstname'},
 						userid      => $bor->{'userid'},
-						defaultnewpassword => $newpassword );
-	}
+						defaultnewpassword => $newpassword 
+						);
+    }
 } else {
     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);
     }
-	$template->param(	othernames => $bor->{'othernames'},
-			surname     => $bor->{'surname'},
-			firstname   => $bor->{'firstname'},
-			userid      => $bor->{'userid'},
-			defaultnewpassword => $defaultnewpassword );
+	
+    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'},
+	    firstname   => $bor->{'firstname'},
+	    borrowernumber => $bor->{'borrowernumber'},
+	    cardnumber => $bor->{'cardnumber'},
+	    categorycode => $bor->{'categorycode'},
+	    category_type => $bor->{'category_type'},
+	    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'),
+	    defaultnewpassword => $defaultnewpassword 
+	);
 
 
 }
 
 $template->param( member => $member,
-		intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),
-		intranetstylesheet => C4::Context->preference("intranetstylesheet"),
-		IntranetNav => C4::Context->preference("IntranetNav"),
-		);
+					errormsg => $errormsg,
+					$errormsg => 1 ,
+					minPasswordLength => $minpw );
 
 output_html_with_http_headers $input, $cookie, $template->output;