pngcrush.sh

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

diff --git a/classes/pluginhost.php b/classes/pluginhost.php
old mode 100644 (file)
new mode 100755 (executable)
index 561a10a..7e3fb08
--- a/classes/pluginhost.php
+++ b/classes/pluginhost.php
@@ -1,6 +1,5 @@
 <?php
 class PluginHost {
-       private $dbh;
        private $pdo;
        private $hooks = array();
        private $plugins = array();
@@ -11,7 +10,6 @@ class PluginHost {
        private $api_methods = array();
        private $plugin_actions = array();
        private $owner_uid;
-       private $debug;
        private $last_registered;
        private static $instance;
 
@@ -57,13 +55,14 @@ class PluginHost {
        const HOOK_FORMAT_ARTICLE_CDM = 35;
        const HOOK_FEED_BASIC_INFO = 36;
        const HOOK_SEND_LOCAL_FILE = 37;
+       const HOOK_UNSUBSCRIBE_FEED = 38;
+       const HOOK_SEND_MAIL = 39;
 
        const KIND_ALL = 1;
        const KIND_SYSTEM = 2;
        const KIND_USER = 3;
 
        function __construct() {
-               $this->dbh = Db::get();
                $this->pdo = Db::pdo();
 
                $this->storage = array();
@@ -91,13 +90,13 @@ class PluginHost {
        }
 
        function get_dbh() {
-               return $this->dbh;
+               return Db::get();
        }
 
        function get_pdo() {
                return $this->pdo;
        }
-       
+
        function get_plugin_names() {
                $names = array();
 
@@ -171,15 +170,37 @@ class PluginHost {
 
                        // try system plugin directory first
                        $file = __DIR__ . "/../plugins/$class_file/init.php";
+                       $vendor_dir = __DIR__ . "/../plugins/$class_file/vendor";
 
                        if (!file_exists($file)) {
                                $file = __DIR__ . "/../plugins.local/$class_file/init.php";
+                               $vendor_dir = __DIR__ . "/../plugins.local/$class_file/vendor";
                        }
 
                        if (!isset($this->plugins[$class])) {
                                if (file_exists($file)) require_once $file;
 
                                if (class_exists($class) && is_subclass_of($class, "Plugin")) {
+
+                                       // register plugin autoloader if necessary, for namespaced classes ONLY
+                                       // layout corresponds to tt-rss main /vendor/author/Package/Class.php
+
+                                       if (file_exists($vendor_dir)) {
+                                               spl_autoload_register(function($class) use ($vendor_dir) {
+
+                                                       if (strpos($class, '\\') !== FALSE) {
+                                                               list ($namespace, $class_name) = explode('\\', $class, 2);
+
+                                                               if ($namespace && $class_name) {
+                                                                       $class_file = "$vendor_dir/$namespace/" . str_replace('\\', '/', $class_name) . ".php";
+
+                                                                       if (file_exists($class_file))
+                                                                               require_once $class_file;
+                                                               }
+                                                       }
+                                               });
+                                       }
+
                                        $plugin = new $class($this);
 
                                        $plugin_api = $plugin->api_version();
@@ -281,8 +302,6 @@ class PluginHost {
                } else {
                        return false;
                }
-
-               return false;
        }
 
        function get_commands() {
@@ -363,7 +382,9 @@ class PluginHost {
        function get_all($sender) {
                $idx = get_class($sender);
 
-               return $this->storage[$idx];
+               $data = $this->storage[$idx];
+
+               return $data ? $data : [];
        }
 
        function clear_data($sender) {
@@ -378,14 +399,6 @@ class PluginHost {
                }
        }
 
-       function set_debug($debug) {
-               $this->debug = $debug;
-       }
-
-       function get_debug() {
-               return $this->debug;
-       }
-
        // Plugin feed functions are *EXPERIMENTAL*!
 
        // cat_id: only -1 is supported (Special)