Merge pull request #422 from rwetzlmayr/master

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

diff --git a/classes/pluginhost.php b/classes/pluginhost.php
index 44056d262e315421d23b6f838fbfc868085ab6db..1ad7afd60f1081201e13381a705a48b020ed05e2 100644 (file)
--- a/classes/pluginhost.php
+++ b/classes/pluginhost.php
@@ -10,8 +10,11 @@ class PluginHost {
        private $api_methods = array();
        private $owner_uid;
        private $debug;
+       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;
@@ -31,6 +34,15 @@ 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 HOOK_HEADLINES_BEFORE = 28;
 
        const KIND_ALL = 1;
        const KIND_SYSTEM = 2;
@@ -38,9 +50,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() {
@@ -59,10 +70,25 @@ class PluginHost {
                $this->plugins[$name] = $plugin;
        }
 
+       // needed for compatibility with API 1
+       function get_link() {
+               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;
        }
@@ -87,7 +113,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]);
                        }
@@ -125,6 +151,15 @@ 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) {
                                        case $this::KIND_SYSTEM:
                                                if ($this->is_system($plugin)) {
@@ -168,7 +203,7 @@ class PluginHost {
                }
        }
 
-       function del_handler($handler, $method) {
+       function del_handler($handler, $method, $sender) {
                $handler = str_replace("-", "_", strtolower($handler));
                $method = strtolower($method);
 
@@ -233,17 +268,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;
                }
        }
 
@@ -259,7 +290,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'
@@ -283,8 +315,6 @@ class PluginHost {
 
                $this->storage[$idx][$name] = $value;
 
-               $_SESSION["plugin_storage"] = $this->storage;
-
                if ($sync) $this->save_data(get_class($sender));
        }
 
@@ -312,8 +342,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;
                }
        }