Bug 17600: Standardize our EXPORT_OK

[srvgit] / plugins / plugins-upload.pl

diff --git a/plugins/plugins-upload.pl b/plugins/plugins-upload.pl
index 853b2ac..3e44f00 100755 (executable)
--- a/plugins/plugins-upload.pl
+++ b/plugins/plugins-upload.pl
@@ -16,68 +16,73 @@
 # 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 Modern::Perl;
 
 use Archive::Extract;
-use File::Temp;
-use File::Copy;
 use CGI qw ( -utf8 );
+use Mojo::UserAgent;
+use File::Temp;
 
 use C4::Context;
-use C4::Auth;
-use C4::Output;
+use C4::Auth qw( get_template_and_user );
+use C4::Output qw( output_html_with_http_headers );
 use C4::Members;
-use C4::Debug;
+use Koha::Logger;
 use Koha::Plugins;
 
-my $plugins_enabled = C4::Context->preference('UseKohaPlugins') && C4::Context->config("enable_plugins");
+my $plugins_enabled = C4::Context->config("enable_plugins");
 
-my $input = new CGI;
+my $input = CGI->new;
 
 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');
+my $uploadlocation = $input->param('uploadlocation');
+my $op             = $input->param('op') || q{};
 
-my ( $total, $handled, @counts, $tempfile, $tfh );
+my ( $tempfile, $tfh );
 
 my %errors;
 
 if ($plugins_enabled) {
-    if ( ( $op eq 'Upload' ) && $uploadfile ) {
+    if ( ( $op eq 'Upload' ) && ( $uploadfile || $uploadlocation ) ) {
         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 ( $uploadlocation ) {
+            my $ua = Mojo::UserAgent->new(max_redirects => 5);
+            my $tx = $ua->get($uploadlocation);
+            $tx->result->content->asset->move_to($tempfile);
+        } else {
+            $errors{'EMPTYUPLOAD'}    = 1 unless ( length($uploadfile) > 0 );
+        }
 
         if (%errors) {
             $template->param( ERRORS => [ \%errors ] );
         } else {
-            while (<$uploadfile>) {
-                print $tfh $_;
+            if ( $uploadfile ) {
+                while (<$uploadfile>) {
+                    print $tfh $_;
+                }
+                close $tfh;
             }
-            close $tfh;
 
             my $ae = Archive::Extract->new( archive => $tempfile, type => 'zip' );
             unless ( $ae->extract( to => $plugins_dir ) ) {
@@ -87,12 +92,14 @@ if ($plugins_enabled) {
                 output_html_with_http_headers $input, $cookie, $template->output;
                 exit;
             }
+
+            Koha::Plugins->new()->InstallPlugins();
         }
-    } elsif ( ( $op eq 'Upload' ) && !$uploadfile ) {
+    } elsif ( ( $op eq 'Upload' ) && !$uploadfile && !$uploadlocation ) {
         warn "Problem uploading file or no file uploaded.";
     }
 
-    if ( $uploadfile && !%errors && !$template->param('ERRORS') ) {
+    if ( ($uploadfile || $uploadlocation) && !%errors && !$template->param('ERRORS') ) {
         print $input->redirect("/cgi-bin/koha/plugins/plugins-home.pl");
     } else {
         output_html_with_http_headers $input, $cookie, $template->output;