French canadian updates

[koha.git] / members / member-password.pl

diff --git a/members/member-password.pl b/members/member-password.pl
index 7f17079..f18db80 100755 (executable)
--- 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;
 
@@ -19,7 +20,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",
@@ -36,16 +37,15 @@ $flagsrequired->{borrowers}=1;
 my $member=$input->param('member');
 my $cardnumber = $input->param('cardnumber');
 my $destination = $input->param('destination');
-
 my $errormsg;
-my ($bor,$flags)=GetMemberDetails( $member,'');
-if(( $member ne $loggedinuser ) && ($bor->{'category_type'} eq 'S' || $bor->{'authflags'}->{'catalogue'}) ) {
-       my $luser = GetMemberDetails($loggedinuser);
-       $errormsg = 'NOPERMISSION' unless($luser->{'authflags'}->{'staffaccess'} );
+my ($bor)=GetMember($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'));
@@ -76,6 +76,18 @@ if ( $newpassword  && ! $errormsg ) {
     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;
+       
     $template->param( othernames => $bor->{'othernames'},
            surname     => $bor->{'surname'},
            firstname   => $bor->{'firstname'},
@@ -83,7 +95,7 @@ if ( $newpassword  && ! $errormsg ) {
            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'},
@@ -91,8 +103,10 @@ if ( $newpassword  && ! $errormsg ) {
            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 
        );