Merge pull request #386 from wolfgangasdf/master

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

diff --git a/classes/pluginhost.php b/classes/pluginhost.php
index d51f70214a7a93d6cca0396f34c9b15338b2f995..744337e0f67b5a82d21ae842e30ccd4a31f03b51 100644 (file)
--- a/classes/pluginhost.php
+++ b/classes/pluginhost.php
@@ -13,6 +13,8 @@ class PluginHost {
        private $last_registered;
        private static $instance;
 
+       const API_VERSION = 2;
+
        const HOOK_ARTICLE_BUTTON = 1;
        const HOOK_ARTICLE_FILTER = 2;
        const HOOK_PREFS_TAB = 3;
@@ -32,6 +34,14 @@ class PluginHost {
        const HOOK_HEADLINE_TOOLBAR_BUTTON = 17;
        const HOOK_HOTKEY_INFO = 18;
        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 KIND_ALL = 1;
        const KIND_SYSTEM = 2;
@@ -39,9 +49,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() {
@@ -60,21 +69,25 @@ class PluginHost {
                $this->plugins[$name] = $plugin;
        }
 
+       // needed for compatibility with API 1
        function get_link() {
-               header("Content-type: text/plain");
-
-               print "One of the plugins called obsolete host method get_link(). This plugin needs to be updated or removed.\n\n";
-
-               print "List of plugins loaded: " . join(" ,", array_keys($this->plugins)) . "\n\n";
-
-               print "Last plugin initialized (possible culprit): " . $this->last_registered . "\n";
-               die;
+               return false;
        }
 
        function get_dbh() {
                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;
        }
@@ -99,7 +112,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]);
                        }
@@ -137,6 +150,13 @@ class PluginHost {
                                if (class_exists($class) && is_subclass_of($class, "Plugin")) {
                                        $plugin = new $class($this);
 
+                                       $plugin_api = $plugin->api_version();
+
+                                       if ($plugin_api < PluginHost::API_VERSION) {
+                                               user_error("Plugin $class is not compatible with current API version (need: " . PluginHost::API_VERSION . ", got: $plugin_api)", E_USER_WARNING);
+                                               continue;
+                                       }
+
                                        $this->last_registered = $class;
 
                                        switch ($kind) {
@@ -182,7 +202,7 @@ class PluginHost {
                }
        }
 
-       function del_handler($handler, $method) {
+       function del_handler($handler, $method, $sender) {
                $handler = str_replace("-", "_", strtolower($handler));
                $method = strtolower($method);
 
@@ -247,17 +267,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;
                }
        }
 
@@ -273,7 +289,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'
@@ -297,8 +314,6 @@ class PluginHost {
 
                $this->storage[$idx][$name] = $value;
 
-               $_SESSION["plugin_storage"] = $this->storage;
-
                if ($sync) $this->save_data(get_class($sender));
        }
 
@@ -326,8 +341,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;
                }
        }