modify include path order (closes #514)

[tt-rss.git] / backend.php

diff --git a/backend.php b/backend.php
index 2e4da500fe794a11440acde7c9d35235f7726394..511bb35528245b5b015aa44660372184e731f2e9 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 */
 
@@ -35,14 +35,10 @@
                return;
        }
 
-       $csrf_token = $_REQUEST['csrf_token'];
-
-       if (!$csrf_token)
-               error_log("[$op/$method] CSRF: [$csrf_token]\n", 3, "/tmp/csrf.log");
+       @$csrf_token = $_REQUEST['csrf_token'];
 
        require_once "functions.php";
        require_once "sessions.php";
-       require_once "sanity_check.php";
        require_once "config.php";
        require_once "db.php";
        require_once "db-prefs.php";
@@ -59,7 +55,7 @@
 
        header("Content-Type: text/plain; charset=utf-8");
 
-       if (ENABLE_GZIP_OUTPUT) {
+       if (ENABLE_GZIP_OUTPUT && function_exists("ob_gzhandler")) {
                ob_start("ob_gzhandler");
        }
 
@@ -67,20 +63,6 @@
                authenticate_user($link, "admin", null);
        }
 
-       // TODO remove and handle within Handlers
-
-       if (!($_SESSION["uid"] && validate_session($link))) {
-               if ($op == 'pref-feeds' && $method == 'add') {
-                       header("Content-Type: text/html");
-                       login_sequence($link);
-                       render_login_form($link);
-               } else {
-                       header("Content-Type: text/plain");
-                       print json_encode(array("error" => array("code" => 6)));
-               }
-               return;
-       }
-
        $purge_intervals = array(
                0  => __("Use default"),
                -1 => __("Never purge"),
@@ -114,8 +96,7 @@
        $update_methods = array(
                0   => __("Default"),
                1   => __("Magpie"),
-               2   => __("SimplePie"),
-               3   => __("Twitter OAuth"));
+               2   => __("SimplePie"));
 
        if (DEFAULT_UPDATE_METHOD == "1") {
                $update_methods[0] .= ' (SimplePie)';
@@ -128,26 +109,19 @@
                5 => __("Power User"),
                10 => __("Administrator"));
 
-       $error = sanity_check($link);
+       #$error = sanity_check($link);
 
-       if ($error['code'] != 0 && $op != "logout") {
-               print json_encode(array("error" => $error));
-               return;
-       }
-
-       function __autoload($class) {
-               $file = "classes/".strtolower(basename($class)).".php";
-               if (file_exists($file)) {
-                       require $file;
-               }
-       }
+       #if ($error['code'] != 0 && $op != "logout") {
+       #       print json_encode(array("error" => $error));
+       #       return;
+       #}
 
        $op = str_replace("-", "_", $op);
 
        if (class_exists($op)) {
                $handler = new $op($link, $_REQUEST);
 
-               if ($handler) {
+               if ($handler && is_subclass_of($handler, 'Handler')) {
                        if (validate_csrf($csrf_token) || $handler->csrf_ignore($method)) {
                                if ($handler->before($method)) {
                                        if ($method && method_exists($handler, $method)) {
@@ -155,6 +129,10 @@
                                        }
                                        $handler->after();
                                        return;
+                               } else {
+                                       header("Content-Type: text/plain");
+                                       print json_encode(array("error" => array("code" => 6)));
+                                       return;
                                }
                        } else {
                                header("Content-Type: text/plain");