X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;ds=sidebyside;f=opac%2Fopac-privacy.pl;h=09ca341d2e12de0e8ed83f3bcd28716282897dc3;hb=2def11d678c3f15b63de3f4980cf9c59b40ff718;hp=bbfb8fc6da1e1099aab40d457b8b3ddc40a58df3;hpb=5432bd488f2cd842f4fece93c42423a3fc26143b;p=koha.git

diff --git a/opac/opac-privacy.pl b/opac/opac-privacy.pl
index bbfb8fc6da..09ca341d2e 100755
--- a/opac/opac-privacy.pl
+++ b/opac/opac-privacy.pl
@@ -3,21 +3,21 @@
 #
 # 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.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 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;
@@ -27,15 +27,21 @@ 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,9 +57,14 @@ 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 );