remove hook-based plugins
This commit is contained in:
Andrew Dolgov
parent
23d2471c92
commit
9aceda3afc
|
|
@ -77,8 +77,6 @@
|
|||
return;
|
||||
}
|
||||
|
||||
$plugins = new Plugins($link);
|
||||
|
||||
$purge_intervals = array(
|
||||
0 => __("Use default"),
|
||||
-1 => __("Never purge"),
|
||||
|
|
|
|||
|
|
@ -121,8 +121,6 @@ class Feeds extends Handler_Protected {
|
|||
$next_unread_feed, $offset, $vgr_last_feed = false,
|
||||
$override_order = false, $include_children = false) {
|
||||
|
||||
global $plugins;
|
||||
|
||||
$disable_cache = false;
|
||||
|
||||
$reply = array();
|
||||
|
|
@ -222,8 +220,6 @@ class Feeds extends Handler_Protected {
|
|||
|
||||
$headlines_count = db_num_rows($result);
|
||||
|
||||
$plugins->hook('headlines_before', $reply);
|
||||
|
||||
if (get_pref($this->link, 'COMBINED_DISPLAY_MODE')) {
|
||||
$button_plugins = array();
|
||||
foreach (explode(",", ARTICLE_BUTTON_PLUGINS) as $p) {
|
||||
|
|
@ -248,13 +244,6 @@ class Feeds extends Handler_Protected {
|
|||
if ($_REQUEST["debug"]) $timing_info = print_checkpoint("PS", $timing_info);
|
||||
|
||||
while ($line = db_fetch_assoc($result)) {
|
||||
|
||||
if (get_pref($this->link, 'COMBINED_DISPLAY_MODE')) {
|
||||
$plugins->hook('cdm_article_before', $line);
|
||||
} else {
|
||||
$plugins->hook('headlines_row', $line);
|
||||
}
|
||||
|
||||
$class = ($lnum % 2) ? "even" : "odd";
|
||||
|
||||
$id = $line["id"];
|
||||
|
|
@ -683,15 +672,11 @@ class Feeds extends Handler_Protected {
|
|||
|
||||
$reply['content'] .= "</div>";
|
||||
|
||||
$plugins->hook('cdm_article_after', $reply['content']);
|
||||
|
||||
}
|
||||
|
||||
++$lnum;
|
||||
}
|
||||
|
||||
$plugins->hook('headlines_after', $reply);
|
||||
|
||||
if ($_REQUEST["debug"]) $timing_info = print_checkpoint("PE", $timing_info);
|
||||
|
||||
} else {
|
||||
|
|
|
|||
|
|
@ -1,21 +0,0 @@
|
|||
<?php
|
||||
class Plugin {
|
||||
protected $link;
|
||||
protected $handler;
|
||||
|
||||
function __construct($link, $handler) {
|
||||
$this->link = $link;
|
||||
$this->handler = $handler;
|
||||
$this->initialize();
|
||||
}
|
||||
|
||||
function initialize() {
|
||||
|
||||
|
||||
}
|
||||
|
||||
function add_listener($hook) {
|
||||
$this->handler->add_listener($hook, $this);
|
||||
}
|
||||
}
|
||||
?>
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
<?
|
||||
class Plugin_Example extends Plugin {
|
||||
function initialize() {
|
||||
$this->add_listener('article_before');
|
||||
}
|
||||
|
||||
function article_before(&$line) {
|
||||
$line["title"] = "EXAMPLE/REPLACED:" . $line["title"];
|
||||
}
|
||||
}
|
||||
?>
|
||||
|
|
@ -1,44 +0,0 @@
|
|||
<?php
|
||||
class Plugins {
|
||||
protected $link;
|
||||
protected $plugins;
|
||||
protected $listeners;
|
||||
|
||||
function __construct($link) {
|
||||
$this->link = $link;
|
||||
$this->listeners = array();
|
||||
$this->load_plugins();
|
||||
}
|
||||
|
||||
function load_plugins() {
|
||||
if (defined('_ENABLE_PLUGINS')) {
|
||||
$plugins = explode(",", _ENABLE_PLUGINS);
|
||||
|
||||
foreach ($plugins as $p) {
|
||||
$plugin_class = "plugin_$p";
|
||||
if (class_exists($plugin_class)) {
|
||||
$plugin = new $plugin_class($this->link, $this);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function add_listener($hook_name, $plugin) {
|
||||
if (!is_array($this->listeners[$hook_name]))
|
||||
$this->listeners[$hook_name] = array();
|
||||
|
||||
array_push($this->listeners[$hook_name], $plugin);
|
||||
}
|
||||
|
||||
function hook($hook_name, &$params) {
|
||||
if (is_array($this->listeners[$hook_name])) {
|
||||
foreach ($this->listeners[$hook_name] as $p) {
|
||||
if (method_exists($p, $hook_name)) {
|
||||
$p->$hook_name($params);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
?>
|
||||
|
|
@ -3212,8 +3212,6 @@
|
|||
}
|
||||
|
||||
function format_article($link, $id, $mark_as_read = true, $zoom_mode = false, $owner_uid = false) {
|
||||
global $plugins;
|
||||
|
||||
if (!$owner_uid) $owner_uid = $_SESSION["uid"];
|
||||
|
||||
$rv = array();
|
||||
|
|
@ -3275,8 +3273,6 @@
|
|||
|
||||
$line = db_fetch_assoc($result);
|
||||
|
||||
$plugins->hook('article_before', $line);
|
||||
|
||||
if ($line["icon_url"]) {
|
||||
$feed_icon = "<img src=\"" . $line["icon_url"] . "\">";
|
||||
} else {
|
||||
|
|
@ -3489,8 +3485,6 @@
|
|||
$rv['content'] .= "</body></html>";
|
||||
}
|
||||
|
||||
$plugins->hook('article_after', $rv);
|
||||
|
||||
return $rv;
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -212,8 +212,6 @@
|
|||
function update_rss_feed($link, $feed, $ignore_daemon = false, $no_cache = false,
|
||||
$override_url = false) {
|
||||
|
||||
global $plugins;
|
||||
|
||||
require_once "lib/simplepie/simplepie.inc";
|
||||
require_once "lib/magpierss/rss_fetch.inc";
|
||||
require_once 'lib/magpierss/rss_utils.inc';
|
||||
|
|
@ -559,10 +557,6 @@
|
|||
}
|
||||
|
||||
foreach ($iterator as $item) {
|
||||
$hook_params = array("item" => &$item, "feed" => $feed);
|
||||
|
||||
$plugins->hook('rss_update_item', $hook_params);
|
||||
|
||||
if ($_REQUEST['xdebug'] == 2) {
|
||||
print_r($item);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -56,8 +56,6 @@
|
|||
|
||||
init_connection($link);
|
||||
|
||||
$plugins = new Plugins($link);
|
||||
|
||||
if (in_array("-feeds", $op)) {
|
||||
// Update all feeds needing a update.
|
||||
update_daemon_common($link);
|
||||
|
|
|
|||
|
|
@ -189,8 +189,6 @@
|
|||
|
||||
if (!init_connection($link)) return;
|
||||
|
||||
$plugins = new Plugins($link);
|
||||
|
||||
// We disable stamp file, since it is of no use in a multiprocess update.
|
||||
// not really, tho for the time being -fox
|
||||
if (!make_stampfile('update_daemon.stamp')) {
|
||||
|
|
|
|||
Loading…
Reference in New Issue