a469663d7b
- the dateformat value is send to all templates (from C4::Auth::get_template_and_user) - remove all assignment of dateformat in all .pl files - the DHTMLcalendar_dateformat variable is unused Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> Fixed conflicts: - opac/sco/sco-main.pl - reports/acquisitions_stats.pl - tools/cleanborrowers.pl All tests pass, perlcritic problems appeared in some files before and after these patches were applied. Checked sorting in following pages: - acqui/addorderiso2709.tt - list of staged imports in acq - acqui/histsearch.tt - sorting of dates in acq search result list - acqui/invoices.tt - billing date in list of invoices in acq - acqui/lateorders.tt - list of late orders in acq - acqui/ordered.tt - ordered titles and estimated costs for a fund - acqui/parcels.tt - receive shipment page - acqui/spent.tt - received titles and actual costs for a fund ... - serials-search.tt - subscription search result list ... - opac/sco/sco-main.tt - due dates in list of checked out items - reports/acquisitions-stats.tt - date searches, display of dates - tools/cleanborrowers.tt - tools.holidays.tt - different views of dates library is closed, adding dates Checked dates display according to system preference everywhere and searching, entering dates etc. still worked as expected. Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
150 lines
4.9 KiB
Perl
Executable file
150 lines
4.9 KiB
Perl
Executable file
#!/usr/bin/perl
|
|
|
|
# Copyright 2009 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 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 C4::Auth qw(:DEFAULT get_session);
|
|
use CGI;
|
|
use Storable qw(freeze thaw);
|
|
use C4::Context;
|
|
use C4::Output;
|
|
use C4::Log;
|
|
use C4::Items;
|
|
use C4::Debug;
|
|
use C4::Dates;
|
|
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.tmpl",
|
|
query => $cgi,
|
|
type => "opac",
|
|
authnotrequired => 1,
|
|
flagsrequired => {borrowers => 1},
|
|
debug => 1,
|
|
});
|
|
|
|
# If the user is not logged in, we deal with the cookie
|
|
if (!$loggedinuser) {
|
|
|
|
# Deleting search history
|
|
if ($cgi->param('action') && $cgi->param('action') eq 'delete') {
|
|
# Deleting cookie's content
|
|
my $recentSearchesCookie = $cgi->cookie(
|
|
-name => 'KohaOpacRecentSearches',
|
|
-value => freeze([]),
|
|
-expires => ''
|
|
);
|
|
|
|
# Redirecting to this same url with the cookie in the headers so it's deleted immediately
|
|
my $uri = $cgi->url();
|
|
print $cgi->redirect(-uri => $uri,
|
|
-cookie => $recentSearchesCookie);
|
|
|
|
# Showing search history
|
|
} else {
|
|
|
|
# Getting the cookie
|
|
my $searchcookie = $cgi->cookie('KohaOpacRecentSearches');
|
|
if ($searchcookie && thaw(uri_unescape($searchcookie))) {
|
|
my @recentSearches = @{thaw(uri_unescape($searchcookie))};
|
|
if (@recentSearches) {
|
|
|
|
# As the dates are stored as unix timestamps, let's do some formatting
|
|
foreach my $asearch (@recentSearches) {
|
|
|
|
# We create an iso date from the unix timestamp
|
|
my $isodate = strftime "%Y-%m-%d", localtime($asearch->{'time'});
|
|
|
|
# So we can create a C4::Dates object, to get the date formatted according to the dateformat syspref
|
|
my $date = C4::Dates->new($isodate, "iso");
|
|
my $sysprefdate = $date->output("syspref");
|
|
|
|
# We also get the time of the day from the unix timestamp
|
|
my $time = strftime " %H:%M:%S", localtime($asearch->{'time'});
|
|
|
|
# And we got our human-readable date :
|
|
$asearch->{'time'} = $sysprefdate . $time;
|
|
}
|
|
|
|
$template->param(recentSearches => \@recentSearches);
|
|
}
|
|
}
|
|
}
|
|
} else {
|
|
# And if the user is logged in, we deal with the database
|
|
|
|
my $dbh = C4::Context->dbh;
|
|
|
|
# Deleting search history
|
|
if ($cgi->param('action') && $cgi->param('action') eq 'delete') {
|
|
my $query = "DELETE FROM search_history WHERE userid = ?";
|
|
my $sth = $dbh->prepare($query);
|
|
$sth->execute($loggedinuser);
|
|
|
|
# Redirecting to this same url so the user won't see the search history link in the header
|
|
my $uri = $cgi->url();
|
|
print $cgi->redirect($uri);
|
|
|
|
|
|
# Showing search history
|
|
} else {
|
|
|
|
my $date = C4::Dates->new();
|
|
my $dateformat = $date->DHTMLcalendar() . " %H:%i:%S"; # Current syspref date format + standard time format
|
|
|
|
# Getting the data with date format work done by mysql
|
|
my $query = "SELECT userid, sessionid, query_desc, query_cgi, total, DATE_FORMAT(time, \"$dateformat\") as time FROM search_history WHERE userid = ? AND sessionid = ?";
|
|
my $sth = $dbh->prepare($query);
|
|
$sth->execute($loggedinuser, $cgi->cookie("CGISESSID"));
|
|
my $searches = $sth->fetchall_arrayref({});
|
|
$template->param(recentSearches => $searches);
|
|
|
|
# Getting searches from previous sessions
|
|
$query = "SELECT COUNT(*) FROM search_history WHERE userid = ? AND sessionid != ?";
|
|
$sth = $dbh->prepare($query);
|
|
$sth->execute($loggedinuser, $cgi->cookie("CGISESSID"));
|
|
|
|
# If at least one search from previous sessions has been performed
|
|
if ($sth->fetchrow_array > 0) {
|
|
$query = "SELECT userid, sessionid, query_desc, query_cgi, total, DATE_FORMAT(time, \"$dateformat\") as time FROM search_history WHERE userid = ? AND sessionid != ?";
|
|
$sth = $dbh->prepare($query);
|
|
$sth->execute($loggedinuser, $cgi->cookie("CGISESSID"));
|
|
my $previoussearches = $sth->fetchall_arrayref({});
|
|
$template->param(previousSearches => $previoussearches);
|
|
|
|
}
|
|
|
|
$sth->finish;
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
$template->param(searchhistoryview => 1);
|
|
|
|
output_html_with_http_headers $cgi, $cookie, $template->output;
|
|
|
|
|