implement tiny-OOP routing

1 files changed, 10 insertions, 265 deletions

diff --git a/backend.php b/backend.php
index c9eed0e9a..9e6da8d20 100644
--- a/backend.php
+++ b/backend.php
@@ -53,11 +53,13 @@
 	$method = strtolower($_REQUEST["method"]);
 	$mode = $_REQUEST["mode"];
 
-	if ((!$op || $op == "rss" || $op == "dlg") && !$_REQUEST["noxml"]) {
+	/* 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");
-	}
+	} */
+
+	header("Content-Type: text/plain; charset=utf-8");
 
 	if (ENABLE_GZIP_OUTPUT) {
 		ob_start("ob_gzhandler");
@@ -134,8 +136,6 @@
 		5 => __("Power User"),
 		10 => __("Administrator"));
 
-
-
 	$error = sanity_check($link);
 
 	if ($error['code'] != 0 && $op != "logout") {
@@ -148,268 +148,18 @@
 
 		if ($handler) {
 			if ($handler->before()) {
-				if (method_exists($handler, $method)) {
-					return $handler->$method();
+				if ($method && method_exists($handler, $method)) {
+					$handler->$method();
+				} else if (method_exists($handler, 'index')) {
+					$handler->index();
 				}
+				$handler->after();
+				return;
 			}
 		}
 	}
 
 	switch($op) { // Select action according to $op value.
-		case "feeds":
-			$method = $_REQUEST["method"];
-			$root = (bool)$_REQUEST["root"];
-
-			switch($method) {
-				case "catchupAll":
-					db_query($link, "UPDATE ttrss_user_entries SET
-						last_read = NOW(),unread = false WHERE owner_uid = " . $_SESSION["uid"]);
-					ccache_zero_all($link, $_SESSION["uid"]);
-
-				break;
-
-				case "collapse":
-					$cat_id = db_escape_string($_REQUEST["cid"]);
-					$mode = (int) db_escape_string($_REQUEST['mode']);
-					toggle_collapse_cat($link, $cat_id, $mode);
-					return;
-				break;
-			}
-
-			if (!$root) {
-				print json_encode(outputFeedList($link));
-			} else {
-
-				$feeds = outputFeedList($link, false);
-
-				$root = array();
-				$root['id'] = 'root';
-				$root['name'] = __('Feeds');
-				$root['items'] = $feeds['items'];
-
-				$fl = array();
-				$fl['identifier'] = 'id';
-				$fl['label'] = 'name';
-				$fl['items'] = array($root);
-
-				print json_encode($fl);
-			}
-
-		break; // feeds
-
-		case "la":
-			$id = db_escape_string($_REQUEST['id']);
-
-			$result = db_query($link, "SELECT link FROM ttrss_entries, ttrss_user_entries
-				WHERE id = '$id' AND id = ref_id AND owner_uid = '".$_SESSION['uid']."'
-				LIMIT 1");
-
-			if (db_num_rows($result) == 1) {
-				$article_url = db_fetch_result($result, 0, 'link');
-				$article_url = str_replace("\n", "", $article_url);
-
-				header("Location: $article_url");
-				return;
-
-			} else {
-				print_error(__("Article not found."));
-			}
-		break;
-
-		case "view":
-
-			$id = db_escape_string($_REQUEST["id"]);
-			$cids = explode(",", db_escape_string($_REQUEST["cids"]));
-			$mode = db_escape_string($_REQUEST["mode"]);
-			$omode = db_escape_string($_REQUEST["omode"]);
-
-			// in prefetch mode we only output requested cids, main article
-			// just gets marked as read (it already exists in client cache)
-
-			$articles = array();
-
-			if ($mode == "") {
-				array_push($articles, format_article($link, $id, false));
-			} else if ($mode == "zoom") {
-				array_push($articles, format_article($link, $id, true, true));
-			} else if ($mode == "raw") {
-				if ($_REQUEST['html']) {
-					header("Content-Type: text/html");
-					print '<link rel="stylesheet" type="text/css" href="tt-rss.css"/>';
-				}
-
-				$article = format_article($link, $id, false);
-				print $article['content'];
-				return;
-			}
-
-			catchupArticleById($link, $id, 0);
-
-			if (!$_SESSION["bw_limit"]) {
-				foreach ($cids as $cid) {
-					if ($cid) {
-						array_push($articles, format_article($link, $cid, false, false));
-					}
-				}
-			}
-
-			print json_encode($articles);
-
-		break; // view
-
-		case "viewfeed":
-
-			$timing_info = getmicrotime();
-
-			$reply = array();
-
-			if ($_REQUEST["debug"]) $timing_info = print_checkpoint("0", $timing_info);
-
-			$omode = db_escape_string($_REQUEST["omode"]);
-
-			$feed = db_escape_string($_REQUEST["feed"]);
-			$method = db_escape_string($_REQUEST["method"]);
-			$view_mode = db_escape_string($_REQUEST["view_mode"]);
-			$limit = (int) get_pref($link, "DEFAULT_ARTICLE_LIMIT");
-			@$cat_view = db_escape_string($_REQUEST["cat"]) == "true";
-			@$next_unread_feed = db_escape_string($_REQUEST["nuf"]);
-			@$offset = db_escape_string($_REQUEST["skip"]);
-			@$vgroup_last_feed = db_escape_string($_REQUEST["vgrlf"]);
-			$order_by = db_escape_string($_REQUEST["order_by"]);
-
-			if (is_numeric($feed)) $feed = (int) $feed;
-
-			/* Feed -5 is a special case: it is used to display auxiliary information
-			 * when there's nothing to load - e.g. no stuff in fresh feed */
-
-			if ($feed == -5) {
-				print json_encode(generate_dashboard_feed($link));
-				return;
-			}
-
-			$result = false;
-
-			if ($feed < -10) {
-				$label_feed = -11-$feed;
-				$result = db_query($link, "SELECT id FROM ttrss_labels2 WHERE
-					id = '$label_feed' AND owner_uid = " . $_SESSION['uid']);
-			} else if (!$cat_view && is_numeric($feed) && $feed > 0) {
-				$result = db_query($link, "SELECT id FROM ttrss_feeds WHERE
-					id = '$feed' AND owner_uid = " . $_SESSION['uid']);
-			} else if ($cat_view && is_numeric($feed) && $feed > 0) {
-				$result = db_query($link, "SELECT id FROM ttrss_feed_categories WHERE
-					id = '$feed' AND owner_uid = " . $_SESSION['uid']);
-			}
-
-			if ($result && db_num_rows($result) == 0) {
-				print json_encode(generate_error_feed($link, __("Feed not found.")));
-				return;
-			}
-
-			/* Updating a label ccache means recalculating all of the caches
-			 * so for performance reasons we don't do that here */
-
-			if ($feed >= 0) {
-				ccache_update($link, $feed, $_SESSION["uid"], $cat_view);
-			}
-
-			set_pref($link, "_DEFAULT_VIEW_MODE", $view_mode);
-			set_pref($link, "_DEFAULT_VIEW_LIMIT", $limit);
-			set_pref($link, "_DEFAULT_VIEW_ORDER_BY", $order_by);
-
-			if (!$cat_view && preg_match("/^[0-9][0-9]*$/", $feed)) {
-				db_query($link, "UPDATE ttrss_feeds SET last_viewed = NOW()
-					WHERE id = '$feed' AND owner_uid = ".$_SESSION["uid"]);
-			}
-
-			$reply['headlines'] = array();
-
-			if (!$next_unread_feed)
-				$reply['headlines']['id'] = $feed;
-			else
-				$reply['headlines']['id'] = $next_unread_feed;
-
-			$reply['headlines']['is_cat'] = (bool) $cat_view;
-
-			$override_order = false;
-
-			if (get_pref($link, "SORT_HEADLINES_BY_FEED_DATE", $owner_uid)) {
-				$date_sort_field = "updated";
-			} else {
-				$date_sort_field = "date_entered";
-			}
-
-			switch ($order_by) {
-				case "date":
-					if (get_pref($link, 'REVERSE_HEADLINES', $owner_uid)) {
-						$override_order = "$date_sort_field";
-					} else {
-						$override_order = "$date_sort_field DESC";
-					}
-					break;
-
-				case "title":
-					if (get_pref($link, 'REVERSE_HEADLINES', $owner_uid)) {
-						$override_order = "title DESC, $date_sort_field";
-					} else {
-						$override_order = "title, $date_sort_field DESC";
-					}
-					break;
-
-				case "score":
-					if (get_pref($link, 'REVERSE_HEADLINES', $owner_uid)) {
-						$override_order = "score, $date_sort_field";
-					} else {
-						$override_order = "score DESC, $date_sort_field DESC";
-					}
-					break;
-			}
-
-			if ($_REQUEST["debug"]) $timing_info = print_checkpoint("04", $timing_info);
-
-			$ret = format_headlines_list($link, $feed, $method,
-				$view_mode, $limit, $cat_view, $next_unread_feed, $offset,
-				$vgroup_last_feed, $override_order);
-
-			$topmost_article_ids = $ret[0];
-			$headlines_count = $ret[1];
-			$returned_feed = $ret[2];
-			$disable_cache = $ret[3];
-			$vgroup_last_feed = $ret[4];
-
-//			if ($_REQUEST["debug"]) print_r($ret);
-
-			$reply['headlines']['content'] =& $ret[5]['content'];
-			$reply['headlines']['toolbar'] =& $ret[5]['toolbar'];
-
-			if ($_REQUEST["debug"]) $timing_info = print_checkpoint("05", $timing_info);
-
-			$reply['headlines-info'] = array("count" => (int) $headlines_count,
-				"vgroup_last_feed" => $vgroup_last_feed,
-				"disable_cache" => (bool) $disable_cache);
-
-			if ($_REQUEST["debug"]) $timing_info = print_checkpoint("20", $timing_info);
-
-			if (is_array($topmost_article_ids) && !get_pref($link, 'COMBINED_DISPLAY_MODE') && !$_SESSION["bw_limit"]) {
-				$articles = array();
-
-				foreach ($topmost_article_ids as $id) {
-					array_push($articles, format_article($link, $id, false));
-				}
-
-				$reply['articles'] = $articles;
-			}
-
-//			if ($method) {
-//				$reply['counters'] = getAllCounters($link, $omode, $feed);
-//			}
-
-			if ($_REQUEST["debug"]) $timing_info = print_checkpoint("30", $timing_info);
-
-			$reply['runtime-info'] = make_runtime_info($link);
-
-			print json_encode($reply);
-		break; // viewfeed
 
 		case "pref-feeds":
 			require_once "modules/pref-feeds.php";
@@ -441,11 +191,6 @@
 			module_help($link);
 		break; // help
 
-		case "dlg":
-			require_once "modules/popup-dialog.php";
-			module_popup_dialog($link);
-		break; // dlg
-
 		case "pref-instances":
 			require_once "modules/pref-instances.php";
 			module_pref_instances($link);