X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=classes%2Fpluginhost.php;h=7e3fb08abbcfdf021ba02541c3f159f7b6173edd;hb=50052fb78a3a9d1bb3fa488e7fd7b23125c38124;hp=4eada78b297b3b7c983314101b702b07c7bc254f;hpb=6fb5f17be69f9ff3a0e1379e64a3c7bd71ab3271;p=tt-rss.git

diff --git a/classes/pluginhost.php b/classes/pluginhost.php
old mode 100644
new mode 100755
index 4eada78b..7e3fb08a
--- a/classes/pluginhost.php
+++ b/classes/pluginhost.php
@@ -10,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,6 +56,7 @@ class PluginHost {
 	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;
@@ -96,7 +96,7 @@ class PluginHost {
 	function get_pdo() {
 		return $this->pdo;
 	}
-	
+
 	function get_plugin_names() {
 		$names = array();
 
@@ -170,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();
@@ -377,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)