Marcel de Rooy
e429db4746
This patch makes the following changes, as requested by QA:
[1] UploadedFile->delete always calls SUPER::delete.
The return value normally comes from SUPER::delete; if removing the
file failed, we return false. Two warns are kept.
Since delete does no longer return the filename, a few changes were
needed in tools/upload.pl.
[2] Method getCategories is moved to UploadedFiles. Script tools/upload.pl
now only contains one call. Added a use C4::Koha.
[3] Calls UploadedFiles->delete as class method. As a result I removed
method delete_errors for now; may be reconsidered on a new report.
[4] Adjusted three ->search calls for id and public to ->find calls.
[5] If you pass no id to upload.pl when deleting, you don't get an alert.
All by all, we got rid of 15 lines !
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
113 lines
3.4 KiB
Prolog
Executable file
113 lines
3.4 KiB
Prolog
Executable file
#!/usr/bin/perl
|
|
|
|
# This file is part of Koha.
|
|
#
|
|
# Copyright (C) 2015 Rijksmuseum
|
|
#
|
|
# 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 CGI qw/-utf8/;
|
|
use JSON;
|
|
|
|
use C4::Auth;
|
|
use C4::Output;
|
|
use Koha::UploadedFiles;
|
|
|
|
my $input = CGI::->new;
|
|
my $op = $input->param('op') // 'new';
|
|
my $plugin = $input->param('plugin');
|
|
my $index = $input->param('index'); # MARC editor input field id
|
|
my $term = $input->param('term');
|
|
my $id = $input->param('id');
|
|
my $msg = $input->param('msg');
|
|
|
|
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
|
|
{ template_name => "tools/upload.tt",
|
|
query => $input,
|
|
type => "intranet",
|
|
authnotrequired => 0,
|
|
flagsrequired => { tools => 'upload_general_files' },
|
|
}
|
|
);
|
|
|
|
$template->param(
|
|
index => $index,
|
|
owner => $loggedinuser,
|
|
plugin => $plugin,
|
|
uploadcategories => Koha::UploadedFiles->getCategories,
|
|
);
|
|
|
|
if ( $op eq 'new' ) {
|
|
$template->param(
|
|
mode => 'new',
|
|
);
|
|
output_html_with_http_headers $input, $cookie, $template->output;
|
|
|
|
} elsif ( $op eq 'search' ) {
|
|
my $uploads;
|
|
if( $id ) {
|
|
my $rec = Koha::UploadedFiles->find( $id );
|
|
undef $rec if $rec && $plugin && !$rec->public;
|
|
push @$uploads, $rec->unblessed if $rec;
|
|
} else {
|
|
$uploads = Koha::UploadedFiles->search_term({
|
|
term => $term,
|
|
$plugin? (): ( include_private => 1 ),
|
|
})->unblessed;
|
|
}
|
|
|
|
$template->param(
|
|
mode => 'report',
|
|
msg => $msg,
|
|
uploads => $uploads,
|
|
);
|
|
output_html_with_http_headers $input, $cookie, $template->output;
|
|
|
|
} elsif ( $op eq 'delete' ) {
|
|
# delete only takes the id parameter
|
|
my $rec = Koha::UploadedFiles->find($id);
|
|
undef $rec if $rec && $plugin && !$rec->public;
|
|
my $fn = $rec ? $rec->filename : '';
|
|
my $delete = $rec ? $rec->delete : undef;
|
|
#TODO Improve error handling
|
|
my $msg = $delete
|
|
? JSON::to_json({ $fn => 6 })
|
|
: $id
|
|
? JSON::to_json({ $fn || $id, 7 })
|
|
: '';
|
|
$template->param(
|
|
mode => 'deleted',
|
|
msg => $msg,
|
|
);
|
|
output_html_with_http_headers $input, $cookie, $template->output;
|
|
|
|
} elsif ( $op eq 'download' ) {
|
|
my $rec = Koha::UploadedFiles->find( $id );
|
|
undef $rec if $rec && $plugin && !$rec->public;
|
|
my $fh = $rec? $rec->file_handle: undef;
|
|
if ( !$rec || !$fh ) {
|
|
$template->param(
|
|
mode => 'new',
|
|
msg => JSON::to_json( { $id => 5 } ),
|
|
);
|
|
output_html_with_http_headers $input, $cookie, $template->output;
|
|
} else {
|
|
print Encode::encode_utf8( $input->header( $rec->httpheaders ) );
|
|
while (<$fh>) {
|
|
print $_;
|
|
}
|
|
$fh->close;
|
|
}
|
|
}
|