Bug 18469: QA Follow-up

[koha.git] / members / deletemem.pl

diff --git a/members/deletemem.pl b/members/deletemem.pl
index 34403fa..5ea015a 100755 (executable)
--- a/members/deletemem.pl
+++ b/members/deletemem.pl
@@ -25,14 +25,12 @@ use strict;
 #use warnings; FIXME - Bug 2505
 
 use CGI qw ( -utf8 );
-use Digest::MD5 qw(md5_base64);
 use C4::Context;
 use C4::Output;
 use C4::Auth;
 use C4::Members;
-use C4::Branch; # GetBranches
 use Module::Load;
-use Koha::Patron::Images;
+use Koha::Patrons;
 use Koha::Token;
 
 if ( C4::Context->preference('NorwegianPatronDBEnable') && C4::Context->preference('NorwegianPatronDBEnable') == 1 ) {
@@ -56,7 +54,7 @@ my $member       = $input->param('member');
 #Do not delete yourself...
 if ($borrowernumber == $member ) {
     print $input->redirect("/cgi-bin/koha/members/moremember.pl?borrowernumber=$member&error=CANT_DELETE_YOURSELF");
-    exit 1;
+    exit 0; # Exit without error
 }
 
 # Handle deletion from the Norwegian national patron database, if it is enabled
@@ -76,30 +74,30 @@ if ( C4::Context->preference('NorwegianPatronDBEnable') && C4::Context->preferen
 my $issues = GetPendingIssues($member);     # FIXME: wasteful call when really, we only want the count
 my $countissues = scalar(@$issues);
 
-my ($bor)=GetMemberDetails($member,'');
-my $flags=$bor->{flags};
+my $patron = Koha::Patrons->find( $member );
+my $flags = C4::Members::patronflags( $patron->unblessed );
 my $userenv = C4::Context->userenv;
 
  
 
-if ($bor->{category_type} eq "S") {
+if ($patron->category->category_type eq "S") {
     unless(C4::Auth::haspermission($userenv->{'id'},{'staffaccess'=>1})) {
         print $input->redirect("/cgi-bin/koha/members/moremember.pl?borrowernumber=$member&error=CANT_DELETE_STAFF");
-        exit 1;
+        exit 0; # Exit without error
     }
 } else {
     unless(C4::Auth::haspermission($userenv->{'id'},{'borrowers'=>1})) {
        print $input->redirect("/cgi-bin/koha/members/moremember.pl?borrowernumber=$member&error=CANT_DELETE");
-       exit 1;
+        exit 0; # Exit without error
     }
 }
 
 if (C4::Context->preference("IndependentBranches")) {
     my $userenv = C4::Context->userenv;
-    if ( !C4::Context->IsSuperLibrarian() && $bor->{'branchcode'}){
-        unless ($userenv->{branch} eq $bor->{'branchcode'}){
+    if ( !C4::Context->IsSuperLibrarian() && $patron->branchcode){
+        unless ($userenv->{branch} eq $patron->branchcode){
             print $input->redirect("/cgi-bin/koha/members/moremember.pl?borrowernumber=$member&error=CANT_DELETE_OTHERLIBRARY");
-            exit;
+            exit 0; # Exit without error
         }
     }
 }
@@ -108,27 +106,28 @@ my $op = $input->param('op') || 'delete_confirm';
 my $dbh = C4::Context->dbh;
 my $is_guarantor = $dbh->selectrow_array("SELECT COUNT(*) FROM borrowers WHERE guarantorid=?", undef, $member);
 if ( $op eq 'delete_confirm' or $countissues > 0 or $flags->{'CHARGES'}  or $is_guarantor or $deletelocal == 0) {
-    my $patron_image = Koha::Patron::Images->find($bor->{borrowernumber});
-    $template->param( picture => 1 ) if $patron_image;
-
-    $template->param(borrowernumber => $member,
-        surname => $bor->{'surname'},
-        title => $bor->{'title'},
-        cardnumber => $bor->{'cardnumber'},
-        firstname => $bor->{'firstname'},
-        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'}),
-               activeBorrowerRelationship => (C4::Context->preference('borrowerRelationship') ne ''),
+    $template->param( picture => 1 ) if $patron->image;
+
+    $template->param( adultborrower => 1 ) if $patron->category->category_type =~ /^(A|I)$/;
+
+    $template->param(
+        # FIXME The patron object should be passed to the template
+        borrowernumber => $patron->borrowernumber,
+        surname => $patron->surname,
+        title => $patron->title,
+        cardnumber => $patron->cardnumber,
+        firstname => $patron->firstname,
+        categorycode => $patron->categorycode,
+        category_type => $patron->category->category_type,
+        categoryname  => $patron->category->description,
+        address => $patron->address,
+        address2 => $patron->address2,
+        city => $patron->city,
+        zipcode => $patron->zipcode,
+        country => $patron->country,
+        phone => $patron->phone,
+        email => $patron->email,
+        branchcode => $patron->branchcode,
         RoutingSerials => C4::Context->preference('RoutingSerials'),
     );
     if ($countissues >0) {
@@ -147,27 +146,22 @@ if ( $op eq 'delete_confirm' or $countissues > 0 or $flags->{'CHARGES'}  or $is_
     if ( not $countissues > 0 and not $flags->{CHARGES} ne '' and not $is_guarantor and not $deletelocal == 0 ) {
         $template->param(
             op         => 'delete_confirm',
-            csrf_token => Koha::Token->new->generate_csrf(
-                {   id     => C4::Context->userenv->{id},
-                    secret => md5_base64( C4::Context->config('pass') ),
-                }
-            ),
+            csrf_token => Koha::Token->new->generate_csrf({ session_id => scalar $input->cookie('CGISESSID') }),
         );
     }
 } elsif ( $op eq 'delete_confirmed' ) {
 
     die "Wrong CSRF token"
-        unless Koha::Token->new->check_csrf({
-            id     => C4::Context->userenv->{id},
-            secret => md5_base64( C4::Context->config('pass') ),
+        unless Koha::Token->new->check_csrf( {
+            session_id => $input->cookie('CGISESSID'),
             token  => scalar $input->param('csrf_token'),
         });
-    MoveMemberToDeleted($member);
-    C4::Members::HandleDelBorrower($member);
-    DelMember($member);
+    my $patron = Koha::Patrons->find( $member );
+    $patron->move_to_deleted;
+    $patron->delete;
     # TODO Tell the user everything went ok
     print $input->redirect("/cgi-bin/koha/members/members-home.pl");
-    exit 1;
+    exit 0; # Exit without error
 }
 
 output_html_with_http_headers $input, $cookie, $template->output;