From 3f3630529e1e7a0adf2ce0022596006cfcba0089 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Tue, 13 Dec 2011 00:20:53 +0400 Subject: implement tiny-OOP routing --- classes/article.php | 63 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) create mode 100644 classes/article.php (limited to 'classes/article.php') diff --git a/classes/article.php b/classes/article.php new file mode 100644 index 000000000..98141d91e --- /dev/null +++ b/classes/article.php @@ -0,0 +1,63 @@ +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.")); + } + } + + function 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($this->link, $id, false)); + } else if ($mode == "zoom") { + array_push($articles, format_article($this->link, $id, true, true)); + } else if ($mode == "raw") { + if ($_REQUEST['html']) { + header("Content-Type: text/html"); + print ''; + } + + $article = format_article($this->link, $id, false); + print $article['content']; + return; + } + + catchupArticleById($this->link, $id, 0); + + if (!$_SESSION["bw_limit"]) { + foreach ($cids as $cid) { + if ($cid) { + array_push($articles, format_article($this->link, $cid, false, false)); + } + } + } + + print json_encode($articles); + + } + +} \ No newline at end of file -- cgit v1.2.3-54-g00ecf From 611efae712769e38e232478b484779d73af263db Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Tue, 13 Dec 2011 10:58:30 +0400 Subject: add catchall backend class --- backend.php | 4 ---- classes/article.php | 32 ++++++++++++++++---------------- classes/backend.php | 10 ++++++++++ js/digest.js | 2 +- js/viewfeed.js | 4 ++-- 5 files changed, 29 insertions(+), 23 deletions(-) create mode 100644 classes/backend.php (limited to 'classes/article.php') diff --git a/backend.php b/backend.php index 8220337ac..0390ed761 100644 --- a/backend.php +++ b/backend.php @@ -181,10 +181,6 @@ module_pref_instances($link); break; // pref-instances - case "digestTest": - print_r(prepare_headlines_digest($link, $_SESSION["uid"])); - break; // digestTest - case "digestSend": send_headlines_digests($link); break; // digestSend diff --git a/classes/article.php b/classes/article.php index 98141d91e..70ecd2653 100644 --- a/classes/article.php +++ b/classes/article.php @@ -1,20 +1,20 @@ 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.")); } @@ -25,12 +25,12 @@ class Article extends Handler { $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($this->link, $id, false)); } else if ($mode == "zoom") { @@ -40,14 +40,14 @@ class Article extends Handler { header("Content-Type: text/html"); print ''; } - + $article = format_article($this->link, $id, false); print $article['content']; return; } - + catchupArticleById($this->link, $id, 0); - + if (!$_SESSION["bw_limit"]) { foreach ($cids as $cid) { if ($cid) { @@ -55,9 +55,9 @@ class Article extends Handler { } } } - + print json_encode($articles); - + } - -} \ No newline at end of file + +} diff --git a/classes/backend.php b/classes/backend.php new file mode 100644 index 000000000..47fc2d826 --- /dev/null +++ b/classes/backend.php @@ -0,0 +1,10 @@ +"; + } +} +?> diff --git a/js/digest.js b/js/digest.js index fc0446d83..12d45e536 100644 --- a/js/digest.js +++ b/js/digest.js @@ -805,7 +805,7 @@ function tweet_article(id) { var d = new Date(); var ts = d.getTime(); - var w = window.open('backend.php?op=loading', 'ttrss_tweet', + var w = window.open('backend.php?op=backend&method=loading', 'ttrss_tweet', "status=0,toolbar=0,location=0,width=500,height=400,scrollbars=1,menubar=0"); new Ajax.Request("backend.php", { diff --git a/js/viewfeed.js b/js/viewfeed.js index b9b2a8e2b..d267c7693 100644 --- a/js/viewfeed.js +++ b/js/viewfeed.js @@ -1770,7 +1770,7 @@ function getLastVisibleHeadlineId() { function openArticleInNewWindow(id) { toggleUnread(id, 0, false); - window.open("backend.php?op=article&id=" + id); + window.open("backend.php?op=article&method=redirect&id=" + id); } function isCdmMode() { @@ -2003,7 +2003,7 @@ function tweetArticle(id) { var d = new Date(); var ts = d.getTime(); - var w = window.open('backend.php?op=loading', 'ttrss_tweet', + var w = window.open('backend.php?op=backend&method=loading', 'ttrss_tweet', "status=0,toolbar=0,location=0,width=500,height=400,scrollbars=1,menubar=0"); new Ajax.Request("backend.php", { -- cgit v1.2.3-54-g00ecf From 46da73c255353a3f874d9742d7b2f9c64e7607b5 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Tue, 13 Dec 2011 14:15:42 +0400 Subject: implement ProtectedHandler --- classes/article.php | 2 +- classes/dlg.php | 16 ++++---- classes/feeds.php | 94 +++++++++++++++++++++---------------------- classes/pref_feeds.php | 12 +++--- classes/pref_filters.php | 2 +- classes/pref_labels.php | 2 +- classes/pref_prefs.php | 2 +- classes/pref_users.php | 2 +- classes/protected_handler.php | 8 ++++ classes/rpc.php | 10 ++--- 10 files changed, 79 insertions(+), 71 deletions(-) create mode 100644 classes/protected_handler.php (limited to 'classes/article.php') diff --git a/classes/article.php b/classes/article.php index 70ecd2653..90ca129b9 100644 --- a/classes/article.php +++ b/classes/article.php @@ -1,5 +1,5 @@ "; } function importOpml() { header("Content-Type: text/html"); # required for iframe - + print "
"; $owner_uid = $_SESSION["uid"]; @@ -534,7 +534,7 @@ class Dlg extends Handler { } function inactiveFeeds() { - + if (DB_TYPE == "pgsql") { $interval_qpart = "NOW() - INTERVAL '3 months'"; } else { @@ -714,7 +714,7 @@ class Dlg extends Handler { } function printTagSelect() { - + print "" . __('Select item(s) by tags') . ""; print "".__('View as RSS').""; print "link); $version = $version_data['version']; $id = $version_data['version_id']; diff --git a/classes/feeds.php b/classes/feeds.php index a654c92ae..f4d19c00c 100644 --- a/classes/feeds.php +++ b/classes/feeds.php @@ -1,11 +1,11 @@ link, "UPDATE ttrss_user_entries SET last_read = NOW(),unread = false WHERE owner_uid = " . $_SESSION["uid"]); ccache_zero_all($this->link, $_SESSION["uid"]); - } + } function collapse() { $cat_id = db_escape_string($_REQUEST["cid"]); @@ -15,36 +15,36 @@ class Feeds extends Handler { function index() { $root = (bool)$_REQUEST["root"]; - + if (!$root) { print json_encode(outputFeedList($this->link)); } else { - + $feeds = outputFeedList($this->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); } - } - + } + function view() { $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["m"]); $view_mode = db_escape_string($_REQUEST["view_mode"]); @@ -54,19 +54,19 @@ class Feeds extends Handler { @$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($this->link)); return; } - + $result = false; - + if ($feed < -10) { $label_feed = -11-$feed; $result = db_query($this->link, "SELECT id FROM ttrss_labels2 WHERE @@ -78,45 +78,45 @@ class Feeds extends Handler { $result = db_query($this->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($this->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($this->link, $feed, $_SESSION["uid"], $cat_view); } - + set_pref($this->link, "_DEFAULT_VIEW_MODE", $view_mode); set_pref($this->link, "_DEFAULT_VIEW_LIMIT", $limit); set_pref($this->link, "_DEFAULT_VIEW_ORDER_BY", $order_by); - + if (!$cat_view && preg_match("/^[0-9][0-9]*$/", $feed)) { db_query($this->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($this->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($this->link, 'REVERSE_HEADLINES', $owner_uid)) { @@ -125,7 +125,7 @@ class Feeds extends Handler { $override_order = "$date_sort_field DESC"; } break; - + case "title": if (get_pref($this->link, 'REVERSE_HEADLINES', $owner_uid)) { $override_order = "title DESC, $date_sort_field"; @@ -133,7 +133,7 @@ class Feeds extends Handler { $override_order = "title, $date_sort_field DESC"; } break; - + case "score": if (get_pref($this->link, 'REVERSE_HEADLINES', $owner_uid)) { $override_order = "score, $date_sort_field"; @@ -142,46 +142,46 @@ class Feeds extends Handler { } break; } - + if ($_REQUEST["debug"]) $timing_info = print_checkpoint("04", $timing_info); - + $ret = format_headlines_list($this->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]; - + $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($this->link, 'COMBINED_DISPLAY_MODE') && !$_SESSION["bw_limit"]) { $articles = array(); - + foreach ($topmost_article_ids as $id) { array_push($articles, format_article($this->link, $id, false)); } - + $reply['articles'] = $articles; } - + if ($_REQUEST["debug"]) $timing_info = print_checkpoint("30", $timing_info); - + $reply['runtime-info'] = make_runtime_info($this->link); - + print json_encode($reply); - + } } -?> \ No newline at end of file +?> diff --git a/classes/pref_feeds.php b/classes/pref_feeds.php index bf15bf25a..783d29f79 100644 --- a/classes/pref_feeds.php +++ b/classes/pref_feeds.php @@ -1,5 +1,5 @@ "; @@ -529,7 +529,7 @@ class Pref_Feeds extends Handler { global $purge_intervals; global $update_intervals; global $update_methods; - + $feed_ids = db_escape_string($_REQUEST["ids"]); print ""; @@ -688,13 +688,13 @@ class Pref_Feeds extends Handler { function batchEditSave() { return editsaveops(true); } - + function editSave() { return editsaveops(false); } - - function editsaveops($batch) { - + + function editsaveops($batch) { + $feed_title = db_escape_string(trim($_POST["title"])); $feed_link = db_escape_string(trim($_POST["feed_url"])); $upd_intl = (int) db_escape_string($_POST["update_interval"]); diff --git a/classes/pref_filters.php b/classes/pref_filters.php index 754e8d211..fdae5f59e 100644 --- a/classes/pref_filters.php +++ b/classes/pref_filters.php @@ -1,5 +1,5 @@ diff --git a/classes/rpc.php b/classes/rpc.php index 8f03381f8..c6fc8c263 100644 --- a/classes/rpc.php +++ b/classes/rpc.php @@ -1,9 +1,9 @@ link)) { $omode = $_REQUEST["omode"]; - + if ($omode != "T") $reply['counters'] = getAllCounters($this->link, $omode); else @@ -403,11 +403,11 @@ class RPC extends Handler { function assigntolabel() { return labelops(true); } - + function removefromlabel() { return labelops(false); } - + function labelops($assign) { $reply = array(); -- cgit v1.2.3-54-g00ecf