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 302fdbaeb9b28c6ef591eaa1dd54f6283a92ed9a..13da7e7ab697d508e4808944a341a336029eac64 100644 (file)
--- a/classes/pluginhost.php
+++ b/classes/pluginhost.php
@@ -36,6 +36,14 @@ class PluginHost {
        const HOOK_ARTICLE_LEFT_BUTTON = 19;
        const HOOK_PREFS_EDIT_FEED = 20;
        const HOOK_PREFS_SAVE_FEED = 21;
+       const HOOK_FETCH_FEED = 22;
+       const HOOK_QUERY_HEADLINES = 23;
+       const HOOK_HOUSE_KEEPING = 24;
+       const HOOK_SEARCH = 25;
+       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;
@@ -43,9 +51,8 @@ class PluginHost {
 
        function __construct() {
                $this->dbh = Db::get();
-               $this->storage = $_SESSION["plugin_storage"];
 
-               if (!$this->storage) $this->storage = array();
+               $this->storage = array();
        }
 
        private function __clone() {
@@ -73,6 +80,16 @@ class PluginHost {
                return $this->dbh;
        }
 
+       function get_plugin_names() {
+               $names = array();
+
+               foreach ($this->plugins as $p) {
+                       array_push($names, get_class($p));
+               }
+
+               return $names;
+       }
+
        function get_plugins() {
                return $this->plugins;
        }
@@ -97,7 +114,7 @@ class PluginHost {
 
        function del_hook($type, $sender) {
                if (is_array($this->hooks[$type])) {
-                       $key = array_Search($this->hooks[$type], $sender);
+                       $key = array_Search($sender, $this->hooks[$type]);
                        if ($key !== FALSE) {
                                unset($this->hooks[$type][$key]);
                        }
@@ -112,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);
        }
 
@@ -125,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;
@@ -187,7 +218,7 @@ class PluginHost {
                }
        }
 
-       function del_handler($handler, $method) {
+       function del_handler($handler, $method, $sender) {
                $handler = str_replace("-", "_", strtolower($handler));
                $method = strtolower($method);
 
@@ -252,17 +283,13 @@ class PluginHost {
        }
 
        function load_data($force = false) {
-               if ($this->owner_uid && (!$_SESSION["plugin_storage"] || $force))  {
-                       $plugin = $this->dbh->escape_string($plugin);
-
+               if ($this->owner_uid)  {
                        $result = $this->dbh->query("SELECT name, content FROM ttrss_plugin_storage
                                WHERE owner_uid = '".$this->owner_uid."'");
 
                        while ($line = $this->dbh->fetch_assoc($result)) {
                                $this->storage[$line["name"]] = unserialize($line["content"]);
                        }
-
-                       $_SESSION["plugin_storage"] = $this->storage;
                }
        }
 
@@ -278,7 +305,8 @@ class PluginHost {
                        if (!isset($this->storage[$plugin]))
                                $this->storage[$plugin] = array();
 
-                       $content = $this->dbh->escape_string(serialize($this->storage[$plugin]));
+                       $content = $this->dbh->escape_string(serialize($this->storage[$plugin]),
+                               false);
 
                        if ($this->dbh->num_rows($result) != 0) {
                                $this->dbh->query("UPDATE ttrss_plugin_storage SET content = '$content'
@@ -302,8 +330,6 @@ class PluginHost {
 
                $this->storage[$idx][$name] = $value;
 
-               $_SESSION["plugin_storage"] = $this->storage;
-
                if ($sync) $this->save_data(get_class($sender));
        }
 
@@ -331,8 +357,6 @@ class PluginHost {
 
                        $this->dbh->query("DELETE FROM ttrss_plugin_storage WHERE name = '$idx'
                                AND owner_uid = " . $this->owner_uid);
-
-                       $_SESSION["plugin_storage"] = $this->storage;
                }
        }