@@ -, +, @@ Observe that your record is found. Observe that it is accessible. Copy the URL for later(!). Observe that your record is not found. Observe that you are redirected to opac-blocked and it displays a Observe that the text you entered in OpacSuppressionMessage is Observe that you are redirected to Koha's 404 error page. --- installer/data/mysql/sysprefs.sql | 2 + installer/data/mysql/updatedatabase.pl | 8 ++++ .../en/modules/admin/preferences/cataloguing.pref | 11 +++++- .../opac-tmpl/prog/en/modules/opac-blocked.tt | 32 ++++++++++++++++ opac/opac-blocked.pl | 38 ++++++++++++++++++++ opac/opac-detail.pl | 30 +++++++++++++++ 6 files changed, 120 insertions(+), 1 deletions(-) create mode 100644 koha-tmpl/opac-tmpl/prog/en/modules/opac-blocked.tt create mode 100755 opac/opac-blocked.pl --- a/installer/data/mysql/sysprefs.sql +++ a/installer/data/mysql/sysprefs.sql @@ -430,3 +430,5 @@ INSERT IGNORE INTO systempreferences (variable,value,explanation,options,type) V INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('CalculateFinesOnReturn','1','Switch to control if overdue fines are calculated on return or not', '', 'YesNo'); INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('AcqWarnOnDuplicateInvoice','0','Warn librarians when they try to create a duplicate invoice', '', 'YesNo'); INSERT IGNORE INTO systempreferences (variable,value,explanation,options,type) VALUES ('AllowTooManyOverride', '1', 'If on, allow staff to override and check out items when the patron has reached the maximum number of allowed checkouts', '', 'YesNo'); +INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('OpacSuppressionRedirect','1','Redirect the opac detail page for suppressed records to an explanatory page (otherwise redirect to 404 error page)','','YesNo'); +INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('OpacSuppressionMessage','','Display this message on the redirect page for suppressed biblios','70|10','Textarea'); --- a/installer/data/mysql/updatedatabase.pl +++ a/installer/data/mysql/updatedatabase.pl @@ -7067,6 +7067,14 @@ if ( CheckVersion($DBversion) ) { SetVersion($DBversion); } +$DBversion = "3.13.00.XXX"; +if ( CheckVersion($DBversion) ) { + $dbh->do("INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('OpacSuppressionRedirect','1','Redirect the opac detail page for suppressed records to an explanatory page (otherwise redirect to 404 error page)','','YesNo')"); + $dbh->do("INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('OpacSuppressionMessage', '','Display this message on the redirect page for suppressed biblios','70|10','Textarea')"); + print "Upgrade to $DBversion done (Bug 10195: Records hidden with OpacSuppression can still be accessed)\n"; + SetVersion($DBversion); +} + =head1 FUNCTIONS =head2 TableExists($table) --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/cataloguing.pref +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/cataloguing.pref @@ -156,10 +156,19 @@ Cataloging: yes: Hide no: "Don't hide" - items marked as suppressed from OPAC search results. Note that you must have the Suppress index set up in Zebra and at least one suppressed item, or your searches will be broken. - - Restrict the suppression to IP adresses outside of the IP range + -
Restrict the suppression to IP adresses outside of the IP range - pref: OpacSuppressionByIPRange class: short - (Leave blank if not used. Define a range like 192.168..) + -
Redirect the opac detail page for suppressed records to + - pref: OpacSuppressionRedirect + choices: + yes: "an explanatory page ('This record is blocked')." + no: "the 404 error page ('Not found')." + -
Display the following message on the redirect page for suppressed biblios + - pref: OpacSuppressionMessage + type: textarea + class: code - - pref: SeparateHoldings choices: --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-blocked.tt +++ a/koha-tmpl/opac-tmpl/prog/en/modules/opac-blocked.tt @@ -0,0 +1,32 @@ +[% USE Koha %] +[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog › Blocked +[% INCLUDE 'doc-head-close.inc' %] + + +[% IF ( OpacNav ) %]
[% ELSE %]
[% END %] +
+[% INCLUDE 'masthead.inc' %] + +
+
+
+
+

Blocked

+

You are not authorized to view this record.

+ [% IF ( OpacSuppressionMessage ) %] +
+

[% OpacSuppressionMessage %]

+
+ [% END %] +
+
+
+
+[% IF ( OpacNav ) %] +
+
+[% INCLUDE 'navigation.inc' %] +
+
[% END %] +
+[% INCLUDE 'opac-bottom.inc' %] --- a/opac/opac-blocked.pl +++ a/opac/opac-blocked.pl @@ -0,0 +1,38 @@ +#!/usr/bin/perl + +# This file is part of Koha. +# +# 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 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 + + +use strict; +use warnings; +use CGI; +use C4::Auth; +use C4::Output; +use C4::Context; + +my $query = new CGI; +my ( $template, $borrowernumber, $cookie ) = get_template_and_user( + { + template_name => "opac-blocked.tt", + query => $query, + type => "opac", + authnotrequired => ( C4::Context->preference("OpacPublic") ? 1 : 0 ), + } +); + +$template->param ( OpacSuppressionMessage => C4::Context->preference('OpacSuppressionMessage')); + +output_with_http_headers $query, $cookie, $template->output, 'html'; --- a/opac/opac-detail.pl +++ a/opac/opac-detail.pl @@ -78,6 +78,36 @@ if ( ! $record ) { print $query->redirect("/cgi-bin/koha/errors/404.pl"); # escape early exit; } + +# redirect if opacsuppression is enabled and biblio is suppressed +if (C4::Context->preference('OpacSuppression')) { + my $opacsuppressionfield = '942'; + my $opacsuppressionfieldvalue = $record->field($opacsuppressionfield); + # redirect to opac-blocked info page or 404? + my $opacsuppressionredirect; + if ( C4::Context->preference("OpacSuppressionRedirect") ) { + $opacsuppressionredirect = "/cgi-bin/koha/opac-blocked.pl"; + } + else { + $opacsuppressionredirect = "/cgi-bin/koha/errors/404.pl"; + } + if ( $opacsuppressionfieldvalue->subfield("n") == 1) { + # if OPAC suppression by IP address + if (C4::Context->preference('OpacSuppressionByIPRange')) { + my $IPAddress = $ENV{'REMOTE_ADDR'}; + my $IPRange = C4::Context->preference('OpacSuppressionByIPRange'); + if ($IPAddress !~ /^$IPRange/) { + print $query->redirect($opacsuppressionredirect); + exit; + } + } + else { + print $query->redirect($opacsuppressionredirect); + exit; + } + } +} + $template->param( biblionumber => $biblionumber ); # get biblionumbers stored in the cart --