[Koha-cvs] koha/members deletemem.pl [R_2-2-7-1]

[Antoine Farnault]

CVSROOT:        /sources/koha
Module name:    koha
Branch:         R_2-2-7-1
Changes by:     Antoine Farnault <toins>        07/02/12 10:10:26

Modified files:
        members        : deletemem.pl 

Log message:
        Commiting BUG FIX for 2.2.7.1.
        
        ( correcting authentication usage, Fix for bug 1269 - a normal 
librarian can no longer delete a superlibrarian.)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/members/deletemem.pl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.4.2.7&r2=1.4.2.7.6.1

Patches:
Index: deletemem.pl
===================================================================
RCS file: /sources/koha/koha/members/deletemem.pl,v
retrieving revision 1.4.2.7
retrieving revision 1.4.2.7.6.1
diff -u -b -r1.4.2.7 -r1.4.2.7.6.1
--- deletemem.pl        5 Feb 2006 21:59:21 -0000       1.4.2.7
+++ deletemem.pl        12 Feb 2007 10:10:26 -0000      1.4.2.7.6.1
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# $Id: deletemem.pl,v 1.4.2.7 2006/02/05 21:59:21 kados Exp $
+# $Id: deletemem.pl,v 1.4.2.7.6.1 2007/02/12 10:10:26 toins Exp $
 
 #script to delete items
 #written 2/5/00
@@ -38,7 +38,7 @@
 my $input = new CGI;
 
 my $flagsrequired;
-$flagsrequired->{borrower}=1;
+$flagsrequired->{borrowers}=1;
 my ($loggedinuser, $cookie, $sessionID) = checkauth($input, 0, $flagsrequired);
 
 
@@ -54,9 +54,10 @@
 foreach (sort keys %$issues) {
        $i++;
 }
+my $userenv = C4::Context->userenv;
 my ($bor,$flags)=getpatroninformation(\%env, $member,'');
 if (C4::Context->preference("IndependantBranches")) {
-       my $userenv = C4::Context->userenv;
+       
        unless ($userenv->{flags} == 1){
                unless ($userenv->{'branch'} eq $bor->{'branchcode'}){
 #                      warn "user ".$userenv->{'branch'} ."borrower :". 
$bor->{'branchcode'};
@@ -70,14 +71,15 @@
 $sth->execute($member);
 my $data=$sth->fetchrow_hashref;
 $sth->finish;
-
-if ($i > 0 || $flags->{'CHARGES'} ne '' || $data ne ''){
+my $bor = getpatroninformation(\%env, $member,'');
+my $accessflags = $bor->{'authflags'};
+if ($i > 0 || $flags->{'CHARGES'} ne '' || $data ne '' || 
($accessflags->{'superlibrarian'} && $userenv->{flags} != 1)){
        my ($template, $borrowernumber, $cookie)
                = get_template_and_user({template_name => 
"members/deletemem.tmpl",
                                        query => $input,
                                        type => "intranet",
                                        authnotrequired => 0,
-                                       flagsrequired => {borrower => 1},
+                                       flagsrequired => {borrowers => 1},
                                        debug => 1,
                                        });
        #   print $input->header;
@@ -91,6 +93,9 @@
        if ($data ne '') {
                $template->param(guarantees => 1);
        }
+       if ($accessflags->{'superlibrarian'} && $userenv->{flags} != 1){
+         $template->param(superlibrarian => 'Member is a superlibrarian, and 
you are not');
+       }
 #      print "<table border=1>";
 #      if ($i > 0){
 #              print "<TR><TD>Items on Issue</td><td align=right>$i</td></tr>";