Bug 20696: Fix a few ugly "eq undef" comparisons in Search.pm

[koha.git] / opac / opac-privacy.pl

diff --git a/opac/opac-privacy.pl b/opac/opac-privacy.pl
index 51fc7cd..8796a7a 100755 (executable)
--- a/opac/opac-privacy.pl
+++ b/opac/opac-privacy.pl
@@ -21,9 +21,9 @@ use CGI qw ( -utf8 );
 
 use C4::Auth;    # checkauth, getborrowernumber.
 use C4::Context;
-use C4::Circulation;
 use C4::Members;
 use C4::Output;
+use Koha::Patrons;
 
 my $query = new CGI;
 
@@ -60,29 +60,28 @@ if ( $op eq "update_privacy" ) {
 elsif ( $op eq "delete_record" ) {
 
     # delete all reading records for items returned
-    # uses a hardcoded date ridiculously far in the future
-    my ( $rows, $err_history_not_deleted ) =
-      AnonymiseIssueHistory( '2999-12-12', $borrowernumber );
-
-    # confirm the user the deletion has been done
-    if ( !$err_history_not_deleted ) {
-        $template->param( 'deleted' => 1 );
-    }
-    else {
-        $template->param( 'err_history_not_deleted' => 1 );
-    }
+    my $rows = eval {
+        Koha::Patrons->search({ 'me.borrowernumber' => $borrowernumber })->anonymise_issue_history;
+    };
+    $template->param(
+        (
+              $@    ? ( history_not_deleted => 1 )
+            : $rows ? ( deleted             => int($rows) )
+            :         ( nothing_to_delete => 1 )
+        )
+    );
 }
 
 # get borrower privacy ....
-my $borrower = C4::Members::GetMember( borrowernumber => $borrowernumber );
+my $borrower = Koha::Patrons->find( $borrowernumber );;
 
 $template->param(
-    'Ask_data'                         => 1,
-    'privacy' . $borrower->{'privacy'} => 1,
-    'privacyview'                      => 1,
-    'borrower'                         => $borrower,
-    'surname'                          => $borrower->{surname},
-    'firstname'                        => $borrower->{firstname},
+    'Ask_data'                       => 1,
+    'privacy' . $borrower->privacy() => 1,
+    'privacyview'                    => 1,
+    'borrower'                       => $borrower,
+    'surname'                        => $borrower->surname,
+    'firstname'                      => $borrower->firstname,
 );
 
 output_html_with_http_headers $query, $cookie, $template->output, undef, { force_no_caching => 1 };