Merge pull request #399 from pavel-voronin/patch-1

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

diff --git a/classes/pluginhost.php b/classes/pluginhost.php
index 0fbf0422e3b4258c8168a298a75d702ff5c3050e..744337e0f67b5a82d21ae842e30ccd4a31f03b51 100644 (file)
--- a/classes/pluginhost.php
+++ b/classes/pluginhost.php
@@ -10,6 +10,10 @@ 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;
@@ -30,16 +34,34 @@ 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;
        const KIND_USER = 3;
 
-       function __construct($dbh) {
-               $this->dbh = $dbh;
-               $this->storage = $_SESSION["plugin_storage"];
+       function __construct() {
+               $this->dbh = Db::get();
+
+               $this->storage = array();
+       }
+
+       private function __clone() {
+               //
+       }
+
+       public static function getInstance() {
+               if (self::$instance == null)
+                       self::$instance = new self();
 
-               if (!$this->storage) $this->storage = array();
+               return self::$instance;
        }
 
        private function register_plugin($name, $plugin) {
@@ -47,10 +69,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;
        }
@@ -75,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]);
                        }
@@ -113,6 +150,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)) {
@@ -156,7 +202,7 @@ class PluginHost {
                }
        }
 
-       function del_handler($handler, $method) {
+       function del_handler($handler, $method, $sender) {
                $handler = str_replace("-", "_", strtolower($handler));
                $method = strtolower($method);
 
@@ -221,45 +267,42 @@ class PluginHost {
        }
 
        function load_data($force = false) {
-               if ($this->owner_uid && (!$_SESSION["plugin_storage"] || $force))  {
-                       $plugin = db_escape_string($plugin);
-
-                       $result = db_query("SELECT name, content FROM ttrss_plugin_storage
+               if ($this->owner_uid)  {
+                       $result = $this->dbh->query("SELECT name, content FROM ttrss_plugin_storage
                                WHERE owner_uid = '".$this->owner_uid."'");
 
-                       while ($line = db_fetch_assoc($result)) {
+                       while ($line = $this->dbh->fetch_assoc($result)) {
                                $this->storage[$line["name"]] = unserialize($line["content"]);
                        }
-
-                       $_SESSION["plugin_storage"] = $this->storage;
                }
        }
 
        private function save_data($plugin) {
                if ($this->owner_uid) {
-                       $plugin = db_escape_string($plugin);
+                       $plugin = $this->dbh->escape_string($plugin);
 
-                       db_query("BEGIN");
+                       $this->dbh->query("BEGIN");
 
-                       $result = db_query("SELECT id FROM ttrss_plugin_storage WHERE
+                       $result = $this->dbh->query("SELECT id FROM ttrss_plugin_storage WHERE
                                owner_uid= '".$this->owner_uid."' AND name = '$plugin'");
 
                        if (!isset($this->storage[$plugin]))
                                $this->storage[$plugin] = array();
 
-                       $content = db_escape_string(serialize($this->storage[$plugin]));
+                       $content = $this->dbh->escape_string(serialize($this->storage[$plugin]),
+                               false);
 
-                       if (db_num_rows($result) != 0) {
-                               db_query("UPDATE ttrss_plugin_storage SET content = '$content'
+                       if ($this->dbh->num_rows($result) != 0) {
+                               $this->dbh->query("UPDATE ttrss_plugin_storage SET content = '$content'
                                        WHERE owner_uid= '".$this->owner_uid."' AND name = '$plugin'");
 
                        } else {
-                               db_query("INSERT INTO ttrss_plugin_storage
+                               $this->dbh->query("INSERT INTO ttrss_plugin_storage
                                        (name,owner_uid,content) VALUES
                                        ('$plugin','".$this->owner_uid."','$content')");
                        }
 
-                       db_query("COMMIT");
+                       $this->dbh->query("COMMIT");
                }
        }
 
@@ -271,8 +314,6 @@ class PluginHost {
 
                $this->storage[$idx][$name] = $value;
 
-               $_SESSION["plugin_storage"] = $this->storage;
-
                if ($sync) $this->save_data(get_class($sender));
        }
 
@@ -298,10 +339,8 @@ class PluginHost {
 
                        unset($this->storage[$idx]);
 
-                       db_query("DELETE FROM ttrss_plugin_storage WHERE name = '$idx'
+                       $this->dbh->query("DELETE FROM ttrss_plugin_storage WHERE name = '$idx'
                                AND owner_uid = " . $this->owner_uid);
-
-                       $_SESSION["plugin_storage"] = $this->storage;
                }
        }