Bug 15344: Remove some other calls of GetMemberDetails from pl scripts

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

diff --git a/opac/opac-privacy.pl b/opac/opac-privacy.pl
index ca50560..2a98d8f 100755 (executable)
--- a/opac/opac-privacy.pl
+++ b/opac/opac-privacy.pl
@@ -3,39 +3,44 @@
 #
 # copyright 2009, BibLibre, paul.poulain@biblibre.com
 #
-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
+# Koha is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
 #
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+# Koha is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
 #
-# You should have received a copy of the GNU General Public License along with
-# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-# Suite 330, Boston, MA  02111-1307 USA
+# You should have received a copy of the GNU General Public License
+# along with Koha; if not, see <http://www.gnu.org/licenses>.
 
 use strict;
-use CGI;
+use CGI qw ( -utf8 );
 
 use C4::Auth;    # checkauth, getborrowernumber.
 use C4::Context;
 use C4::Circulation;
 use C4::Members;
 use C4::Output;
-use C4::Dates;
 
 my $query = new CGI;
+
+# if OPACPrivacy is disabled, leave immediately
+if ( ! C4::Context->preference('OPACPrivacy') || ! C4::Context->preference('opacreadinghistory') ) {
+    print $query->redirect("/cgi-bin/koha/errors/404.pl");
+    exit;
+}
+
 my $dbh   = C4::Context->dbh;
 
 my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
     {
-        template_name   => "opac-privacy.tmpl",
+        template_name   => "opac-privacy.tt",
         query           => $query,
         type            => "opac",
         authnotrequired => 0,
-        flagsrequired   => { borrow => 1 },
         debug           => 1,
     }
 );
@@ -51,12 +56,18 @@ if ($op eq "update_privacy")
 if ($op eq "delete_record") {
     # delete all reading records for items returned
     # uses a hardcoded date ridiculously far in the future
-    AnonymiseIssueHistory('2999-12-12',$borrowernumber);
+    my ($rows,$err_history_not_deleted) = AnonymiseIssueHistory('2999-12-12',$borrowernumber);
     # confirm the user the deletion has been done
-    $template->param('deleted' => 1);
+    if ( !$err_history_not_deleted ) {
+        $template->param( 'deleted' => 1 );
+    }
+    else {
+        $template->param( 'err_history_not_deleted' => 1 );
+    }
 }
+
 # get borrower privacy ....
-my ( $borr ) = GetMemberDetails( $borrowernumber );
+my $borr = C4::Members::GetMember( borrowernumber => $borrowernumber );
 
 $template->param( 'Ask_data'       => '1',
                     'privacy'.$borr->{'privacy'} => 1,
@@ -65,4 +76,4 @@ $template->param( 'Ask_data'       => '1',
                     'privacyview' => 1,
 );
 
-output_html_with_http_headers $query, $cookie, $template->output;
+output_html_with_http_headers $query, $cookie, $template->output, undef, { force_no_caching => 1 };