functions that were in C4::Interface::CGI::Output are now in C4::Output.

[koha_gimpoz] / members / deletemem.pl

diff --git a/members/deletemem.pl b/members/deletemem.pl
index cb8753b..2a4b3c1 100755 (executable)
--- a/members/deletemem.pl
+++ b/members/deletemem.pl
@@ -28,51 +28,57 @@ use strict;
 
 use CGI;
 use C4::Context;
-use C4::Search;
-use C4::Interface::CGI::Output;
 use C4::Output;
-use C4::Circulation::Circ2;
+use C4::Circulation;
 use C4::Auth;
+use C4::Members;
 
 
 my $input = new CGI;
 
 my $flagsrequired;
-$flagsrequired->{borrower}=1;
+$flagsrequired->{borrowers}=1;
 my ($loggedinuser, $cookie, $sessionID) = checkauth($input, 0, $flagsrequired);
 
 
 
 #print $input->header;
 my $member=$input->param('member');
-my %env;
-$env{'nottodayissues'}=1;
 my %member2;
 $member2{'borrowernumber'}=$member;
-my $issues=currentissues(\%env,\%member2);
+my $issues=GetBorrowerIssues(\%member2);
 my $i=0;
 foreach (sort keys %$issues) {
        $i++;
 }
-my ($bor,$flags)=getpatroninformation(\%env, $member,'');
+my ($bor,$flags)=GetMemberDetails($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'};
+                       print $input->redirect("/cgi-bin/koha/members/moremember.pl?borrowernumber=$member");
+                       exit 1;
+               }
+       }
+}
 my $dbh = C4::Context->dbh;
-my $sth=$dbh->prepare("Select * from borrowers where guarantor=?");
+my $sth=$dbh->prepare("Select * from borrowers where guarantorid=?");
 $sth->execute($member);
 my $data=$sth->fetchrow_hashref;
 $sth->finish;
-
-
-if ($i > 0 || $flags->{'CHARGES'} ne '' || $data ne ''){
+if ($i > 0 or $flags->{'CHARGES'}  or $data->{'borrowernumber'}){
+warn"je suis rentre dans la boucle";
        my ($template, $borrowernumber, $cookie)
                = get_template_and_user({template_name => "members/deletemem.tmpl",
                                        query => $input,
                                        type => "intranet",
                                        authnotrequired => 0,
-                                       flagsrequired => {circulate => 1},
+                                       flagsrequired => {borrowers => 1},
                                        debug => 1,
                                        });
        #   print $input->header;
-       $template->param(bornum => $member);
+       $template->param(borrowernumber => $member);
        if ($i >0) {
                $template->param(ItemsOnIssues => $i);
        }
@@ -93,27 +99,16 @@ if ($i > 0 || $flags->{'CHARGES'} ne '' || $data ne ''){
 #              print "<TR><TD>Guarantees</td></tr>";
 #      }
 #      print "</table>";
+$template->param(intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),
+               intranetstylesheet => C4::Context->preference("intranetstylesheet"),
+               IntranetNav => C4::Context->preference("IntranetNav"),
+               );
 output_html_with_http_headers $input, $cookie, $template->output;
 
 } else {
-       delmember($member);
+       MoveMemberToDeleted($member);
+       DelMember($member);
        print $input->redirect("/cgi-bin/koha/members/members-home.pl");
 }
 
-sub delmember{
-       my ($member)=@_;
-       my $dbh = C4::Context->dbh;
-       my $sth=$dbh->prepare("Select * from borrowers where borrowernumber=?");
-       $sth->execute($member);
-       my @data=$sth->fetchrow_array;
-       $sth->finish;
-       $sth=$dbh->prepare("Insert into deletedborrowers values (".("?,"x(scalar(@data)-1))."?)");
-       $sth->execute(@data);
-       $sth->finish;
-       $sth=$dbh->prepare("Delete from borrowers where borrowernumber=?");
-       $sth->execute($member);
-       $sth->finish;
-       $sth=$dbh->prepare("Delete from reserves where borrowernumber=?");
-       $sth->execute($member);
-       $sth->finish;
-}
+