X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=public.php;h=bf13fdd583040aa21f82c4226effe4458822b158;hb=51cc387347668e98b1b8e6c6053581a2affc5fa6;hp=5fd9beabdfb6c5bb425f68453d6a44bfc9063b9d;hpb=f30ef1fa1bd76b497b5c0a64a92e2e0ef7116515;p=tt-rss.git

diff --git a/public.php b/public.php
index 5fd9beab..bf13fdd5 100644
--- a/public.php
+++ b/public.php
@@ -1,4 +1,7 @@
 <?php
+	set_include_path(get_include_path() . PATH_SEPARATOR .
+		dirname(__FILE__) . "/include");
+
 	/* remove ill effects of magic quotes */
 
 	if (get_magic_quotes_gpc()) {
@@ -14,11 +17,8 @@
 		$_REQUEST = array_map('stripslashes_deep', $_REQUEST);
 	}
 
-	$op = $_REQUEST["op"];
-
 	require_once "functions.php";
-	if ($op != "share") require_once "sessions.php";
-	require_once "modules/backend-rpc.php";
+	require_once "sessions.php";
 	require_once "sanity_check.php";
 	require_once "config.php";
 	require_once "db.php";
@@ -32,30 +32,28 @@
 
 	$link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME);
 
-	if (!$link) {
-		if (DB_TYPE == "mysql") {
-			print mysql_error();
-		}
-		// PG seems to display its own errors just fine by default.
-		return;
-	}
+	if (!init_connection($link)) return;
 
-	init_connection($link);
+	if (ENABLE_GZIP_OUTPUT && function_exists("ob_gzhandler")) {
+		ob_start("ob_gzhandler");
+	}
 
-	$method = $_REQUEST["method"];
-	$mode = $_REQUEST["mode"];
+	$method = $_REQUEST["op"];
 
-	if ((!$op || $op == "rss" || $op == "dlg") && !$_REQUEST["noxml"]) {
-			header("Content-Type: application/xml; charset=utf-8");
-	} else {
-			header("Content-Type: text/plain; charset=utf-8");
-	}
+	$handler = new Handler_Public($link, $_REQUEST);
 
-	if (ENABLE_GZIP_OUTPUT) {
-		ob_start("ob_gzhandler");
+	if ($handler->before($method)) {
+		if ($method && method_exists($handler, $method)) {
+			$handler->$method();
+		} else if (method_exists($handler, 'index')) {
+			$handler->index();
+		}
+		$handler->after();
+		return;
 	}
 
-	handle_public_request($link, $op);
+	header("Content-Type: text/plain");
+	print json_encode(array("error" => array("code" => 7)));
 
 	// We close the connection to database.
 	db_close($link);