X-Git-Url: https://git.wh0rd.org/?p=tt-rss.git;a=blobdiff_plain;f=backend.php;h=b2eba083eefb88231300a1349eee150609adbc03;hp=b670451a48722d233cd1c64f03d85bb3d90fce1d;hb=e2b8c9273e09091c235959c25d8e4d8122aa6ca8;hpb=0d421af86fdfe270e7396f308cf53f3b908e3d74

diff --git a/backend.php b/backend.php
index b670451a..b2eba083 100644
--- 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 */
 
@@ -37,44 +37,36 @@
 
 	@$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();
-
-	$link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME);
+	$script_started = microtime(true);
 
-	if (!init_connection($link)) return;
+	if (!init_plugins()) 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");
 	}
 
 	if (SINGLE_USER_MODE) {
-		authenticate_user($link, "admin", null);
+		authenticate_user( "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)));
+	if ($_SESSION["uid"]) {
+		if (!validate_session()) {
+			header("Content-Type: text/json");
+			print error_json(6);
+			return;
 		}
-		return;
+		load_user_plugins( $_SESSION["uid"]);
 	}
 
 	$purge_intervals = array(
@@ -89,73 +81,67 @@
 	$update_intervals = array(
 		0   => __("Default interval"),
 		-1  => __("Disable updates"),
-		15  => __("Each 15 minutes"),
-		30  => __("Each 30 minutes"),
+		15  => __("15 minutes"),
+		30  => __("30 minutes"),
 		60  => __("Hourly"),
-		240 => __("Each 4 hours"),
-		720 => __("Each 12 hours"),
+		240 => __("4 hours"),
+		720 => __("12 hours"),
 		1440 => __("Daily"),
 		10080 => __("Weekly"));
 
 	$update_intervals_nodefault = array(
 		-1  => __("Disable updates"),
-		15  => __("Each 15 minutes"),
-		30  => __("Each 30 minutes"),
+		15  => __("15 minutes"),
+		30  => __("30 minutes"),
 		60  => __("Hourly"),
-		240 => __("Each 4 hours"),
-		720 => __("Each 12 hours"),
+		240 => __("4 hours"),
+		720 => __("12 hours"),
 		1440 => __("Daily"),
 		10080 => __("Weekly"));
 
-	$update_methods = array(
-		0   => __("Default"),
-		1   => __("Magpie"),
-		2   => __("SimplePie"),
-		3   => __("Twitter OAuth"));
-
-	if (DEFAULT_UPDATE_METHOD == "1") {
-		$update_methods[0] .= ' (SimplePie)';
-	} else {
-		$update_methods[0] .= ' (Magpie)';
-	}
-
 	$access_level_names = array(
 		0 => __("User"),
 		5 => __("Power User"),
 		10 => __("Administrator"));
 
-	#$error = sanity_check($link);
+	$op = str_replace("-", "_", $op);
 
-	#if ($error['code'] != 0 && $op != "logout") {
-	#	print json_encode(array("error" => $error));
-	#	return;
-	#}
+	$override = PluginHost::getInstance()->lookup_handler($op, $method);
 
-	$op = str_replace("-", "_", $op);
+	if (class_exists($op) || $override) {
 
-	if (class_exists($op)) {
-		$handler = new $op($link, $_REQUEST);
+		if ($override) {
+			$handler = $override;
+		} else {
+			$handler = new $op($_REQUEST);
+		}
 
-		if ($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;
+				} else {
+					header("Content-Type: text/json");
+					print error_json(6);
+					return;
 				}
 			} else {
-				header("Content-Type: text/plain");
-				print json_encode(array("error" => array("code" => 6)));
+				header("Content-Type: text/json");
+				print error_json(6);
 				return;
 			}
 		}
 	}
 
-	header("Content-Type: text/plain");
-	print json_encode(array("error" => array("code" => 7)));
+	header("Content-Type: text/json");
+	print error_json(13);
 
-	// We close the connection to database.
-	db_close($link);
 ?>