Bug 17600: Standardize our EXPORT_OK

[srvgit] / Koha / Plugins / Handler.pm

diff --git a/Koha/Plugins/Handler.pm b/Koha/Plugins/Handler.pm
index 41c242b..a32487d 100644 (file)
--- a/Koha/Plugins/Handler.pm
+++ b/Koha/Plugins/Handler.pm
@@ -4,34 +4,39 @@ package Koha::Plugins::Handler;
 #
 # 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 Modern::Perl;
 
-use File::Path qw(remove_tree);
+use Array::Utils qw( array_minus );
+use File::Path qw( remove_tree );
 
-use Module::Load::Conditional qw(can_load);
+use Module::Load qw( load );
 
 use C4::Context;
+use Koha::Plugins::Methods;
 
 BEGIN {
-    push @INC, C4::Context->config("pluginsdir");
+    my $pluginsdir = C4::Context->config("pluginsdir");
+    my @pluginsdir = ref($pluginsdir) eq 'ARRAY' ? @$pluginsdir : $pluginsdir;
+    push @INC, array_minus(@pluginsdir, @INC) ;
+    pop @INC if $INC[-1] eq '.' ;
 }
 
 =head1 NAME
 
-C4::Plugins::Handler - Handler Module for running plugins
+Koha::Plugins::Handler - Handler Module for running plugins
 
 =head1 SYNOPSIS
 
@@ -56,16 +61,16 @@ sub run {
     my $plugin_class  = $args->{'class'};
     my $plugin_method = $args->{'method'};
     my $cgi           = $args->{'cgi'};
+    my $params        = $args->{'params'};
 
-    if ( can_load( modules => { $plugin_class => undef } ) ) {
+    my $has_method = Koha::Plugins::Methods->search({ plugin_class => $plugin_class, plugin_method => $plugin_method })->count();
+    if ( $has_method ) {
+        load $plugin_class;
         my $plugin = $plugin_class->new( { cgi => $cgi, enable_plugins => $args->{'enable_plugins'} } );
-        if ( $plugin->can($plugin_method) ) {
-            return $plugin->$plugin_method();
-        } else {
-            warn "Plugin does not have method $plugin_method";
-        }
+        return $plugin->$plugin_method( $params );
     } else {
-        warn "Plugin $plugin_class cannot be loaded";
+        warn "Plugin does not have method $plugin_method";
+        return;
     }
 }
 
@@ -77,15 +82,29 @@ Deletes a plugin
 
 sub delete {
     my ( $class, $args ) = @_;
+
+    return unless ( C4::Context->config("enable_plugins") || $args->{'enable_plugins'} );
+
     my $plugin_class = $args->{'class'};
-    my $plugin_dir   = C4::Context->config("pluginsdir");
-    my $plugin_path  = "$plugin_dir/" . join( '/', split( '::', $args->{'class'} ) );
 
-    Koha::Plugins::Handler->run( { class => $plugin_class, method => 'uninstall' } );
+    my $plugin_path = $plugin_class;
+    $plugin_path =~ s/::/\//g;  # Take class name, transform :: to / to get path
+    $plugin_path =~ s/$/.pm/;   # Add .pm to the end
+    require $plugin_path;   # Require the plugin to have it's path listed in INC
+    $plugin_path =
+      $INC{$plugin_path};   # Get the full true path to the plugin from INC
+    $plugin_path =~ s/.pm//;    # Remove the .pm from the end
+
+    Koha::Plugins::Handler->run({
+        class          => $plugin_class,
+        method         => 'uninstall',
+        enable_plugins => $args->{enable_plugins},
+    });
 
     C4::Context->dbh->do( "DELETE FROM plugin_data WHERE plugin_class = ?", undef, ($plugin_class) );
+    Koha::Plugins::Methods->search({ plugin_class => $plugin_class })->delete();
 
-    unlink("$plugin_path.pm");
+    unlink "$plugin_path.pm" or warn "Could not unlink $plugin_path.pm: $!";
     remove_tree($plugin_path);
 }