gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 38936: Use redirect_if_opac_suppressed() in opac-*detail.pl pages 

Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
Signed-off-by: David Nind <david@davidnind.com>
Signed-off-by: Martin Renvoize <martin.renvoize@openfifth.co.uk>
Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
This commit is contained in:
Tomas Cohen Arazi 2025-01-21 08:33:06 -03:00 committed by Lucas Gass
parent 7dc6af40f6
commit 844c2c6209
No known key found for this signature in database
GPG Key ID: 60B447398B0D36CA
3 changed files with 9 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
opac/opac-ISBDdetail.pl
View File

@ -42,7 +42,7 @@ use Modern::Perl;
use C4::Auth qw( get_template_and_user );
use C4::Context;
use C4::Output qw( parametrized_url output_html_with_http_headers );
use C4::Output qw( parametrized_url output_html_with_http_headers redirect_if_opac_suppressed );
use CGI qw ( -utf8 );
use C4::Biblio qw(
CountItemsIssued
@ -76,31 +76,8 @@ if ( !$biblio ) {
}
# If record should be suppressed, handle it early
if ( C4::Context->preference('OpacSuppression') ) {
# redirect to opac-blocked info page or 404?
my $redirect_url;
if ( C4::Context->preference("OpacSuppressionRedirect") ) {
$redirect_url = "/cgi-bin/koha/opac-blocked.pl";
} else {
$redirect_url = "/cgi-bin/koha/errors/404.pl";
}
if ( $biblio->opac_suppressed() ) {
# 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($redirect_url);
exit;
}
} else {
print $query->redirect($redirect_url);
exit;
}
}
}
redirect_if_opac_suppressed( $query, $biblio )
if C4::Context->preference('OpacSuppression');
#open template
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(

29
opac/opac-MARCdetail.pl
View File

@ -46,7 +46,7 @@ use Modern::Perl;
use C4::Auth qw( get_template_and_user );
use C4::Context;
use C4::Output qw( parametrized_url output_html_with_http_headers );
use C4::Output qw( parametrized_url output_html_with_http_headers redirect_if_opac_suppressed );
use CGI qw ( -utf8 );
use C4::Biblio qw(
CountItemsIssued
@ -97,31 +97,8 @@ if ( !$biblio ) {
}
# If record should be suppressed, handle it early
if ( C4::Context->preference('OpacSuppression') ) {
# redirect to opac-blocked info page or 404?
my $redirect_url;
if ( C4::Context->preference("OpacSuppressionRedirect") ) {
$redirect_url = "/cgi-bin/koha/opac-blocked.pl";
} else {
$redirect_url = "/cgi-bin/koha/errors/404.pl";
}
if ( $biblio->opac_suppressed() ) {
# 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($redirect_url);
exit;
}
} else {
print $query->redirect($redirect_url);
exit;
}
}
}
redirect_if_opac_suppressed( $query, $biblio )
if C4::Context->preference('OpacSuppression');
unless ( $patron and $patron->category->override_hidden_items ) {

29
opac/opac-detail.pl
View File

@ -33,7 +33,7 @@ use C4::Koha qw(
);
use C4::Search qw( new_record_from_zebra searchResults getRecords );
use C4::Serials qw( CountSubscriptionFromBiblionumber SearchSubscriptions GetLatestSerials );
use C4::Output qw( parametrized_url output_html_with_http_headers );
use C4::Output qw( parametrized_url output_html_with_http_headers redirect_if_opac_suppressed );
use C4::Biblio qw(
CountItemsIssued
GetBiblioData
@ -112,31 +112,8 @@ unless ( $biblio && $record ) {
}
# If record should be suppressed, handle it early
if ( C4::Context->preference('OpacSuppression') ) {
# redirect to opac-blocked info page or 404?
my $redirect_url;
if ( C4::Context->preference("OpacSuppressionRedirect") ) {
$redirect_url = "/cgi-bin/koha/opac-blocked.pl";
} else {
$redirect_url = "/cgi-bin/koha/errors/404.pl";
}
if ( $biblio->opac_suppressed() ) {
# 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($redirect_url);
exit;
}
} else {
print $query->redirect($redirect_url);
exit;
}
}
}
redirect_if_opac_suppressed( $query, $biblio )
if C4::Context->preference('OpacSuppression');
my $metadata_extractor = $biblio->metadata_extractor;