#
# add OPAC suppression - requires at least one item indexed with Suppress
if (C4::Context->preference('OpacSuppression')) {
- $query = "($query) not Suppress=1";
+ # OPAC suppression by IP address
+ if (C4::Context->preference('OpacSuppressionByIPRange')) {
+ my $IPAddress = $ENV{'REMOTE_ADDR'};
+ my $IPRange = C4::Context->preference('OpacSuppressionByIPRange');
+ if ($IPAddress !~ /^$IPRange/) {
+ $query = "($query) not Suppress=1";
+ }
+ }
+ else {
+ $query = "($query) not Suppress=1";
+ }
}
$template->param ( LIMIT_INPUTS => \@limit_inputs );
# Adding the new search if needed
my $path_info = $cgi->url(-path_info=>1);
- $query_cgi = $cgi->url(-query=>1);
- $query_cgi =~ s/^$path_info\?//;
- $query_cgi =~ s/;/&/g;
- $query_desc .= ", $limit_desc";
+ my $query_cgi_history = $cgi->url(-query=>1);
+ $query_cgi_history =~ s/^$path_info\?//;
+ $query_cgi_history =~ s/;/&/g;
+ my $query_desc_history = "$query_desc, $limit_desc";
if (!$borrowernumber || $borrowernumber eq '') {
# To a cookie (the user is not logged in)
- if (($params->{'offset'}||'') eq '') {
+ if (!$offset) {
push @recentSearches, {
- "query_desc" => $query_desc || "unknown",
- "query_cgi" => $query_cgi || "unknown",
+ "query_desc" => $query_desc_history || "unknown",
+ "query_cgi" => $query_cgi_history || "unknown",
"time" => time(),
"total" => $total
};
}
else {
# To the session (the user is logged in)
- if (($params->{'offset'}||'') eq '') {
- AddSearchHistory($borrowernumber, $cgi->cookie("CGISESSID"), $query_desc, $query_cgi, $total);
+ if (!$offset) {
+ AddSearchHistory($borrowernumber, $cgi->cookie("CGISESSID"), $query_desc_history, $query_cgi_history, $total);
$template->param(ShowOpacRecentSearchLink => 1);
}
}