X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=classes%2Fpluginhost.php;h=1ad7afd60f1081201e13381a705a48b020ed05e2;hb=7eb87b80d533d0bdd538938b69064352a8587204;hp=b304091696261584db2aff1b3477f1c2a5fb78af;hpb=e218c5f56fa6b4cc31510071163791627d067e9d;p=tt-rss.git

diff --git a/classes/pluginhost.php b/classes/pluginhost.php
index b3040916..1ad7afd6 100644
--- a/classes/pluginhost.php
+++ b/classes/pluginhost.php
@@ -1,12 +1,19 @@
 <?php
 class PluginHost {
-	private $link;
+	private $dbh;
 	private $hooks = array();
 	private $plugins = array();
 	private $handlers = array();
 	private $commands = array();
 	private $storage = array();
+	private $feeds = array();
+	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;
@@ -17,17 +24,45 @@ class PluginHost {
 	const HOOK_UPDATE_TASK = 7;
 	const HOOK_AUTH_USER = 8;
 	const HOOK_HOTKEY_MAP = 9;
+	const HOOK_RENDER_ARTICLE = 10;
+	const HOOK_RENDER_ARTICLE_CDM = 11;
+	const HOOK_FEED_FETCHED = 12;
+	const HOOK_SANITIZE = 13;
+	const HOOK_RENDER_ARTICLE_API = 14;
+	const HOOK_TOOLBAR_BUTTON = 15;
+	const HOOK_ACTION_ITEM = 16;
+	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;
 	const KIND_USER = 3;
 
-	function __construct($link) {
-		$this->link = $link;
+	function __construct() {
+		$this->dbh = Db::get();
+
+		$this->storage = array();
+	}
+
+	private function __clone() {
+		//
+	}
 
-		$this->storage = $_SESSION["plugin_storage"];
+	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) {
@@ -35,8 +70,23 @@ class PluginHost {
 		$this->plugins[$name] = $plugin;
 	}
 
+	// needed for compatibility with API 1
 	function get_link() {
-		return $this->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() {
@@ -63,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]);
 			}
@@ -90,7 +140,10 @@ class PluginHost {
 		foreach ($plugins as $class) {
 			$class = trim($class);
 			$class_file = strtolower(basename($class));
-			$file = dirname(__FILE__)."/../plugins/$class_file/$class_file.php";
+
+			if (!is_dir(dirname(__FILE__)."/../plugins/$class_file")) continue;
+
+			$file = dirname(__FILE__)."/../plugins/$class_file/init.php";
 
 			if (!isset($this->plugins[$class])) {
 				if (file_exists($file)) require_once $file;
@@ -98,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)) {
@@ -141,7 +203,7 @@ class PluginHost {
 		}
 	}
 
-	function del_handler($handler, $method) {
+	function del_handler($handler, $method, $sender) {
 		$handler = str_replace("-", "_", strtolower($handler));
 		$method = strtolower($method);
 
@@ -165,10 +227,12 @@ class PluginHost {
 		return false;
 	}
 
-	function add_command($command, $description, $sender) {
-		$command = "-" . str_replace("-", "_", strtolower($command));
+	function add_command($command, $description, $sender, $suffix = "", $arghelp = "") {
+		$command = str_replace("-", "_", strtolower($command));
 
 		$this->commands[$command] = array("description" => $description,
+			"suffix" => $suffix,
+			"arghelp" => $arghelp,
 			"class" => $sender);
 	}
 
@@ -196,7 +260,7 @@ class PluginHost {
 
 	function run_commands($args) {
 		foreach ($this->get_commands() as $command => $data) {
-			if (in_array($command, $args)) {
+			if (isset($args[$command])) {
 				$command = str_replace("-", "", $command);
 				$data["class"]->$command($args);
 			}
@@ -204,45 +268,42 @@ class PluginHost {
 	}
 
 	function load_data($force = false) {
-		if ($this->owner_uid && (!$_SESSION["plugin_storage"] || $force))  {
-			$plugin = db_escape_string($plugin);
-
-			$result = db_query($this->link, "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($this->link, "BEGIN");
+			$this->dbh->query("BEGIN");
 
-			$result = db_query($this->link,"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($this->link, "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($this->link, "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($this->link, "COMMIT");
+			$this->dbh->query("COMMIT");
 		}
 	}
 
@@ -254,8 +315,6 @@ class PluginHost {
 
 		$this->storage[$idx][$name] = $value;
 
-		$_SESSION["plugin_storage"] = $this->storage;
-
 		if ($sync) $this->save_data(get_class($sender));
 	}
 
@@ -281,11 +340,64 @@ class PluginHost {
 
 			unset($this->storage[$idx]);
 
-			db_query($this->link, "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;
+	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)
+	function add_feed($cat_id, $title, $icon, $sender) {
+		if (!$this->feeds[$cat_id]) $this->feeds[$cat_id] = array();
+
+		$id = count($this->feeds[$cat_id]);
+
+		array_push($this->feeds[$cat_id],
+			array('id' => $id, 'title' => $title, 'sender' => $sender, 'icon' => $icon));
+
+		return $id;
+	}
+
+	function get_feeds($cat_id) {
+		return $this->feeds[$cat_id];
+	}
+
+	// convert feed_id (e.g. -129) to pfeed_id first
+	function get_feed_handler($pfeed_id) {
+		foreach ($this->feeds as $cat) {
+			foreach ($cat as $feed) {
+				if ($feed['id'] == $pfeed_id) {
+					return $feed['sender'];
+				}
+			}
+		}
+	}
+
+	static function pfeed_to_feed_id($label) {
+		return PLUGIN_FEED_BASE_INDEX - 1 - abs($label);
+	}
+
+	static function feed_to_pfeed_id($feed) {
+		return PLUGIN_FEED_BASE_INDEX - 1 + abs($feed);
+	}
+
+	function add_api_method($name, $sender) {
+		if ($this->is_system($sender)) {
+			$this->api_methods[strtolower($name)] = $sender;
 		}
 	}
+
+	function get_api_method($name) {
+		return $this->api_methods[$name];
+	}
 }
 ?>