1076a0edf3
After uploading a plugin the error log indicates
use of uninitialized value in $op. This patch
silences the noise.
To test:
1) Set <enable_plugins> to 1 (one) in koha-conf.xml.
2) Set the UseKohaPlugins system preference to 'Enable'.
3) Navigate to Administration -> Manage plugins.
4) Install the test plugin KPZ file attached to this bug.
5) Notice the uninitialized value noise in the error log.
6) Uninstall the plugin (plack restart may be required if plack is
enabled).
7) Apply patch.
8) Install the plugin again.
9) Notice no noise in the error log.
10) Run qa tools.
11) Run prove t/db_dependent/Plugins.t
Signed-off-by: Mark Tompsett <mtompset@hotmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
104 lines
3.4 KiB
Perl
Executable file
104 lines
3.4 KiB
Perl
Executable file
#!/usr/bin/perl
|
|
|
|
#
|
|
# 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 strict;
|
|
use warnings;
|
|
|
|
use Archive::Extract;
|
|
use File::Temp;
|
|
use File::Copy;
|
|
use CGI qw ( -utf8 );
|
|
|
|
use C4::Context;
|
|
use C4::Auth;
|
|
use C4::Output;
|
|
use C4::Members;
|
|
use C4::Debug;
|
|
use Koha::Plugins;
|
|
|
|
my $plugins_enabled = C4::Context->preference('UseKohaPlugins') && C4::Context->config("enable_plugins");
|
|
|
|
my $input = new CGI;
|
|
|
|
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
|
|
{ template_name => ($plugins_enabled) ? "plugins/plugins-upload.tt" : "plugins/plugins-disabled.tt",
|
|
query => $input,
|
|
type => "intranet",
|
|
authnotrequired => 0,
|
|
flagsrequired => { plugins => 'manage' },
|
|
debug => 1,
|
|
}
|
|
);
|
|
|
|
my $uploadfilename = $input->param('uploadfile');
|
|
my $uploadfile = $input->upload('uploadfile');
|
|
my $op = $input->param('op') || q{};
|
|
|
|
my ( $total, $handled, @counts, $tempfile, $tfh );
|
|
|
|
my %errors;
|
|
|
|
if ($plugins_enabled) {
|
|
if ( ( $op eq 'Upload' ) && $uploadfile ) {
|
|
my $plugins_dir = C4::Context->config("pluginsdir");
|
|
$plugins_dir = ref($plugins_dir) eq 'ARRAY' ? $plugins_dir->[0] : $plugins_dir;
|
|
|
|
my $dirname = File::Temp::tempdir( CLEANUP => 1 );
|
|
$debug and warn "dirname = $dirname";
|
|
|
|
my $filesuffix;
|
|
$filesuffix = $1 if $uploadfilename =~ m/(\..+)$/i;
|
|
( $tfh, $tempfile ) = File::Temp::tempfile( SUFFIX => $filesuffix, UNLINK => 1 );
|
|
|
|
$debug and warn "tempfile = $tempfile";
|
|
|
|
$errors{'NOTKPZ'} = 1 if ( $uploadfilename !~ /\.kpz$/i );
|
|
$errors{'NOWRITETEMP'} = 1 unless ( -w $dirname );
|
|
$errors{'NOWRITEPLUGINS'} = 1 unless ( -w $plugins_dir );
|
|
$errors{'EMPTYUPLOAD'} = 1 unless ( length($uploadfile) > 0 );
|
|
|
|
if (%errors) {
|
|
$template->param( ERRORS => [ \%errors ] );
|
|
} else {
|
|
while (<$uploadfile>) {
|
|
print $tfh $_;
|
|
}
|
|
close $tfh;
|
|
|
|
my $ae = Archive::Extract->new( archive => $tempfile, type => 'zip' );
|
|
unless ( $ae->extract( to => $plugins_dir ) ) {
|
|
warn "ERROR: " . $ae->error;
|
|
$errors{'UZIPFAIL'} = $uploadfilename;
|
|
$template->param( ERRORS => [ \%errors ] );
|
|
output_html_with_http_headers $input, $cookie, $template->output;
|
|
exit;
|
|
}
|
|
}
|
|
} elsif ( ( $op eq 'Upload' ) && !$uploadfile ) {
|
|
warn "Problem uploading file or no file uploaded.";
|
|
}
|
|
|
|
if ( $uploadfile && !%errors && !$template->param('ERRORS') ) {
|
|
print $input->redirect("/cgi-bin/koha/plugins/plugins-home.pl");
|
|
} else {
|
|
output_html_with_http_headers $input, $cookie, $template->output;
|
|
}
|
|
|
|
} else {
|
|
output_html_with_http_headers $input, $cookie, $template->output;
|
|
}
|