remove magpie, fix article filter plugins

[tt-rss.git] / backend.php

diff --git a/backend.php b/backend.php
index bf87b55d3e63cc40aaca58b15aeac8984f6dc860..66afb06c030ca59554100f0161a11321fb34a3a5 100644 (file)
--- a/backend.php
+++ b/backend.php
@@ -1,6 +1,6 @@
 <?php
-       set_include_path(get_include_path() . PATH_SEPARATOR .
-               dirname(__FILE__) . "/include");
+       set_include_path(dirname(__FILE__) ."/include" . PATH_SEPARATOR .
+               get_include_path());
 
        /* remove ill effects of magic quotes */
 
@@ -93,17 +93,6 @@
                1440 => __("Daily"),
                10080 => __("Weekly"));
 
-       $update_methods = array(
-               0   => __("Default"),
-               1   => __("Magpie"),
-               2   => __("SimplePie"));
-
-       if (DEFAULT_UPDATE_METHOD == "1") {
-               $update_methods[0] .= ' (SimplePie)';
-       } else {
-               $update_methods[0] .= ' (Magpie)';
-       }
-
        $access_level_names = array(
                0 => __("User"),
                5 => __("Power User"),
@@ -118,14 +107,26 @@
 
        $op = str_replace("-", "_", $op);
 
-       if (class_exists($op)) {
-               $handler = new $op($link, $_REQUEST);
+       global $pluginhost;
+       $override = $pluginhost->lookup_handler($op, $method);
+
+       if (class_exists($op) || $override) {
+
+               if ($override) {
+                       $handler = $override;
+               } else {
+                       $handler = new $op($link, $_REQUEST);
+               }
 
-               if ($handler && is_subclass_of($handler, 'Handler')) {
+               if ($handler && implements_interface($handler, 'IHandler')) {
                        if (validate_csrf($csrf_token) || $handler->csrf_ignore($method)) {
                                if ($handler->before($method)) {
                                        if ($method && method_exists($handler, $method)) {
                                                $handler->$method();
+                                       } else {
+                                               if (method_exists($handler, "catchall")) {
+                                                       $handler->catchall($method);
+                                               }
                                        }
                                        $handler->after();
                                        return;