X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=members%2Fmember-password.pl;h=ac25da5ce701b02989ef82ec28145f93d55e7bca;hb=2249ee1216ed004e61a34bc821d216f3471ef87b;hp=c929c2adfecda5879264f6a42d07fdedc1e177aa;hpb=cc9524a875d8b032a40fa943de3973d4c93854bf;p=koha_fer

diff --git a/members/member-password.pl b/members/member-password.pl
index c929c2adfe..ac25da5ce7 100755
--- a/members/member-password.pl
+++ b/members/member-password.pl
@@ -5,15 +5,18 @@
 #converted to using templates 3/16/03 by mwhansen@hmc.edu
 
 use strict;
+use warnings;
+
 use C4::Auth;
+use Koha::AuthUtils;
 use C4::Output;
-use C4::Interface::CGI::Output;
-use C4::Search;
 use C4::Context;
 use C4::Members;
-use C4::Circulation::Circ2;
+use C4::Branch;
+use C4::Circulation;
 use CGI;
-use HTML::Template;
+use C4::Members::Attributes qw(GetBorrowerAttributes);
+
 use Digest::MD5 qw(md5_base64);
 
 my $input = new CGI;
@@ -21,7 +24,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",
@@ -32,58 +35,103 @@ 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, 'intranet');
 
 my $member=$input->param('member');
-my %env;
-$env{'nottodayissues'}=1;
-my %member2;
-$member2{'borrowernumber'}=$member;
-my $issues=currentissues(\%env,\%member2);
-my $i=0;
-foreach (sort keys %$issues) {
-    $i++;
+my $cardnumber = $input->param('cardnumber');
+my $destination = $input->param('destination');
+my @errors;
+my ($bor)=GetMember('borrowernumber' => $member);
+if(( $member ne $loggedinuser ) && ($bor->{'category_type'} eq 'S' ) ) {
+	push(@errors,'NOPERMISSION') unless($staffflags->{'superlibrarian'} || $staffflags->{'staffaccess'} );
+	# need superlibrarian for koha-conf.xml fakeuser.
 }
-
-my ($bor,$flags)=getpatroninformation(\%env, $member,'');
 my $newpassword = $input->param('newpassword');
+my $newpassword2 = $input->param('newpassword2');
 
-if ( $newpassword ) {
-	my $digest=md5_base64($input->param('newpassword'));
-	my $uid = $input->param('newuserid');
-	my $dbh=C4::Context->dbh;
-	if (changepassword($uid,$member,$digest)) {
+push(@errors,'NOMATCH') if ( ( $newpassword && $newpassword2 ) && ($newpassword ne $newpassword2) );
+
+my $minpw = C4::Context->preference('minPasswordLength');
+push(@errors,'SHORTPASSWORD') if( $newpassword && $minpw && (length($newpassword) < $minpw ) );
+
+if ( $newpassword  && !scalar(@errors) ) {
+    my $digest=Koha::AuthUtils::hash_password($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?bornum=$member");
-	} else {
-        $template->param(othernames => $bor->{'othernames'},
-						surname     => $bor->{'surname'},
-						firstname   => $bor->{'firstname'},
-						userid      => $bor->{'userid'},
-						defaultnewpassword => $newpassword );
-	}
+		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 {
+			push(@errors,'BADUSERID');
+    }
 } 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 );
 
+	$template->param( 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->{'borrowernumber'});
+$template->param( picture => 1 ) if $picture;
 
+if (C4::Context->preference('ExtendedPatronAttributes')) {
+    my $attributes = GetBorrowerAttributes($bor->{'borrowernumber'});
+    $template->param(
+        ExtendedPatronAttributes => 1,
+        extendedattributes => $attributes
+    );
 }
 
-$template->param( member => $member,
-		intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),
-		intranetstylesheet => C4::Context->preference("intranetstylesheet"),
-		IntranetNav => C4::Context->preference("IntranetNav"),
-		);
+    $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'},
+	    state => $bor->{'state'},
+	    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'),
+		activeBorrowerRelationship => (C4::Context->preference('borrowerRelationship') ne ''),
+        minPasswordLength => $minpw,
+        RoutingSerials => C4::Context->preference('RoutingSerials'),
+	);
+
+if( scalar(@errors )){
+	$template->param( errormsg => 1 );
+	foreach my $error (@errors) {
+        $template->param($error) || $template->param( $error => 1);
+	}
+
+}
 
 output_html_with_http_headers $input, $cookie, $template->output;