Merge pull request #386 from wolfgangasdf/master

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

diff --git a/classes/pluginhost.php b/classes/pluginhost.php
index bc5dc96beb5c0ca4cc47e40aa9bbe46d0b1317fe..744337e0f67b5a82d21ae842e30ccd4a31f03b51 100644 (file)
--- a/classes/pluginhost.php
+++ b/classes/pluginhost.php
@@ -36,6 +36,12 @@ 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 KIND_ALL = 1;
        const KIND_SYSTEM = 2;
@@ -72,6 +78,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;
        }
@@ -96,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]);
                        }
@@ -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'