Koha/opac/opac-search-history.pl
Martin Renvoize 94e09b6a18 BUG 18505: opac-search-history does not respect opacPublic
The opac-search-history page was available regardless of the opacPublic setting, this
patch corrects that.

Test plan, set opacPublic to 'No', test whether opac-search-history page is available
when not logged in, note that it is.
Apply patch, test whether opac-search-history is still available when not logged in,
note that you should be redirected to the login page.

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
2017-05-08 10:16:20 -04:00

160 lines
5 KiB
Perl
Executable file

#!/usr/bin/perl
# Copyright 2013 BibLibre SARL
#
# 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 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.
#
# You should have received a copy of the GNU General Public License
# along with Koha; if not, see <http://www.gnu.org/licenses>.
use Modern::Perl;
use C4::Auth qw(:DEFAULT get_session);
use CGI qw ( -utf8 );
use C4::Context;
use C4::Output;
use C4::Log;
use C4::Items;
use C4::Debug;
use C4::Search::History;
use URI::Escape;
use POSIX qw(strftime);
my $cgi = new CGI;
# Getting the template and auth
my ($template, $loggedinuser, $cookie) = get_template_and_user(
{
template_name => "opac-search-history.tt",
query => $cgi,
type => "opac",
authnotrequired => ( C4::Context->preference("OpacPublic") ? 1 : 0 ),
flagsrequired => {borrowers => 1},
debug => 1,
}
);
my $type = $cgi->param('type');
my $action = $cgi->param('action') || q{};
my $previous = $cgi->param('previous');
# If the user is not logged in, we deal with the session
unless ( $loggedinuser ) {
# Deleting search history
if ( $action eq 'delete') {
# Deleting session's search history
my @id = $cgi->multi_param('id');
my $all = not scalar( @id );
my $type = $cgi->param('type');
my @searches = ();
unless ( $all ) {
@searches = C4::Search::History::get_from_session({ cgi => $cgi });
if ( $type ) {
@searches = map { $_->{type} ne $type ? $_ : () } @searches;
}
if ( @id ) {
@searches = map { my $search = $_; ( grep {/^$search->{id}$/} @id ) ? () : $_ } @searches;
}
}
C4::Search::History::set_to_session({ cgi => $cgi, search_history => \@searches });
# Redirecting to this same url so the user won't see the search history link in the header
print $cgi->redirect(-uri => '/cgi-bin/koha/opac-search-history.pl');
# Showing search history
} else {
# Getting the searches from session
my @current_searches = C4::Search::History::get_from_session({
cgi => $cgi,
});
my @current_biblio_searches = map {
$_->{type} eq 'biblio' ? $_ : ()
} @current_searches;
my @current_authority_searches = map {
$_->{type} eq 'authority' ? $_ : ()
} @current_searches;
$template->param(
current_biblio_searches => \@current_biblio_searches,
current_authority_searches => \@current_authority_searches,
);
}
} else {
# And if the user is logged in, we deal with the database
my $dbh = C4::Context->dbh;
# Deleting search history
if ( $action eq 'delete' ) {
my @id = $cgi->multi_param('id');
if ( @id ) {
C4::Search::History::delete(
{
userid => $loggedinuser,
id => [ $cgi->param('id') ],
}
);
} else {
C4::Search::History::delete(
{
userid => $loggedinuser,
}
);
}
# Redirecting to this same url so the user won't see the search history link in the header
print $cgi->redirect(-uri => '/cgi-bin/koha/opac-search-history.pl');
# Showing search history
} else {
my $current_searches = C4::Search::History::get({
userid => $loggedinuser,
sessionid => $cgi->cookie("CGISESSID")
});
my @current_biblio_searches = map {
$_->{type} eq 'biblio' ? $_ : ()
} @$current_searches;
my @current_authority_searches = map {
$_->{type} eq 'authority' ? $_ : ()
} @$current_searches;
my $previous_searches = C4::Search::History::get({
userid => $loggedinuser,
sessionid => $cgi->cookie("CGISESSID"),
previous => 1
});
my @previous_biblio_searches = map {
$_->{type} eq 'biblio' ? $_ : ()
} @$previous_searches;
my @previous_authority_searches = map {
$_->{type} eq 'authority' ? $_ : ()
} @$previous_searches;
$template->param(
current_biblio_searches => \@current_biblio_searches,
current_authority_searches => \@current_authority_searches,
previous_biblio_searches => \@previous_biblio_searches,
previous_authority_searches => \@previous_authority_searches,
);
}
}
$template->param(searchhistoryview => 1);
output_html_with_http_headers $cgi, $cookie, $template->output, undef, { force_no_caching => 1 };