X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=backend.php;h=b2eba083eefb88231300a1349eee150609adbc03;hb=07fd4f8d9d4f301f5ad88ff9e80f042fc3eb0c36;hp=9eb3989e4c2311b2837c838e761912d2ad32fe45;hpb=58a2577d48790c79adfd44bcfd662c980ce6cfe4;p=tt-rss.git

diff --git a/backend.php b/backend.php
index 9eb3989e..b2eba083 100644
--- a/backend.php
+++ b/backend.php
@@ -37,6 +37,7 @@
 
 	@$csrf_token = $_REQUEST['csrf_token'];
 
+	require_once "autoload.php";
 	require_once "sessions.php";
 	require_once "functions.php";
 	require_once "config.php";
@@ -47,9 +48,7 @@
 
 	$script_started = microtime(true);
 
-	$link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME);
-
-	if (!init_connection($link)) return;
+	if (!init_plugins()) return;
 
 	header("Content-Type: text/json; charset=utf-8");
 
@@ -58,11 +57,16 @@
 	}
 
 	if (SINGLE_USER_MODE) {
-		authenticate_user($link, "admin", null);
+		authenticate_user( "admin", null);
 	}
 
 	if ($_SESSION["uid"]) {
-		load_user_plugins($link, $_SESSION["uid"]);
+		if (!validate_session()) {
+			header("Content-Type: text/json");
+			print error_json(6);
+			return;
+		}
+		load_user_plugins( $_SESSION["uid"]);
 	}
 
 	$purge_intervals = array(
@@ -77,21 +81,21 @@
 	$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"));
 
@@ -100,24 +104,16 @@
 		5 => __("Power User"),
 		10 => __("Administrator"));
 
-	#$error = sanity_check($link);
-
-	#if ($error['code'] != 0 && $op != "logout") {
-	#	print json_encode(array("error" => $error));
-	#	return;
-	#}
-
 	$op = str_replace("-", "_", $op);
 
-	global $pluginhost;
-	$override = $pluginhost->lookup_handler($op, $method);
+	$override = PluginHost::getInstance()->lookup_handler($op, $method);
 
 	if (class_exists($op) || $override) {
 
 		if ($override) {
 			$handler = $override;
 		} else {
-			$handler = new $op($link, $_REQUEST);
+			$handler = new $op($_REQUEST);
 		}
 
 		if ($handler && implements_interface($handler, 'IHandler')) {
@@ -134,20 +130,18 @@
 					return;
 				} else {
 					header("Content-Type: text/json");
-					print json_encode(array("error" => array("code" => 6)));
+					print error_json(6);
 					return;
 				}
 			} else {
 				header("Content-Type: text/json");
-				print json_encode(array("error" => array("code" => 6)));
+				print error_json(6);
 				return;
 			}
 		}
 	}
 
 	header("Content-Type: text/json");
-	print json_encode(array("error" => array("code" => 7)));
+	print error_json(13);
 
-	// We close the connection to database.
-	db_close($link);
 ?>