![](\"images/digest_checkbox.png\")
link = $link;
- }
-
- function filter_article($article) {
- return $article;
- }
-
-}
-?>
diff --git a/classes/pluginhandler.php b/classes/pluginhandler.php
new file mode 100644
index 000000000..df7058dcd
--- /dev/null
+++ b/classes/pluginhandler.php
@@ -0,0 +1,18 @@
+get_plugin($_REQUEST["plugin"]);
+
+ if (method_exists($plugin, $method)) {
+ $plugin->$method();
+ }
+ }
+}
+
+?>
diff --git a/classes/pluginhost.php b/classes/pluginhost.php
new file mode 100644
index 000000000..4274ec37b
--- /dev/null
+++ b/classes/pluginhost.php
@@ -0,0 +1,71 @@
+link = $link;
+ }
+
+ private function register_plugin($name, $plugin) {
+ //array_push($this->plugins, $plugin);
+ $this->plugins[$name] = $plugin;
+ }
+
+ function get_link() {
+ return $this->link;
+ }
+
+ function get_plugins() {
+ return $this->plugins;
+ }
+
+ function get_plugin($name) {
+ return $this->plugins[$name];
+ }
+
+ function add_hook($type, $sender) {
+ if (!is_array($this->hooks[$type])) {
+ $this->hooks[$type] = array();
+ }
+
+ array_push($this->hooks[$type], $sender);
+ }
+
+ function del_hook($type, $sender) {
+ if (is_array($this->hooks[$type])) {
+ $key = array_Search($this->hooks[$type], $sender);
+ if ($key !== FALSE) {
+ unset($this->hooks[$type][$key]);
+ }
+ }
+ }
+
+ function get_hooks($type) {
+ return $this->hooks[$type];
+ }
+
+ function load($classlist) {
+ $plugins = explode(",", $classlist);
+
+ foreach ($plugins as $class) {
+ $class = trim($class);
+ $class_file = str_replace("_", "/", strtolower(basename($class)));
+ $file = dirname(__FILE__)."/../plugins/$class_file/$class_file.php";
+
+ if (file_exists($file)) require_once $file;
+
+ if (class_exists($class)) {
+ $plugin = new $class($this);
+
+ $this->register_plugin($class, $plugin);
+ }
+ }
+ }
+
+}
+?>
diff --git a/classes/rpc.php b/classes/rpc.php
index 984187915..2bec8c54a 100644
--- a/classes/rpc.php
+++ b/classes/rpc.php
@@ -706,7 +706,7 @@ class RPC extends Handler_Protected {
print json_encode(array("status" => $status));
}
- function buttonPlugin() {
+ /* function buttonPlugin() {
$pclass = "button_" . basename($_REQUEST['plugin']);
$method = $_REQUEST['plugin_method'];
@@ -716,7 +716,7 @@ class RPC extends Handler_Protected {
return $plugin->$method();
}
}
- }
+ } */
function genHash() {
$hash = sha1(uniqid(rand(), true));
diff --git a/config.php-dist b/config.php-dist
index 53f5dc87b..2975d680a 100644
--- a/config.php-dist
+++ b/config.php-dist
@@ -176,16 +176,13 @@
// if you experience weird errors and tt-rss failing to start, blank pages
// after login, or content encoding errors, disable it.
+ define('PLUGINS', '');
+ // Plugins to load. Check plugins/ directory for additional information.
+
define('FEEDBACK_URL', '');
// Displays an URL for users to provide feedback or comments regarding
// this instance of tt-rss. Can lead to a forum, contact email, etc.
- define('ARTICLE_BUTTON_PLUGINS', 'note,tweet,share,mail');
- // Comma-separated list of additional article action button plugins
- // to enable, like tweet button, etc.
- // The following plugins are available: note, tweet, share, mail
- // More plugins: http://tt-rss.org/wiki/Plugins
-
define('CONFIG_VERSION', 26);
// Expected config version. Please update this option in config.php
// if necessary (after migrating all new options from this file).
diff --git a/images/art-tweet.png b/images/art-tweet.png
deleted file mode 100644
index ad3c177a2..000000000
Binary files a/images/art-tweet.png and /dev/null differ
diff --git a/include/functions.php b/include/functions.php
index 53aaa92b3..da6767986 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -7,13 +7,6 @@
function __autoload($class) {
$class_file = str_replace("_", "/", strtolower(basename($class)));
- $file = dirname(__FILE__)."/../plugins/$class_file.php";
-
- if (file_exists($file)) {
- require $file;
- return;
- }
-
$file = dirname(__FILE__)."/../classes/$class_file.php";
if (file_exists($file)) {
@@ -3265,15 +3258,10 @@
onclick=\"postOpenInNewTab(event, $id)\"
alt='Zoom' title='".__('Open article in new tab')."'>";
- $button_plugins = explode(",", ARTICLE_BUTTON_PLUGINS);
+ global $pluginhost;
- foreach ($button_plugins as $p) {
- $pclass = "button_" . trim($p);
-
- if (class_exists($pclass)) {
- $plugin = new $pclass($link);
- $rv['content'] .= $plugin->render($id, $line);
- }
+ foreach ($pluginhost->get_hooks($pluginhost::HOOK_ARTICLE_BUTTON) as $p) {
+ $rv['content'] .= $p->hook_article_button($line);
}
$rv['content'] .= "| "; print " |