pluginhost: allow loading user plugins from plugins.local

[tt-rss.git] / classes / pluginhost.php

diff --git a/classes/pluginhost.php b/classes/pluginhost.php
index 1ad7afd60f1081201e13381a705a48b020ed05e2..13da7e7ab697d508e4808944a341a336029eac64 100644 (file)
--- a/classes/pluginhost.php
+++ b/classes/pluginhost.php
@@ -43,6 +43,7 @@ class PluginHost {
        const HOOK_FORMAT_ENCLOSURES = 26;
        const HOOK_SUBSCRIBE_FEED = 27;
        const HOOK_HEADLINES_BEFORE = 28;
+       const HOOK_RENDER_ENCLOSURE = 29;
 
        const KIND_ALL = 1;
        const KIND_SYSTEM = 2;
@@ -128,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);
        }
 
@@ -141,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;