reinstate error handlers; better DB error reporting on failed queries

[tt-rss.git] / backend.php

diff --git a/backend.php b/backend.php
index 66afb06c030ca59554100f0161a11321fb34a3a5..b583d379e46fbbe726655adbfe7698ecb10a7027 100644 (file)
--- a/backend.php
+++ b/backend.php
@@ -37,23 +37,22 @@
 
        @$csrf_token = $_REQUEST['csrf_token'];
 
-       require_once "functions.php";
+       require_once "autoload.php";
        require_once "sessions.php";
+       require_once "functions.php";
        require_once "config.php";
        require_once "db.php";
        require_once "db-prefs.php";
 
-       no_cache_incantation();
-
        startup_gettext();
 
-       $script_started = getmicrotime();
+       $script_started = microtime(true);
 
        $link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME);
 
-       if (!init_connection($link)) return;
+       if (!init_plugins($link)) return;
 
-       header("Content-Type: text/plain; charset=utf-8");
+       header("Content-Type: text/json; charset=utf-8");
 
        if (ENABLE_GZIP_OUTPUT && function_exists("ob_gzhandler")) {
                ob_start("ob_gzhandler");
@@ -63,6 +62,15 @@
                authenticate_user($link, "admin", null);
        }
 
+       if ($_SESSION["uid"]) {
+               if (!validate_session($link)) {
+                       header("Content-Type: text/json");
+                       print json_encode(array("error" => array("code" => 6)));
+                       return;
+               }
+               load_user_plugins($link, $_SESSION["uid"]);
+       }
+
        $purge_intervals = array(
                0  => __("Use default"),
                -1 => __("Never purge"),
@@ -131,19 +139,19 @@
                                        $handler->after();
                                        return;
                                } else {
-                                       header("Content-Type: text/plain");
+                                       header("Content-Type: text/json");
                                        print json_encode(array("error" => array("code" => 6)));
                                        return;
                                }
                        } else {
-                               header("Content-Type: text/plain");
+                               header("Content-Type: text/json");
                                print json_encode(array("error" => array("code" => 6)));
                                return;
                        }
                }
        }
 
-       header("Content-Type: text/plain");
+       header("Content-Type: text/json");
        print json_encode(array("error" => array("code" => 7)));
 
        // We close the connection to database.