From 7c0a2ab2029b98086f02da80adf6a7ebc303fd6f Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Fri, 5 Jun 2015 17:54:52 +0300 Subject: pluginhost: allow loading user plugins from plugins.local --- classes/pluginhost.php | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) (limited to 'classes/pluginhost.php') diff --git a/classes/pluginhost.php b/classes/pluginhost.php index 457698291..13da7e7ab 100644 --- a/classes/pluginhost.php +++ b/classes/pluginhost.php @@ -129,7 +129,15 @@ class PluginHost { } } function load_all($kind, $owner_uid = false) { - $plugins = array_map("basename", glob("plugins/*")); + $plugins = array_map("basename", array_filter(glob("plugins/*"), "is_dir")); + + if (is_dir("plugins.local")) { + $plugins = array_merge($plugins, array_map("basename", + array_filter(glob("plugins.local/*"), "is_dir"))); + } + + asort($plugins); + $this->load(join(",", $plugins), $kind, $owner_uid); } @@ -142,9 +150,15 @@ class PluginHost { $class = trim($class); $class_file = strtolower(basename($class)); - if (!is_dir(dirname(__FILE__)."/../plugins/$class_file")) continue; + if (!is_dir(__DIR__."/../plugins/$class_file") && + !is_dir(__DIR__."/../plugins.local/$class_file")) continue; + + // try system plugin directory first + $file = __DIR__ . "/../plugins/$class_file/init.php"; - $file = dirname(__FILE__)."/../plugins/$class_file/init.php"; + if (!file_exists($file)) { + $file = __DIR__ . "/../plugins.local/$class_file/init.php"; + } if (!isset($this->plugins[$class])) { if (file_exists($file)) require_once $file; -- cgit v1.2.3-54-g00ecf