#
# 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 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.
+# 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.
+# You should have received a copy of the GNU General Public License
+# along with Koha; if not, see <http://www.gnu.org/licenses>.
use strict;
use warnings;
-use CGI;
+use CGI qw ( -utf8 );
use URI::Escape;
use C4::Auth;
use C4::Output;
use C4::AuthoritiesMarc;
use C4::Acquisition;
-use C4::Koha; # XXX subfield_is_koha_internal_p
+use C4::Koha;
use C4::Biblio;
+use C4::Search::History;
+
+use Koha::Authority::Types;
+use Koha::SearchEngine::Search;
+use Koha::SearchEngine::QueryBuilder;
+use Koha::Token;
my $query = new CGI;
my $dbh = C4::Context->dbh;
my ( $template, $loggedinuser, $cookie );
-my $authtypes = getauthtypes;
-my @authtypesloop;
-foreach my $thisauthtype (
- sort {
- $authtypes->{$a}{'authtypetext'} cmp $authtypes->{$b}{'authtypetext'}
- }
- keys %$authtypes
- )
-{
- my %row = (
- value => $thisauthtype,
- selected => $thisauthtype eq $authtypecode,
- authtypetext => $authtypes->{$thisauthtype}{'authtypetext'},
- );
- push @authtypesloop, \%row;
-}
+my $authority_types = Koha::Authority::Types->search( {}, { order_by => ['authtypetext'] } );
if ( $op eq "delete" ) {
( $template, $loggedinuser, $cookie ) = get_template_and_user(
{
- template_name => "authorities/authorities-home.tmpl",
+ template_name => "authorities/authorities-home.tt",
query => $query,
type => 'intranet',
authnotrequired => 0,
debug => 1,
}
);
- &DelAuthority( $authid, 1 );
+
+ die "Wrong CSRF token" unless Koha::Token->new->check_csrf({
+ session_id => scalar $query->cookie('CGISESSID'),
+ token => scalar $query->param('csrf_token'),
+ });
+
+ DelAuthority({ authid => $authid });
if ( $query->param('operator') ) {
# query contains search params so perform search
my $startfrom = $query->param('startfrom') || 1;
my $resultsperpage = $query->param('resultsperpage') || 20;
- my ( $results, $total ) = SearchAuthorities(
- [$marclist], [$and_or],
- [$excluding], [$operator],
- [$value], ( $startfrom - 1 ) * $resultsperpage,
- $resultsperpage, $authtypecode,
- $orderby
+ my $builder = Koha::SearchEngine::QueryBuilder->new(
+ { index => $Koha::SearchEngine::AUTHORITIES_INDEX } );
+ my $searcher = Koha::SearchEngine::Search->new(
+ { index => $Koha::SearchEngine::AUTHORITIES_INDEX } );
+ my $search_query = $builder->build_authorities_query_compat(
+ [$marclist], [$and_or], [$excluding], [$operator],
+ [$value], $authtypecode, $orderby
);
+ my $offset = ( $startfrom - 1 ) * $resultsperpage + 1;
+ my ( $results, $total ) =
+ $searcher->search_auth_compat( $search_query, $offset,
+ $resultsperpage );
+ #my ( $results, $total ) = SearchAuthorities(
+ # [$marclist], [$and_or],
+ # [$excluding], [$operator],
+ # [$value], ( $startfrom - 1 ) * $resultsperpage,
+ # $resultsperpage, $authtypecode,
+ # $orderby
+ #);
+
( $template, $loggedinuser, $cookie ) = get_template_and_user(
{
- template_name => "authorities/searchresultlist.tmpl",
+ template_name => "authorities/searchresultlist.tt",
query => $query,
type => 'intranet',
authnotrequired => 0,
}
);
+ $template->param(
+ csrf_token => Koha::Token->new->generate_csrf({
+ session_id => scalar $query->cookie('CGISESSID'),
+ }),
+ );
+
+ # search history
+ if (C4::Context->preference('EnableSearchHistory')) {
+ if ( $startfrom == 1) {
+ my $path_info = $query->url(-path_info=>1);
+ my $query_cgi_history = $query->url(-query=>1);
+ $query_cgi_history =~ s/^$path_info\?//;
+ $query_cgi_history =~ s/;/&/g;
+
+ C4::Search::History::add({
+ userid => $loggedinuser,
+ sessionid => $query->cookie("CGISESSID"),
+ query_desc => $value,
+ query_cgi => $query_cgi_history,
+ total => $total,
+ type => "authority",
+ });
+ }
+ }
+
$template->param(
marclist => $marclist,
and_or => $and_or,
# next/previous would not work anymore
# construction of the url of each page
- my $value_url = uri_escape($value);
+ my $value_url = uri_escape_utf8($value);
my $base_url = "authorities-home.pl?"
."marclist=$marclist"
."&and_or=$and_or"
if ( $op eq '' ) {
( $template, $loggedinuser, $cookie ) = get_template_and_user(
{
- template_name => "authorities/authorities-home.tmpl",
+ template_name => "authorities/authorities-home.tt",
query => $query,
type => 'intranet',
authnotrequired => 0,
}
$template->param(
- authtypesloop => \@authtypesloop,
+ authority_types => $authority_types,
op => $op,
);
projects / koha.git / blobdiff