From f30ef1fa1bd76b497b5c0a64a92e2e0ef7116515 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Mon, 12 Dec 2011 22:46:25 +0400 Subject: subop -> method --- public.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'public.php') diff --git a/public.php b/public.php index c2de2185f..5fd9beabd 100644 --- a/public.php +++ b/public.php @@ -42,7 +42,7 @@ init_connection($link); - $subop = $_REQUEST["subop"]; + $method = $_REQUEST["method"]; $mode = $_REQUEST["mode"]; if ((!$op || $op == "rss" || $op == "dlg") && !$_REQUEST["noxml"]) { -- cgit v1.2.3-54-g00ecf 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 --- backend.php | 275 +----------- classes/article.php | 63 +++ classes/dlg.php | 1089 ++++++++++++++++++++++++++++++++++++++++++++ classes/feeds.php | 187 ++++++++ classes/handler.php | 4 + js/feedlist.js | 4 +- js/functions.js | 10 +- js/prefs.js | 8 +- js/tt-rss.js | 6 +- js/viewfeed.js | 12 +- modules/popup-dialog.php | 1122 ---------------------------------------------- public.php | 3 +- 12 files changed, 1375 insertions(+), 1408 deletions(-) create mode 100644 classes/article.php create mode 100644 classes/dlg.php create mode 100644 classes/feeds.php delete mode 100644 modules/popup-dialog.php (limited to 'public.php') 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 ''; - } - - $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); 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 diff --git a/classes/dlg.php b/classes/dlg.php new file mode 100644 index 000000000..3a66bf129 --- /dev/null +++ b/classes/dlg.php @@ -0,0 +1,1089 @@ +param = db_escape_string($_REQUEST["param"]); + print ""; + return true; + } + return false; + } + + function after() { + print ""; + } + + function importOpml() { + header("Content-Type: text/html"); # required for iframe + + print "
"; + $owner_uid = $_SESSION["uid"]; + + db_query($this->link, "BEGIN"); + + /* create Imported feeds category just in case */ + + $result = db_query($this->link, "SELECT id FROM + ttrss_feed_categories WHERE title = 'Imported feeds' AND + owner_uid = '$owner_uid' LIMIT 1"); + + if (db_num_rows($result) == 0) { + db_query($this->link, "INSERT INTO ttrss_feed_categories + (title,owner_uid) + VALUES ('Imported feeds', '$owner_uid')"); + } + + db_query($this->link, "COMMIT"); + + /* Handle OPML import by DOMXML/DOMDocument */ + + if (function_exists('domxml_open_file')) { + print "
    "; + print "
  • ".__("Importing using DOMXML.")."
    • "; + require_once "opml_domxml.php"; + opml_import_domxml($this->link, $owner_uid); + print "
"; + } else if (PHP_VERSION >= 5) { + print "
    "; + print "
  • ".__("Importing using DOMDocument.")."
    • "; + require_once "opml_domdoc.php"; + opml_import_domdoc($this->link, $owner_uid); + print "
"; + } else { + print_error(__("DOMXML extension is not found. It is required for PHP versions below 5.")); + } + + print "
"; + + print "
"; + print ""; + print "
"; + + print ""; + + //return; + } + + function editPrefProfiles() { + print "
"; + + print " +
"; + + $result = db_query($this->link, "SELECT title,id FROM ttrss_settings_profiles + WHERE owner_uid = ".$_SESSION["uid"]." ORDER BY title"); + + print "
"; + + print "
"; + + print ""; + + print ""; #odd + + print ""; + + if (!$_SESSION["profile"]) { + $is_active = __("(active)"); + } else { + $is_active = ""; + } + + print ""; + + print ""; + + $lnum = 1; + + while ($line = db_fetch_assoc($result)) { + + $class = ($lnum % 2) ? "even" : "odd"; + + $profile_id = $line["id"]; + $this_row_id = "id=\"FCATR-$profile_id\""; + + print ""; + + $edit_title = htmlspecialchars($line["title"]); + + print ""; + + if ($_SESSION["profile"] == $line["id"]) { + $is_active = __("(active)"); + } else { + $is_active = ""; + } + + print ""; + + print ""; + + ++$lnum; + } + + print "
" . + __("Default profile") . " $is_active
" . $edit_title . + " + $is_active
"; + print "
"; + print "
"; + + print "
+
+ + +
"; + + print ""; + print "
"; + + } + + function pubOPMLUrl() { + print "".__('Public OPML URL').""; + print "link); + + print __("Your Public OPML URL is:"); + + print "
"; + print "$url_path"; + print "
"; + + print "
"; + + print " "; + + print ""; + + print "
"; + print "]]>"; + + //return; + } + + function explainError() { + print "".__('Notice').""; + print ""; + + if ($this->param == 1) { + print __("Update daemon is enabled in configuration, but daemon process is not running, which prevents all feeds from updating. Please start the daemon process or contact instance owner."); + + $stamp = (int) file_get_contents(LOCK_DIRECTORY . "/update_daemon.stamp"); + + print "

" . __("Last update:") . " " . date("Y.m.d, G:i", $stamp); + + } + + if ($this->param == 3) { + print __("Update daemon is taking too long to perform a feed update. This could indicate a problem like crash or a hang. Please check the daemon process or contact instance owner."); + + $stamp = (int) file_get_contents(LOCK_DIRECTORY . "/update_daemon.stamp"); + + print "

" . __("Last update:") . " " . date("Y.m.d, G:i", $stamp); + + } + + print ""; + + print "

"; + + print ""; + + print "
"; + print "]]>"; + + //return; + } + + function quickAddFeed() { + print ""; + print ""; + + print "
".__("Feed")."
"; + print "
"; + + print ""; + + print "
"; + + if (get_pref($this->link, 'ENABLE_FEED_CATS')) { + print __('Place in category:') . " "; + print_feed_cat_select($this->link, "cat", false, 'dojoType="dijit.form.Select"'); + } + + print "
"; + + print ''; + + print ""; + + + print "
+ +
"; + + print ""; + + print "
+ + + +
"; + + //return; + } + + function feedBrowser() { + $browser_search = db_escape_string($_REQUEST["search"]); + + print ""; + print ""; + + print "
+
+ + + +
"; + + print " "; + + print __("limit:"); + + print " "; + + print "
"; + + $owner_uid = $_SESSION["uid"]; + + print ""; + + print "
+ + +
"; + + } + + function search() { + $this->params = explode(":", db_escape_string($_REQUEST["param"]), 2); + + $active_feed_id = sprintf("%d", $this->params[0]); + $is_cat = $this->params[1] != "false"; + + print "
".__('Look for')."
"; + + print "
"; + + if (!SPHINX_ENABLED) { + + print ""; + + print " " . __('match on')." "; + + $search_fields = array( + "title" => __("Title"), + "content" => __("Content"), + "both" => __("Title or content")); + + print_select_hash("match_on", 3, $search_fields, + 'dojoType="dijit.form.Select"'); + } else { + print ""; + } + + + print "
".__('Limit search to:')." "; + + print ""; + + print "
"; + + print "
"; + + if (!SPHINX_ENABLED) { + print "
+ Search syntax +
"; + } + + print " + +
"; + } + + function quickAddFilter() { + $active_feed_id = db_escape_string($_REQUEST["param"]); + + print ""; + print ""; + print ""; + + $result = db_query($this->link, "SELECT id,description + FROM ttrss_filter_types ORDER BY description"); + + $filter_types = array(); + + while ($line = db_fetch_assoc($result)) { + //array_push($filter_types, $line["description"]); + $filter_types[$line["id"]] = __($line["description"]); + } + + print "
".__("Match")."
"; + + print "
"; + + print ""; + + $filter_params = array( + "before" => __("before"), + "after" => __("after")); + + print_select_hash("filter_date_modifier", "before", + $filter_params, 'dojoType="dijit.form.Select"'); + + print " "; + + print ""; + + print ""; + print " "; + print ""; + + print "
" . __("on field") . " "; + print_select_hash("filter_type", 1, $filter_types, + 'onchange="filterDlgCheckType(this)" dojoType="dijit.form.Select"'); + + print "
"; + + print __("in") . " "; + print_feed_select($this->link, "feed_id", $active_feed_id, + 'dojoType="dijit.form.FilteringSelect"'); + + print "
"; + + print "
".__("Perform Action")."
"; + + print "
"; + + print ""; + + print ""; + print " " . __("with parameters:") . " "; + print ""; + + print_label_select($this->link, "action_param_label", $action_param, + 'id="filterDlg_actionParamLabel" dojoType="dijit.form.Select"'); + + print ""; + + print " "; // tiny layout hack + + print "
"; + + print "
".__("Options")."
"; + print "
"; + + print " +
"; + + print " + "; + + print "
"; + + print "
"; + + print " "; + + print " "; + + print ""; + + print "
"; + } + + function inactiveFeeds() { + + if (DB_TYPE == "pgsql") { + $interval_qpart = "NOW() - INTERVAL '3 months'"; + } else { + $interval_qpart = "DATE_SUB(NOW(), INTERVAL 3 MONTH)"; + } + + $result = db_query($this->link, "SELECT ttrss_feeds.title, ttrss_feeds.site_url, + ttrss_feeds.feed_url, ttrss_feeds.id, MAX(updated) AS last_article + FROM ttrss_feeds, ttrss_entries, ttrss_user_entries WHERE + (SELECT MAX(updated) FROM ttrss_entries, ttrss_user_entries WHERE + ttrss_entries.id = ref_id AND + ttrss_user_entries.feed_id = ttrss_feeds.id) < $interval_qpart + AND ttrss_feeds.owner_uid = ".$_SESSION["uid"]." AND + ttrss_user_entries.feed_id = ttrss_feeds.id AND + ttrss_entries.id = ref_id + GROUP BY ttrss_feeds.title, ttrss_feeds.id, ttrss_feeds.site_url, ttrss_feeds.feed_url + ORDER BY last_article"); + + print __("These feeds have not been updated with new content for 3 months (oldest first):"); + + print "
"; + + print ""; + + $lnum = 1; + + while ($line = db_fetch_assoc($result)) { + + $class = ($lnum % 2) ? "even" : "odd"; + $feed_id = $line["id"]; + $this_row_id = "id=\"FUPDD-$feed_id\""; + + print ""; + + $edit_title = htmlspecialchars($line["title"]); + + print ""; + print ""; + print ""; + + ++$lnum; + } + + print "
"; + + print "". + htmlspecialchars($line["title"]).""; + + print ""; + print make_local_datetime($this->link, $line['last_article'], false); + print "
"; + print "
"; + + print "
"; + print "
"; + print " "; + print "
"; + + print ""; + + print "
"; + + } + + function feedsWithErrors() { + print __("These feeds have not been updated because of errors:"); + + $result = db_query($this->link, "SELECT id,title,feed_url,last_error,site_url + FROM ttrss_feeds WHERE last_error != '' AND owner_uid = ".$_SESSION["uid"]); + + print "
"; + + print ""; + + $lnum = 1; + + while ($line = db_fetch_assoc($result)) { + + $class = ($lnum % 2) ? "even" : "odd"; + $feed_id = $line["id"]; + $this_row_id = "id=\"FUPDD-$feed_id\""; + + print ""; + + $edit_title = htmlspecialchars($line["title"]); + + print ""; + print ""; + print ""; + + ++$lnum; + } + + print "
"; + + print "". + htmlspecialchars($line["title"]).": "; + + print ""; + print htmlspecialchars($line["last_error"]); + print ""; + + print "
"; + print "
"; + + print "
"; + print "
"; + print " "; + print "
"; + + print ""; + + print "
"; + } + + function editArticleTags() { + + print __("Tags for this article (separated by commas):")."
"; + + $tags = get_article_tags($this->link, $this->param); + + $tags_str = join(", ", $tags); + + print "param\">"; + print ""; + print ""; + + print "
"; + + print " +
"; + + print "
"; + + print "
"; + + print " "; + print ""; + print "
"; + + } + + function printTagCloud() { + print "".__('Tag Cloud').""; + print ""; + + printTagCloud($this->link); + + print ""; + + print "
"; + print ""; + print "
"; + + print "]]>"; + } + + function printTagSelect() { + + print "" . __('Select item(s) by tags') . ""; + print " Any "; + print " All "; + print " tags."; + + print ""; + + print "
"; + print ""; + print " "; + print ""; + print "
"; + + print "]]>"; + } + + function emailArticle() { + + $secretkey = sha1(uniqid(rand(), true)); + + $_SESSION['email_secretkey'] = $secretkey; + + print ""; + print ""; + print ""; + + $result = db_query($this->link, "SELECT email, full_name FROM ttrss_users WHERE + id = " . $_SESSION["uid"]); + + $user_email = htmlspecialchars(db_fetch_result($result, 0, "email")); + $user_name = htmlspecialchars(db_fetch_result($result, 0, "full_name")); + + if (!$user_name) $user_name = $_SESSION['name']; + + $_SESSION['email_replyto'] = $user_email; + $_SESSION['email_fromname'] = $user_name; + + require_once "lib/MiniTemplator.class.php"; + + $tpl = new MiniTemplator; + $tpl_t = new MiniTemplator; + + $tpl->readTemplateFromFile("templates/email_article_template.txt"); + + $tpl->setVariable('USER_NAME', $_SESSION["name"]); + $tpl->setVariable('USER_EMAIL', $user_email); + $tpl->setVariable('TTRSS_HOST', $_SERVER["HTTP_HOST"]); + + + $result = db_query($this->link, "SELECT link, content, title + FROM ttrss_user_entries, ttrss_entries WHERE id = ref_id AND + id IN ($this->param) AND owner_uid = " . $_SESSION["uid"]); + + if (db_num_rows($result) > 1) { + $subject = __("[Forwarded]") . " " . __("Multiple articles"); + } + + while ($line = db_fetch_assoc($result)) { + + if (!$subject) + $subject = __("[Forwarded]") . " " . htmlspecialchars($line["title"]); + + $tpl->setVariable('ARTICLE_TITLE', strip_tags($line["title"])); + $tpl->setVariable('ARTICLE_URL', strip_tags($line["link"])); + + $tpl->addBlock('article'); + } + + $tpl->addBlock('email'); + + $content = ""; + $tpl->generateOutputToString($content); + + print ""; + + print "
"; + + print __('From:'); + + print ""; + + print "\">"; + + print "
"; + + print __('To:'); + + print ""; + + print ""; + + print "
"; + + print "
"; + + print __('Subject:'); + + print ""; + + print ""; + + print "
"; + + print "
"; + + print "
"; + print " "; + print ""; + print "
"; + + //return; + } + + function generatedFeed() { + + print "".__('View as RSS').""; + print "params = explode(":", $this->param, 3); + $feed_id = db_escape_string($this->params[0]); + $is_cat = (bool) $this->params[1]; + + $key = get_feed_access_key($this->link, $feed_id, $is_cat); + + $url_path = htmlspecialchars($this->params[2]) . "&key=" . $key; + + print __("You can view this feed as RSS using the following URL:"); + + print "
"; + print "$url_path"; + print "
"; + + print "
"; + + print " "; + + print ""; + + print "
"; + print "]]>"; + + //return; + } + + function newVersion() { + + $version_data = check_for_update($this->link); + $version = $version_data['version']; + $id = $version_data['version_id']; + + print "
"; + + print T_sprintf("New version of Tiny Tiny RSS is available (%s).", + "$version"); + + print "
"; + + $details = "http://tt-rss.org/redmine/versions/show/$id"; + $download = "http://tt-rss.org/#Download"; + + print "
"; + print ""; + print ""; + print ""; + print "
"; + + } + + function customizeCSS() { + $value = get_pref($this->link, "USER_STYLESHEET"); + + $value = str_replace("
", "\n", $value); + + print T_sprintf("You can override colors, fonts and layout of your currently selected theme with custom CSS declarations here. This file can be used as a baseline.", "tt-rss.css"); + + print ""; + print ""; + print ""; + + print "
"; + print ""; + print "
"; + + print "
"; + print " "; + print ""; + print "
"; + + } + + function editArticleNote() { + $result = db_query($this->link, "SELECT note FROM ttrss_user_entries WHERE + ref_id = '$this->param' AND owner_uid = " . $_SESSION['uid']); + + $note = db_fetch_result($result, 0, "note"); + + print "param\">"; + print ""; + print ""; + + print "
"; + print ""; + print "
"; + + print "
"; + print " "; + print ""; + print "
"; + + } + + function about() { + print ""; + print ""; + print "
"; + print ""; + print ""; + + print "

Tiny Riny RSS

+ Version ".VERSION." +

Copyright © 2005-".date('Y')." + Andrew Dolgov + and other contributors.

+

Licensed under GNU GPL version 2.

"; + + print "

+ Official site — + + Support the project.

"; + + print "
"; + + print "
"; + print ""; + print "
"; + } + + function addInstance() { + print ""; + print ""; + + print "
".__("Instance")."
"; + + print "
"; + + /* URL */ + + print __("URL:") . " "; + + print ""; + + print "
"; + + $access_key = sha1(uniqid(rand(), true)); + + /* Access key */ + + print __("Access key:") . " "; + + print ""; + + print "

" . __("Use one access key for both linked instances."); + + print "

"; + + print "
+
+ +
+ +
"; + + return; + } + + function shareArticle() { + $result = db_query($this->link, "SELECT uuid, ref_id FROM ttrss_user_entries WHERE int_id = '$this->param' + AND owner_uid = " . $_SESSION['uid']); + + if (db_num_rows($result) == 0) { + print "Article not found."; + } else { + + $uuid = db_fetch_result($result, 0, "uuid"); + $ref_id = db_fetch_result($result, 0, "ref_id"); + + if (!$uuid) { + $uuid = db_escape_string(sha1(uniqid(rand(), true))); + db_query($this->link, "UPDATE ttrss_user_entries SET uuid = '$uuid' WHERE int_id = '$this->param' + AND owner_uid = " . $_SESSION['uid']); + } + + print __("You can share this article by the following unique URL:"); + + $url_path = get_self_url_prefix(); + $url_path .= "/public.php?op=share&key=$uuid"; + + print "
"; + print "$url_path"; + print "
"; + + /* if (!label_find_id($this->link, __('Shared'), $_SESSION["uid"])) + label_create($this->link, __('Shared'), $_SESSION["uid"]); + + label_add_article($this->link, $ref_id, __('Shared'), $_SESSION['uid']); */ + } + + print "
"; + + print ""; + + print "
"; + } + +} +?> diff --git a/classes/feeds.php b/classes/feeds.php new file mode 100644 index 000000000..a654c92ae --- /dev/null +++ b/classes/feeds.php @@ -0,0 +1,187 @@ +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"]); + $mode = (int) db_escape_string($_REQUEST['mode']); + toggle_collapse_cat($this->link, $cat_id, $mode); + } + + 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"]); + $limit = (int) get_pref($this->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($this->link)); + return; + } + + $result = false; + + if ($feed < -10) { + $label_feed = -11-$feed; + $result = db_query($this->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($this->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($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)) { + $override_order = "$date_sort_field"; + } else { + $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"; + } else { + $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"; + } else { + $override_order = "score DESC, $date_sort_field DESC"; + } + 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/handler.php b/classes/handler.php index 3bd82c725..53b52ea03 100644 --- a/classes/handler.php +++ b/classes/handler.php @@ -11,5 +11,9 @@ class Handler { function before() { return true; } + + function after() { + return true; + } } ?> diff --git a/js/feedlist.js b/js/feedlist.js index ff4c948d4..75e97e884 100644 --- a/js/feedlist.js +++ b/js/feedlist.js @@ -138,8 +138,8 @@ function viewfeed(feed, method, is_cat, offset, background, infscroll_req) { var toolbar_query = Form.serialize("main_toolbar_form"); - var query = "?op=viewfeed&feed=" + feed + "&" + - toolbar_query + "&method=" + param_escape(method); + var query = "?op=feeds&method=view&feed=" + feed + "&" + + toolbar_query + "&m=" + param_escape(method); if (!background) { if (_search_query) { diff --git a/js/functions.js b/js/functions.js index e62d576b6..37aa73bc9 100644 --- a/js/functions.js +++ b/js/functions.js @@ -411,7 +411,7 @@ function displayDlg(id, param, callback) { notify_progress("Loading, please wait...", true); - var query = "?op=dlg&id=" + + var query = "?op=dlg&method=" + param_escape(id) + "¶m=" + param_escape(param); new Ajax.Request("backend.php", { @@ -846,7 +846,7 @@ function addLabel(select, callback) { function quickAddFeed() { try { - var query = "backend.php?op=dlg&id=quickAddFeed"; + var query = "backend.php?op=dlg&method=quickAddFeed"; if (dijit.byId("feedAddDlg")) dijit.byId("feedAddDlg").destroyRecursive(); @@ -948,7 +948,7 @@ function quickAddFeed() { function quickAddFilter() { try { - var query = "backend.php?op=dlg&id=quickAddFilter"; + var query = "backend.php?op=dlg&method=quickAddFilter"; if (dijit.byId("filterEditDlg")) dijit.byId("filterEditDlg").destroyRecursive(); @@ -1406,7 +1406,7 @@ function editFeed(feed, event) { function feedBrowser() { try { - var query = "backend.php?op=dlg&id=feedBrowser"; + var query = "backend.php?op=dlg&method=feedBrowser"; if (dijit.byId("feedAddDlg")) dijit.byId("feedAddDlg").hide(); @@ -1551,7 +1551,7 @@ function feedBrowser() { function showFeedsWithErrors() { try { - var query = "backend.php?op=dlg&id=feedsWithErrors"; + var query = "backend.php?op=dlg&method=feedsWithErrors"; if (dijit.byId("errorFeedsDlg")) dijit.byId("errorFeedsDlg").destroyRecursive(); diff --git a/js/prefs.js b/js/prefs.js index 760441a3d..98b581ca1 100644 --- a/js/prefs.js +++ b/js/prefs.js @@ -1229,7 +1229,7 @@ function editFeedCats() { function showInactiveFeeds() { try { - var query = "backend.php?op=dlg&id=inactiveFeeds"; + var query = "backend.php?op=dlg&method=inactiveFeeds"; if (dijit.byId("inactiveFeedsDlg")) dijit.byId("inactiveFeedsDlg").destroyRecursive(); @@ -1470,7 +1470,7 @@ function editProfiles() { if (dijit.byId("profileEditDlg")) dijit.byId("profileEditDlg").destroyRecursive(); - var query = "backend.php?op=dlg&id=editPrefProfiles"; + var query = "backend.php?op=dlg&method=editPrefProfiles"; dialog = new dijit.Dialog({ id: "profileEditDlg", @@ -1773,7 +1773,7 @@ function clearTwitterCredentials() { function customizeCSS() { try { - var query = "backend.php?op=dlg&id=customizeCSS"; + var query = "backend.php?op=dlg&method=customizeCSS"; if (dijit.byId("cssEditDlg")) dijit.byId("cssEditDlg").destroyRecursive(); @@ -1815,7 +1815,7 @@ function getSelectedInstances() { function addInstance() { try { - var query = "backend.php?op=dlg&id=addInstance"; + var query = "backend.php?op=dlg&method=addInstance"; if (dijit.byId("instanceAddDlg")) dijit.byId("instanceAddDlg").destroyRecursive(); diff --git a/js/tt-rss.js b/js/tt-rss.js index 96147b3d3..38232bdfe 100644 --- a/js/tt-rss.js +++ b/js/tt-rss.js @@ -222,7 +222,7 @@ function timeout() { } function search() { - var query = "backend.php?op=dlg&id=search¶m=" + + var query = "backend.php?op=dlg&method=search¶m=" + param_escape(getActiveFeedId() + ":" + activeFeedIsCat()); if (dijit.byId("searchDlg")) @@ -436,7 +436,7 @@ function quickMenuGo(opid) { dialog = new dijit.Dialog({ title: __("About..."), style: "width: 400px", - href: "backend.php?op=dlg&id=about", + href: "backend.php?op=dlg&method=about", }); dialog.show(); @@ -1078,7 +1078,7 @@ function scheduleFeedUpdate(id, is_cat) { function newVersionDlg() { try { - var query = "backend.php?op=dlg&id=newVersion"; + var query = "backend.php?op=dlg&method=newVersion"; if (dijit.byId("newVersionDlg")) dijit.byId("newVersionDlg").destroyRecursive(); diff --git a/js/viewfeed.js b/js/viewfeed.js index 363121b19..b9b2a8e2b 100644 --- a/js/viewfeed.js +++ b/js/viewfeed.js @@ -322,7 +322,7 @@ function view(id) { hideAuxDlg(); - var query = "?op=view&id=" + param_escape(id); + var query = "?op=article&method=view&id=" + param_escape(id); var neighbor_ids = getRelativePostIds(id); @@ -1006,7 +1006,7 @@ function catchupSelection() { } function editArticleTags(id) { - var query = "backend.php?op=dlg&id=editArticleTags¶m=" + param_escape(id); + var query = "backend.php?op=dlg&method=editArticleTags¶m=" + param_escape(id); if (dijit.byId("editTagsDlg")) dijit.byId("editTagsDlg").destroyRecursive(); @@ -1514,7 +1514,7 @@ function emailArticle(id) { if (dijit.byId("emailArticleDlg")) dijit.byId("emailArticleDlg").destroyRecursive(); - var query = "backend.php?op=dlg&id=emailArticle¶m=" + param_escape(id); + var query = "backend.php?op=dlg&method=emailArticle¶m=" + param_escape(id); dialog = new dijit.Dialog({ id: "emailArticleDlg", @@ -1770,7 +1770,7 @@ function getLastVisibleHeadlineId() { function openArticleInNewWindow(id) { toggleUnread(id, 0, false); - window.open("backend.php?op=la&id=" + id); + window.open("backend.php?op=article&id=" + id); } function isCdmMode() { @@ -2028,7 +2028,7 @@ function tweetArticle(id) { function editArticleNote(id) { try { - var query = "backend.php?op=dlg&id=editArticleNote¶m=" + param_escape(id); + var query = "backend.php?op=dlg&method=editArticleNote¶m=" + param_escape(id); if (dijit.byId("editNoteDlg")) dijit.byId("editNoteDlg").destroyRecursive(); @@ -2227,7 +2227,7 @@ function shareArticle(id) { if (dijit.byId("shareArticleDlg")) dijit.byId("shareArticleDlg").destroyRecursive(); - var query = "backend.php?op=dlg&id=shareArticle¶m=" + param_escape(id); + var query = "backend.php?op=dlg&method=shareArticle¶m=" + param_escape(id); dialog = new dijit.Dialog({ id: "shareArticleDlg", diff --git a/modules/popup-dialog.php b/modules/popup-dialog.php deleted file mode 100644 index 13abc947f..000000000 --- a/modules/popup-dialog.php +++ /dev/null @@ -1,1122 +0,0 @@ -"; - - if ($id == "importOpml") { - print "
"; - header("Content-Type: text/html"); # required for iframe - - $owner_uid = $_SESSION["uid"]; - - db_query($link, "BEGIN"); - - /* create Imported feeds category just in case */ - - $result = db_query($link, "SELECT id FROM - ttrss_feed_categories WHERE title = 'Imported feeds' AND - owner_uid = '$owner_uid' LIMIT 1"); - - if (db_num_rows($result) == 0) { - db_query($link, "INSERT INTO ttrss_feed_categories - (title,owner_uid) - VALUES ('Imported feeds', '$owner_uid')"); - } - - db_query($link, "COMMIT"); - - /* Handle OPML import by DOMXML/DOMDocument */ - - if (function_exists('domxml_open_file')) { - print "
    "; - print "
  • ".__("Importing using DOMXML.")."
    • "; - require_once "opml_domxml.php"; - opml_import_domxml($link, $owner_uid); - print "
"; - } else if (PHP_VERSION >= 5) { - print "
    "; - print "
  • ".__("Importing using DOMDocument.")."
    • "; - require_once "opml_domdoc.php"; - opml_import_domdoc($link, $owner_uid); - print "
"; - } else { - print_error(__("DOMXML extension is not found. It is required for PHP versions below 5.")); - } - - print "
"; - - print "
"; - print ""; - print "
"; - - print ""; - - //return; - } - - if ($id == "editPrefProfiles") { - - print "
"; - -# TODO: depends on selectTableRows() being broken for this list -# print "
". -# "" . __('Select').""; -# print "
"; -# print "
".__('All')."
"; -# print "
".__('None')."
"; -# print "
"; - -# print "
"; - print " -
"; - -# print "
"; - - - $result = db_query($link, "SELECT title,id FROM ttrss_settings_profiles - WHERE owner_uid = ".$_SESSION["uid"]." ORDER BY title"); - - print "
"; - - print "
"; - - print ""; - - print ""; #odd - - print ""; - - if (!$_SESSION["profile"]) { - $is_active = __("(active)"); - } else { - $is_active = ""; - } - - print ""; - - print ""; - - $lnum = 1; - - while ($line = db_fetch_assoc($result)) { - - $class = ($lnum % 2) ? "even" : "odd"; - - $profile_id = $line["id"]; - $this_row_id = "id=\"FCATR-$profile_id\""; - - print ""; - - $edit_title = htmlspecialchars($line["title"]); - - print ""; - - if ($_SESSION["profile"] == $line["id"]) { - $is_active = __("(active)"); - } else { - $is_active = ""; - } - - print ""; - - print ""; - - ++$lnum; - } - - print "
" . - __("Default profile") . " $is_active
" . $edit_title . - " - $is_active
"; - print "
"; - print "
"; - - print "
-
- - -
"; - - print ""; - print "
"; - - } - - if ($id == "pubOPMLUrl") { - - print "".__('Public OPML URL').""; - print ""; - print "$url_path"; - print ""; - - print "
"; - - print " "; - - print ""; - - print "
"; - print "]]>"; - - //return; - } - - if ($id == "explainError") { - - print "".__('Notice').""; - print ""; - - if ($param == 1) { - print __("Update daemon is enabled in configuration, but daemon process is not running, which prevents all feeds from updating. Please start the daemon process or contact instance owner."); - - $stamp = (int) file_get_contents(LOCK_DIRECTORY . "/update_daemon.stamp"); - - print "

" . __("Last update:") . " " . date("Y.m.d, G:i", $stamp); - - } - - if ($param == 3) { - print __("Update daemon is taking too long to perform a feed update. This could indicate a problem like crash or a hang. Please check the daemon process or contact instance owner."); - - $stamp = (int) file_get_contents(LOCK_DIRECTORY . "/update_daemon.stamp"); - - print "

" . __("Last update:") . " " . date("Y.m.d, G:i", $stamp); - - } - - print ""; - - print "

"; - - print ""; - - print "
"; - print "]]>"; - - //return; - } - - if ($id == "quickAddFeed") { - - print ""; - print ""; - - print "
".__("Feed")."
"; - print "
"; - - print ""; - - print "
"; - - if (get_pref($link, 'ENABLE_FEED_CATS')) { - print __('Place in category:') . " "; - print_feed_cat_select($link, "cat", false, 'dojoType="dijit.form.Select"'); - } - - print "
"; - - print ''; - - print ""; - - - print "
- -
"; - - print ""; - - print "
- - - -
"; - - //return; - } - - if ($id == "feedBrowser") { - - $browser_search = db_escape_string($_REQUEST["search"]); - -# print "
"; - - print ""; - print ""; - - print "
-
- - - -
"; - - print " "; - - print __("limit:"); - - print " "; - - print "
"; - - $owner_uid = $_SESSION["uid"]; - - print "
    "; - print make_feed_browser($link, $search, 25); - print "
"; - - print "
- - -
"; - - } - - if ($id == "search") { - - $params = explode(":", db_escape_string($_REQUEST["param"]), 2); - - $active_feed_id = sprintf("%d", $params[0]); - $is_cat = $params[1] != "false"; - - print "
".__('Look for')."
"; - - print "
"; - - if (!SPHINX_ENABLED) { - - print ""; - - print " " . __('match on')." "; - - $search_fields = array( - "title" => __("Title"), - "content" => __("Content"), - "both" => __("Title or content")); - - print_select_hash("match_on", 3, $search_fields, - 'dojoType="dijit.form.Select"'); - } else { - print ""; - } - - - print "
".__('Limit search to:')." "; - - print ""; - - print "
"; - - print "
"; - - if (!SPHINX_ENABLED) { - print "
- Search syntax -
"; - } - - print " - -
"; - } - - if ($id == "quickAddFilter") { - - $active_feed_id = db_escape_string($_REQUEST["param"]); - - print ""; - print ""; - print ""; - - $result = db_query($link, "SELECT id,description - FROM ttrss_filter_types ORDER BY description"); - - $filter_types = array(); - - while ($line = db_fetch_assoc($result)) { - //array_push($filter_types, $line["description"]); - $filter_types[$line["id"]] = __($line["description"]); - } - - print "
".__("Match")."
"; - - print "
"; - - print ""; - - $filter_params = array( - "before" => __("before"), - "after" => __("after")); - - print_select_hash("filter_date_modifier", "before", - $filter_params, 'dojoType="dijit.form.Select"'); - - print " "; - - print ""; - - print ""; - print " "; - print ""; - - print "
" . __("on field") . " "; - print_select_hash("filter_type", 1, $filter_types, - 'onchange="filterDlgCheckType(this)" dojoType="dijit.form.Select"'); - - print "
"; - - print __("in") . " "; - print_feed_select($link, "feed_id", $active_feed_id, - 'dojoType="dijit.form.FilteringSelect"'); - - print "
"; - - print "
".__("Perform Action")."
"; - - print "
"; - - print ""; - - print ""; - print " " . __("with parameters:") . " "; - print ""; - - print_label_select($link, "action_param_label", $action_param, - 'id="filterDlg_actionParamLabel" dojoType="dijit.form.Select"'); - - print ""; - - print " "; // tiny layout hack - - print "
"; - - print "
".__("Options")."
"; - print "
"; - - print " -
"; - - print " - "; - - print "
"; - - print "
"; - - print " "; - - print " "; - - print ""; - - print "
"; - - //return; - } - - if ($id == "inactiveFeeds") { - - if (DB_TYPE == "pgsql") { - $interval_qpart = "NOW() - INTERVAL '3 months'"; - } else { - $interval_qpart = "DATE_SUB(NOW(), INTERVAL 3 MONTH)"; - } - - $result = db_query($link, "SELECT ttrss_feeds.title, ttrss_feeds.site_url, - ttrss_feeds.feed_url, ttrss_feeds.id, MAX(updated) AS last_article - FROM ttrss_feeds, ttrss_entries, ttrss_user_entries WHERE - (SELECT MAX(updated) FROM ttrss_entries, ttrss_user_entries WHERE - ttrss_entries.id = ref_id AND - ttrss_user_entries.feed_id = ttrss_feeds.id) < $interval_qpart - AND ttrss_feeds.owner_uid = ".$_SESSION["uid"]." AND - ttrss_user_entries.feed_id = ttrss_feeds.id AND - ttrss_entries.id = ref_id - GROUP BY ttrss_feeds.title, ttrss_feeds.id, ttrss_feeds.site_url, ttrss_feeds.feed_url - ORDER BY last_article"); - - print __("These feeds have not been updated with new content for 3 months (oldest first):"); - - print "
"; - - print ""; - - $lnum = 1; - - while ($line = db_fetch_assoc($result)) { - - $class = ($lnum % 2) ? "even" : "odd"; - $feed_id = $line["id"]; - $this_row_id = "id=\"FUPDD-$feed_id\""; - - print ""; - - $edit_title = htmlspecialchars($line["title"]); - - print ""; - print ""; - print ""; - - ++$lnum; - } - - print "
"; - - print "". - htmlspecialchars($line["title"]).""; - - print ""; - print make_local_datetime($link, $line['last_article'], false); - print "
"; - print "
"; - - print "
"; - print "
"; - print " "; - print "
"; - - print ""; - - print "
"; - - } - - if ($id == "feedsWithErrors") { - -# print "".__('Feeds with update errors').""; -# print ""; - - print ""; - - $lnum = 1; - - while ($line = db_fetch_assoc($result)) { - - $class = ($lnum % 2) ? "even" : "odd"; - $feed_id = $line["id"]; - $this_row_id = "id=\"FUPDD-$feed_id\""; - - print ""; - - $edit_title = htmlspecialchars($line["title"]); - - print ""; - print ""; - print ""; - - ++$lnum; - } - - print "
"; - - print "". - htmlspecialchars($line["title"]).": "; - - print ""; - print htmlspecialchars($line["last_error"]); - print ""; - - print "
"; - print ""; - - print "
"; - print "
"; - print " "; - print "
"; - - print ""; - - print "
"; - } - - if ($id == "editArticleTags") { - -# print ""; - - print __("Tags for this article (separated by commas):")."
"; - - $tags = get_article_tags($link, $param); - - $tags_str = join(", ", $tags); - - print ""; - print ""; - print ""; - - print "
"; - - print " -
"; - - print "
"; - -# print ""; - - print "
"; - - print " "; - print ""; - print "
"; - - } - - if ($id == "printTagCloud") { - print "".__('Tag Cloud').""; - print "".__('more tags')."):
"; - - print "
"; - - printTagCloud($link); - - print "
"; - - print "
"; - print ""; - print "
"; - - print "]]>"; - } - - if ($id == 'printTagSelect') { - print "" . __('Select item(s) by tags') . ""; - print " Any "; - print " All "; - print " tags."; - - print ""; - - print "
"; - print ""; - print " "; - print ""; - print "
"; - - print "]]>"; - } - - if ($id == "emailArticle") { - - $secretkey = sha1(uniqid(rand(), true)); - - $_SESSION['email_secretkey'] = $secretkey; - - print ""; - print ""; - print ""; - - $result = db_query($link, "SELECT email, full_name FROM ttrss_users WHERE - id = " . $_SESSION["uid"]); - - $user_email = htmlspecialchars(db_fetch_result($result, 0, "email")); - $user_name = htmlspecialchars(db_fetch_result($result, 0, "full_name")); - - if (!$user_name) $user_name = $_SESSION['name']; - - $_SESSION['email_replyto'] = $user_email; - $_SESSION['email_fromname'] = $user_name; - - require_once "lib/MiniTemplator.class.php"; - - $tpl = new MiniTemplator; - $tpl_t = new MiniTemplator; - - $tpl->readTemplateFromFile("templates/email_article_template.txt"); - - $tpl->setVariable('USER_NAME', $_SESSION["name"]); - $tpl->setVariable('USER_EMAIL', $user_email); - $tpl->setVariable('TTRSS_HOST', $_SERVER["HTTP_HOST"]); - -// $tpl->addBlock('header'); - - $result = db_query($link, "SELECT link, content, title - FROM ttrss_user_entries, ttrss_entries WHERE id = ref_id AND - id IN ($param) AND owner_uid = " . $_SESSION["uid"]); - - if (db_num_rows($result) > 1) { - $subject = __("[Forwarded]") . " " . __("Multiple articles"); - } - - while ($line = db_fetch_assoc($result)) { - - if (!$subject) - $subject = __("[Forwarded]") . " " . htmlspecialchars($line["title"]); - - $tpl->setVariable('ARTICLE_TITLE', strip_tags($line["title"])); - $tpl->setVariable('ARTICLE_URL', strip_tags($line["link"])); - - $tpl->addBlock('article'); - } - - $tpl->addBlock('email'); - - $content = ""; - $tpl->generateOutputToString($content); - - print ""; - - print "
"; - - print __('From:'); - - print ""; - - print "\">"; - - print "
"; - - print __('To:'); - - print ""; - - print ""; - - print "
"; - - print "
"; - - print __('Subject:'); - - print ""; - - print ""; - - print "
"; - - print "
"; - - print "
"; - print " "; - print ""; - print "
"; - - //return; - } - - if ($id == "generatedFeed") { - - print "".__('View as RSS').""; - print ""; - print "$url_path"; - print ""; - - print "
"; - - print " "; - - print ""; - - print "
"; - print "]]>"; - - //return; - } - - if ($id == "newVersion") { - $version_data = check_for_update($link); - $version = $version_data['version']; - $id = $version_data['version_id']; - - print "
"; - - print T_sprintf("New version of Tiny Tiny RSS is available (%s).", - "$version"); - - print "
"; - - $details = "http://tt-rss.org/redmine/versions/show/$id"; - $download = "http://tt-rss.org/#Download"; - - print "
"; - print ""; - print ""; - print ""; - print "
"; - - } - - if ($id == "customizeCSS") { - - $value = get_pref($link, "USER_STYLESHEET"); - - $value = str_replace("
", "\n", $value); - - print T_sprintf("You can override colors, fonts and layout of your currently selected theme with custom CSS declarations here. This file can be used as a baseline.", "tt-rss.css"); - - print ""; - print ""; - print ""; - - print "
"; - print ""; - print "
"; - - print "
"; - print " "; - print ""; - print "
"; - - } - - if ($id == "editArticleNote") { - - $result = db_query($link, "SELECT note FROM ttrss_user_entries WHERE - ref_id = '$param' AND owner_uid = " . $_SESSION['uid']); - - $note = db_fetch_result($result, 0, "note"); - - print ""; - print ""; - print ""; - - print "
"; - print ""; - print "
"; - - print "
"; - print " "; - print ""; - print "
"; - - } - - if ($id == "about") { - print ""; - print ""; - print "
"; - print ""; - print ""; - - print "

Tiny Riny RSS

- Version ".VERSION." -

Copyright © 2005-".date('Y')." - Andrew Dolgov - and other contributors.

-

Licensed under GNU GPL version 2.

"; - - print "

- Official site — - - Support the project.

"; - - print "
"; - - print "
"; - print ""; - print "
"; - } - - if ($id == "addInstance") { - - print ""; - print ""; - - print "
".__("Instance")."
"; - - print "
"; - - /* URL */ - - print __("URL:") . " "; - - print ""; - - print "
"; - - $access_key = sha1(uniqid(rand(), true)); - - /* Access key */ - - print __("Access key:") . " "; - - print ""; - - print "

" . __("Use one access key for both linked instances."); - - print "

"; - - print "
-
- -
- -
"; - - return; - } - - if ($id == "shareArticle") { - - $result = db_query($link, "SELECT uuid, ref_id FROM ttrss_user_entries WHERE int_id = '$param' - AND owner_uid = " . $_SESSION['uid']); - - if (db_num_rows($result) == 0) { - print "Article not found."; - } else { - - $uuid = db_fetch_result($result, 0, "uuid"); - $ref_id = db_fetch_result($result, 0, "ref_id"); - - if (!$uuid) { - $uuid = db_escape_string(sha1(uniqid(rand(), true))); - db_query($link, "UPDATE ttrss_user_entries SET uuid = '$uuid' WHERE int_id = '$param' - AND owner_uid = " . $_SESSION['uid']); - } - - print __("You can share this article by the following unique URL:"); - - $url_path = get_self_url_prefix(); - $url_path .= "/public.php?op=share&key=$uuid"; - - print "
"; - print "$url_path"; - print "
"; - - /* if (!label_find_id($link, __('Shared'), $_SESSION["uid"])) - label_create($link, __('Shared'), $_SESSION["uid"]); - - label_add_article($link, $ref_id, __('Shared'), $_SESSION['uid']); */ - } - - print "
"; - - print ""; - - print "
"; - - return; - } - - print ""; - - } -?> diff --git a/public.php b/public.php index 5fd9beabd..3b0d064b6 100644 --- a/public.php +++ b/public.php @@ -1,4 +1,6 @@ Date: Tue, 13 Dec 2011 14:49:11 +0400 Subject: add Public_Handler misc code cleanup --- backend.php | 62 ++++------ classes/pref_instances.php | 204 +++++++++++++++++++++++++++++++ classes/public_handler.php | 210 ++++++++++++++++++++++++++++++++ db-updater.php | 2 +- include/db.php | 4 +- include/functions.php | 295 +++++++-------------------------------------- index.php | 2 +- opml.php | 2 +- prefs.php | 2 +- public.php | 45 ++++--- register.php | 2 +- twitter.php | 2 +- update.php | 8 -- update_daemon2.php | 18 +-- 14 files changed, 515 insertions(+), 343 deletions(-) create mode 100644 classes/pref_instances.php create mode 100644 classes/public_handler.php (limited to 'public.php') diff --git a/backend.php b/backend.php index 9fe8792f2..62cd6229d 100644 --- a/backend.php +++ b/backend.php @@ -16,17 +16,21 @@ $_REQUEST = array_map('stripslashes_deep', $_REQUEST); } - function __autoload($class) { - $file = "classes/".strtolower(basename($class)).".php"; - if (file_exists($file)) { - require $file; - } - } - $op = $_REQUEST["op"]; + @$method = $_REQUEST['subop'] ? $_REQUEST['subop'] : $_REQUEST["method"]; + + /* Public calls compatibility shim */ + + $public_calls = array("globalUpdateFeeds", "rss", "getUnread", "getProfiles", "share", + "fbexport", "logout", "pubsub"); + + if (array_search($op, $public_calls) !== false) { + header("Location: public.php?" . $_SERVER['QUERY_STRING']); + return; + } require_once "functions.php"; - if ($op != "share") require_once "sessions.php"; + require_once "sessions.php"; require_once "sanity_check.php"; require_once "config.php"; require_once "db.php"; @@ -40,17 +44,7 @@ $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; - } - - init_connection($link); - - $method = $_REQUEST['subop'] ? $_REQUEST['subop'] : $_REQUEST["method"]; + if (!init_connection($link)) return; header("Content-Type: text/plain; charset=utf-8"); @@ -62,15 +56,9 @@ authenticate_user($link, "admin", null); } - $public_calls = array("globalUpdateFeeds", "rss", "getUnread", "getProfiles", "share", - "fbexport", "logout", "pubsub"); + // TODO remove and handle within Handlers - if (array_search($op, $public_calls) !== false) { - - handle_public_request($link, $op); - return; - - } else if (!($_SESSION["uid"] && validate_session($link))) { + if (!($_SESSION["uid"] && validate_session($link))) { if ($op == 'pref-feeds' && $method == 'add') { header("Content-Type: text/html"); login_sequence($link); @@ -136,6 +124,13 @@ return; } + function __autoload($class) { + $file = "classes/".strtolower(basename($class)).".php"; + if (file_exists($file)) { + require $file; + } + } + $op = str_replace("-", "_", $op); if (class_exists($op)) { @@ -154,17 +149,8 @@ } } - switch($op) { // Select action according to $op value. - case "pref_instances": - require_once "modules/pref-instances.php"; - module_pref_instances($link); - break; // pref-instances - - default: - header("Content-Type: text/plain"); - print json_encode(array("error" => array("code" => 7))); - break; // fallback - } // Select action according to $op value. + header("Content-Type: text/plain"); + print json_encode(array("error" => array("code" => 7))); // We close the connection to database. db_close($link); diff --git a/classes/pref_instances.php b/classes/pref_instances.php new file mode 100644 index 000000000..893d2b6bf --- /dev/null +++ b/classes/pref_instances.php @@ -0,0 +1,204 @@ +link, "DELETE FROM ttrss_linked_instances WHERE + id IN ($ids)"); + } + + function add() { + $id = db_escape_string($_REQUEST["id"]); + $access_url = db_escape_string($_REQUEST["access_url"]); + $access_key = db_escape_string($_REQUEST["access_key"]); + + db_query($this->link, "BEGIN"); + + $result = db_query($this->link, "SELECT id FROM ttrss_linked_instances + WHERE access_url = '$access_url'"); + + if (db_num_rows($result) == 0) { + db_query($this->link, "INSERT INTO ttrss_linked_instances + (access_url, access_key, last_connected, last_status_in, last_status_out) + VALUES + ('$access_url', '$access_key', '1970-01-01', -1, -1)"); + + } + + db_query($this->link, "COMMIT"); + } + + function edit() { + $id = db_escape_string($_REQUEST["id"]); + + $result = db_query($this->link, "SELECT * FROM ttrss_linked_instances WHERE + id = '$id'"); + + print ""; + print ""; + print ""; + + print "
".__("Instance")."
"; + + print "
"; + + /* URL */ + + $access_url = htmlspecialchars(db_fetch_result($result, 0, "access_url")); + + print __("URL:") . " "; + + print ""; + + print "
"; + + $access_key = htmlspecialchars(db_fetch_result($result, 0, "access_key")); + + /* Access key */ + + print __("Access key:") . " "; + + print ""; + + print "

" . __("Use one access key for both linked instances."); + + print "

"; + + print "
+
+ +
+ +
"; + + } + + function editSave() { + $id = db_escape_string($_REQUEST["id"]); + $access_url = db_escape_string($_REQUEST["access_url"]); + $access_key = db_escape_string($_REQUEST["access_key"]); + + db_query($this->link, "UPDATE ttrss_linked_instances SET + access_key = '$access_key', access_url = '$access_url', + last_connected = '1970-01-01' + WHERE id = '$id'"); + + } + + function index() { + + if (!function_exists('curl_init')) { + print "
"; + print_error("This functionality requires CURL functions. Please enable CURL in your PHP configuration (you might also want to disable open_basedir in php.ini) and reload this page."); + print "
"; + } + + print "
"; + print "
"; + + print "
"; + + $sort = db_escape_string($_REQUEST["sort"]); + + if (!$sort || $sort == "undefined") { + $sort = "access_url"; + } + + print "
". + "" . __('Select').""; + print "
"; + print "
".__('All')."
"; + print "
".__('None')."
"; + print "
"; + + print ""; + print ""; + print ""; + + print "
"; #toolbar + + $result = db_query($this->link, "SELECT *, + (SELECT COUNT(*) FROM ttrss_linked_feeds + WHERE instance_id = ttrss_linked_instances.id) AS num_feeds + FROM ttrss_linked_instances + ORDER BY $sort"); + + print "

" . __("You can connect other instances of Tiny Tiny RSS to this one to share Popular feeds. Link to this instance of Tiny Tiny RSS by using this URL:"); + + print " (display url)"; + + print "

"; + + print " + + + + + + "; + + $lnum = 0; + + while ($line = db_fetch_assoc($result)) { + $class = ($lnum % 2) ? "even" : "odd"; + + $id = $line['id']; + $this_row_id = "id=\"LIRR-$id\""; + + $line["last_connected"] = make_local_datetime($this->link, $line["last_connected"], false); + + print ""; + + print ""; + + $onclick = "onclick='editInstance($id, event)' title='".__('Click to edit')."'"; + + $access_key = mb_substr($line['access_key'], 0, 4) . '...' . + mb_substr($line['access_key'], -4); + + print ""; + print ""; + print ""; + print ""; + + print ""; + + ++$lnum; + } + + print "
 ".__('Instance URL')."".__('Access key')."".__('Last connected')."".__('Stored feeds')."
" . htmlspecialchars($line['access_url']) . "" . htmlspecialchars($access_key) . "" . htmlspecialchars($line['last_connected']) . "" . htmlspecialchars($line['num_feeds']) . "
"; + + print "

"; #pane + print "
"; #container + + } +} +?> diff --git a/classes/public_handler.php b/classes/public_handler.php new file mode 100644 index 000000000..460613e36 --- /dev/null +++ b/classes/public_handler.php @@ -0,0 +1,210 @@ +link, "SELECT id FROM ttrss_users WHERE login = '$login'"); + + if (db_num_rows($result) == 1) { + $uid = db_fetch_result($result, 0, "id"); + + print getGlobalUnread($this->link, $uid); + + if ($fresh) { + print ";"; + print getFeedArticles($this->link, -3, false, true, $uid); + } + + } else { + print "-1;User not found"; + } + + } + + function getProfiles() { + $login = db_escape_string($_REQUEST["login"]); + $password = db_escape_string($_REQUEST["password"]); + + if (authenticate_user($this->link, $login, $password)) { + $result = db_query($this->link, "SELECT * FROM ttrss_settings_profiles + WHERE owner_uid = " . $_SESSION["uid"] . " ORDER BY title"); + + print ""; + + $_SESSION = array(); + } + } + + function pubsub() { + $mode = db_escape_string($_REQUEST['hub_mode']); + $feed_id = (int) db_escape_string($_REQUEST['id']); + $feed_url = db_escape_string($_REQUEST['hub_topic']); + + if (!PUBSUBHUBBUB_ENABLED) { + header('HTTP/1.0 404 Not Found'); + echo "404 Not found"; + return; + } + + // TODO: implement hub_verifytoken checking + + $result = db_query($this->link, "SELECT feed_url FROM ttrss_feeds + WHERE id = '$feed_id'"); + + if (db_num_rows($result) != 0) { + + $check_feed_url = db_fetch_result($result, 0, "feed_url"); + + if ($check_feed_url && ($check_feed_url == $feed_url || !$feed_url)) { + if ($mode == "subscribe") { + + db_query($this->link, "UPDATE ttrss_feeds SET pubsub_state = 2 + WHERE id = '$feed_id'"); + + print $_REQUEST['hub_challenge']; + return; + + } else if ($mode == "unsubscribe") { + + db_query($this->link, "UPDATE ttrss_feeds SET pubsub_state = 0 + WHERE id = '$feed_id'"); + + print $_REQUEST['hub_challenge']; + return; + + } else if (!$mode) { + + // Received update ping, schedule feed update. + //update_rss_feed($this->link, $feed_id, true, true); + + db_query($this->link, "UPDATE ttrss_feeds SET + last_update_started = '1970-01-01', + last_updated = '1970-01-01' WHERE id = '$feed_id'"); + + } + } else { + header('HTTP/1.0 404 Not Found'); + echo "404 Not found"; + } + } else { + header('HTTP/1.0 404 Not Found'); + echo "404 Not found"; + } + + } + + function logout() { + logout_user(); + header("Location: index.php"); + } + + function fbexport() { + + $access_key = db_escape_string($_POST["key"]); + + // TODO: rate limit checking using last_connected + $result = db_query($this->link, "SELECT id FROM ttrss_linked_instances + WHERE access_key = '$access_key'"); + + if (db_num_rows($result) == 1) { + + $instance_id = db_fetch_result($result, 0, "id"); + + $result = db_query($this->link, "SELECT feed_url, site_url, title, subscribers + FROM ttrss_feedbrowser_cache ORDER BY subscribers DESC LIMIT 100"); + + $feeds = array(); + + while ($line = db_fetch_assoc($result)) { + array_push($feeds, $line); + } + + db_query($this->link, "UPDATE ttrss_linked_instances SET + last_status_in = 1 WHERE id = '$instance_id'"); + + print json_encode(array("feeds" => $feeds)); + } else { + print json_encode(array("error" => array("code" => 6))); + } + } + + function share() { + $uuid = db_escape_string($_REQUEST["key"]); + + $result = db_query($this->link, "SELECT ref_id, owner_uid FROM ttrss_user_entries WHERE + uuid = '$uuid'"); + + if (db_num_rows($result) != 0) { + header("Content-Type: text/html"); + + $id = db_fetch_result($result, 0, "ref_id"); + $owner_uid = db_fetch_result($result, 0, "owner_uid"); + + $_SESSION["uid"] = $owner_uid; + $article = format_article($this->link, $id, false, true); + $_SESSION["uid"] = ""; + + print_r($article['content']); + + } else { + print "Article not found."; + } + + } + + function rss() { + header("Content-Type: text/xml; charset=utf-8"); + + $feed = db_escape_string($_REQUEST["id"]); + $key = db_escape_string($_REQUEST["key"]); + $is_cat = $_REQUEST["is_cat"] != false; + $limit = (int)db_escape_string($_REQUEST["limit"]); + + $search = db_escape_string($_REQUEST["q"]); + $match_on = db_escape_string($_REQUEST["m"]); + $search_mode = db_escape_string($_REQUEST["smode"]); + $view_mode = db_escape_string($_REQUEST["view-mode"]); + + if (SINGLE_USER_MODE) { + authenticate_user($this->link, "admin", null); + } + + $owner_id = false; + + if ($key) { + $result = db_query($this->link, "SELECT owner_uid FROM + ttrss_access_keys WHERE access_key = '$key' AND feed_id = '$feed'"); + + if (db_num_rows($result) == 1) + $owner_id = db_fetch_result($result, 0, "owner_uid"); + } + + if ($owner_id) { + $_SESSION['uid'] = $owner_id; + + generate_syndicated_feed($this->link, 0, $feed, $is_cat, $limit, + $search, $search_mode, $match_on, $view_mode); + } else { + header('HTTP/1.1 403 Forbidden'); + } + } + + /* function globalUpdateFeeds() { + // Update all feeds needing a update. + update_daemon_common($this->link, 0, true, true); + } */ +} +?> diff --git a/db-updater.php b/db-updater.php index 9a4fdf604..63c3c647a 100644 --- a/db-updater.php +++ b/db-updater.php @@ -9,7 +9,7 @@ $link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME); - init_connection($link); + if (!init_connection($link)) return; login_sequence($link); $owner_uid = $_SESSION["uid"]; diff --git a/include/db.php b/include/db.php index 7a858ca70..1401c089b 100644 --- a/include/db.php +++ b/include/db.php @@ -61,7 +61,7 @@ function db_query($link, $query, $die_on_error = true) { if (!$result) { $query = htmlspecialchars($query); // just in case if ($die_on_error) { - die("Query $query failed [$result]: " . pg_last_error($link)); + die("Query $query failed [$result]: " . ($link ? pg_last_error($link) : "No connection")); } } return $result; @@ -70,7 +70,7 @@ function db_query($link, $query, $die_on_error = true) { if (!$result) { $query = htmlspecialchars($query); if ($die_on_error) { - die("Query $query failed: " . mysql_error($link)); + die("Query $query failed: " . ($link ? mysql_error($link) : "No connection")); } } return $result; diff --git a/include/functions.php b/include/functions.php index 89a1d7847..7bd64cc5b 100644 --- a/include/functions.php +++ b/include/functions.php @@ -5835,18 +5835,24 @@ } function init_connection($link) { - if (DB_TYPE == "pgsql") { - pg_query($link, "set client_encoding = 'UTF-8'"); - pg_set_client_encoding("UNICODE"); - pg_query($link, "set datestyle = 'ISO, european'"); - pg_query($link, "set TIME ZONE 0"); - } else { - db_query($link, "SET time_zone = '+0:0'"); + if ($link) { - if (defined('MYSQL_CHARSET') && MYSQL_CHARSET) { - db_query($link, "SET NAMES " . MYSQL_CHARSET); - // db_query($link, "SET CHARACTER SET " . MYSQL_CHARSET); + if (DB_TYPE == "pgsql") { + pg_query($link, "set client_encoding = 'UTF-8'"); + pg_set_client_encoding("UNICODE"); + pg_query($link, "set datestyle = 'ISO, european'"); + pg_query($link, "set TIME ZONE 0"); + } else { + db_query($link, "SET time_zone = '+0:0'"); + + if (defined('MYSQL_CHARSET') && MYSQL_CHARSET) { + db_query($link, "SET NAMES " . MYSQL_CHARSET); + } } + return true; + } else { + print "Unable to connect to database:" . db_last_error(); + return false; } } @@ -7428,242 +7434,25 @@ } } - function handle_public_request($link, $op) { - switch ($op) { - - case "getUnread": - $login = db_escape_string($_REQUEST["login"]); - $fresh = $_REQUEST["fresh"] == "1"; - - $result = db_query($link, "SELECT id FROM ttrss_users WHERE login = '$login'"); - - if (db_num_rows($result) == 1) { - $uid = db_fetch_result($result, 0, "id"); - - print getGlobalUnread($link, $uid); - - if ($fresh) { - print ";"; - print getFeedArticles($link, -3, false, true, $uid); - } - - } else { - print "-1;User not found"; - } - - break; // getUnread - - case "getProfiles": - $login = db_escape_string($_REQUEST["login"]); - $password = db_escape_string($_REQUEST["password"]); - - if (authenticate_user($link, $login, $password)) { - $result = db_query($link, "SELECT * FROM ttrss_settings_profiles - WHERE owner_uid = " . $_SESSION["uid"] . " ORDER BY title"); - - print ""; - - $_SESSION = array(); - } - break; // getprofiles - - case "pubsub": - $mode = db_escape_string($_REQUEST['hub_mode']); - $feed_id = (int) db_escape_string($_REQUEST['id']); - $feed_url = db_escape_string($_REQUEST['hub_topic']); - - if (!PUBSUBHUBBUB_ENABLED) { - header('HTTP/1.0 404 Not Found'); - echo "404 Not found"; - return; - } - - // TODO: implement hub_verifytoken checking - - $result = db_query($link, "SELECT feed_url FROM ttrss_feeds - WHERE id = '$feed_id'"); - - if (db_num_rows($result) != 0) { - - $check_feed_url = db_fetch_result($result, 0, "feed_url"); - - if ($check_feed_url && ($check_feed_url == $feed_url || !$feed_url)) { - if ($mode == "subscribe") { - - db_query($link, "UPDATE ttrss_feeds SET pubsub_state = 2 - WHERE id = '$feed_id'"); - - print $_REQUEST['hub_challenge']; - return; - - } else if ($mode == "unsubscribe") { - - db_query($link, "UPDATE ttrss_feeds SET pubsub_state = 0 - WHERE id = '$feed_id'"); - - print $_REQUEST['hub_challenge']; - return; - - } else if (!$mode) { - - // Received update ping, schedule feed update. - //update_rss_feed($link, $feed_id, true, true); - - db_query($link, "UPDATE ttrss_feeds SET - last_update_started = '1970-01-01', - last_updated = '1970-01-01' WHERE id = '$feed_id'"); - - } - } else { - header('HTTP/1.0 404 Not Found'); - echo "404 Not found"; - } - } else { - header('HTTP/1.0 404 Not Found'); - echo "404 Not found"; - } - - break; // pubsub - - case "logout": - logout_user(); - header("Location: index.php"); - break; // logout - - case "fbexport": - - $access_key = db_escape_string($_POST["key"]); - - // TODO: rate limit checking using last_connected - $result = db_query($link, "SELECT id FROM ttrss_linked_instances - WHERE access_key = '$access_key'"); - - if (db_num_rows($result) == 1) { - - $instance_id = db_fetch_result($result, 0, "id"); - - $result = db_query($link, "SELECT feed_url, site_url, title, subscribers - FROM ttrss_feedbrowser_cache ORDER BY subscribers DESC LIMIT 100"); - - $feeds = array(); - - while ($line = db_fetch_assoc($result)) { - array_push($feeds, $line); - } - - db_query($link, "UPDATE ttrss_linked_instances SET - last_status_in = 1 WHERE id = '$instance_id'"); - - print json_encode(array("feeds" => $feeds)); - } else { - print json_encode(array("error" => array("code" => 6))); - } - break; // fbexport - - case "share": - $uuid = db_escape_string($_REQUEST["key"]); - - $result = db_query($link, "SELECT ref_id, owner_uid FROM ttrss_user_entries WHERE - uuid = '$uuid'"); - - if (db_num_rows($result) != 0) { - header("Content-Type: text/html"); - - $id = db_fetch_result($result, 0, "ref_id"); - $owner_uid = db_fetch_result($result, 0, "owner_uid"); - - $_SESSION["uid"] = $owner_uid; - $article = format_article($link, $id, false, true); - $_SESSION["uid"] = ""; - - print_r($article['content']); - - } else { - print "Article not found."; - } - - break; - - case "rss": - $feed = db_escape_string($_REQUEST["id"]); - $key = db_escape_string($_REQUEST["key"]); - $is_cat = $_REQUEST["is_cat"] != false; - $limit = (int)db_escape_string($_REQUEST["limit"]); - - $search = db_escape_string($_REQUEST["q"]); - $match_on = db_escape_string($_REQUEST["m"]); - $search_mode = db_escape_string($_REQUEST["smode"]); - $view_mode = db_escape_string($_REQUEST["view-mode"]); - - if (SINGLE_USER_MODE) { - authenticate_user($link, "admin", null); - } - - $owner_id = false; - - if ($key) { - $result = db_query($link, "SELECT owner_uid FROM - ttrss_access_keys WHERE access_key = '$key' AND feed_id = '$feed'"); - - if (db_num_rows($result) == 1) - $owner_id = db_fetch_result($result, 0, "owner_uid"); - } - - if ($owner_id) { - $_SESSION['uid'] = $owner_id; - - generate_syndicated_feed($link, 0, $feed, $is_cat, $limit, - $search, $search_mode, $match_on, $view_mode); - } else { - header('HTTP/1.1 403 Forbidden'); - } - break; // rss - - - case "globalUpdateFeeds": - // Update all feeds needing a update. - update_daemon_common($link, 0, true, true); - break; // globalUpdateFeeds - - - default: - header("Content-Type: text/plain"); - print json_encode(array("error" => array("code" => 7))); - break; // fallback - - } - } - function make_feed_browser($link, $search, $limit, $mode = 1) { - + $owner_uid = $_SESSION["uid"]; $rv = ''; - + if ($search) { $search_qpart = "AND (UPPER(feed_url) LIKE UPPER('%$search%') OR UPPER(title) LIKE UPPER('%$search%'))"; } else { $search_qpart = ""; } - + if ($mode == 1) { /* $result = db_query($link, "SELECT feed_url, subscribers FROM ttrss_feedbrowser_cache WHERE (SELECT COUNT(id) = 0 FROM ttrss_feeds AS tf WHERE tf.feed_url = ttrss_feedbrowser_cache.feed_url AND owner_uid = '$owner_uid') $search_qpart ORDER BY subscribers DESC LIMIT $limit"); */ - + $result = db_query($link, "SELECT feed_url, site_url, title, SUM(subscribers) AS subscribers FROM (SELECT feed_url, site_url, title, subscribers FROM ttrss_feedbrowser_cache UNION ALL SELECT feed_url, site_url, title, subscribers FROM ttrss_linked_feeds) AS qqq @@ -7672,7 +7461,7 @@ WHERE tf.feed_url = qqq.feed_url AND owner_uid = '$owner_uid') $search_qpart GROUP BY feed_url, site_url, title ORDER BY subscribers DESC LIMIT $limit"); - + } else if ($mode == 2) { $result = db_query($link, "SELECT *, (SELECT COUNT(*) FROM ttrss_user_entries WHERE @@ -7686,74 +7475,74 @@ owner_uid = '$owner_uid' $search_qpart ORDER BY id DESC LIMIT $limit"); } - + $feedctr = 0; - + while ($line = db_fetch_assoc($result)) { - + if ($mode == 1) { - + $feed_url = htmlspecialchars($line["feed_url"]); $site_url = htmlspecialchars($line["site_url"]); $subscribers = $line["subscribers"]; - + $check_box = ""; - + $class = ($feedctr % 2) ? "even" : "odd"; - + $site_url = " ". htmlspecialchars($line["title"]).""; - + $feed_url = ""; - + $rv .= "
  • $check_box $feed_url $site_url". " ($subscribers)
    • "; - + } else if ($mode == 2) { $feed_url = htmlspecialchars($line["feed_url"]); $site_url = htmlspecialchars($line["site_url"]); $title = htmlspecialchars($line["title"]); - + $check_box = ""; - + $class = ($feedctr % 2) ? "even" : "odd"; - + if ($line['articles_archived'] > 0) { $archived = sprintf(__("%d archived articles"), $line['articles_archived']); $archived = " ($archived)"; } else { $archived = ''; } - + $site_url = " ". htmlspecialchars($line["title"]).""; - + $feed_url = ""; - - + + $rv .= "
  • ". "$check_box $feed_url $site_url $archived
    • "; } - + ++$feedctr; } - + if ($feedctr == 0) { $rv .= "

  • ".__('No feeds found.')."

    • "; } - + return $rv; - } + ?> diff --git a/index.php b/index.php index 76b1d13cf..6d0b7c645 100644 --- a/index.php +++ b/index.php @@ -16,7 +16,7 @@ $link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME); - init_connection($link); + if (!init_connection($link)) return; login_sequence($link); diff --git a/opml.php b/opml.php index 32432a9a7..ab71493b1 100644 --- a/opml.php +++ b/opml.php @@ -10,7 +10,7 @@ $link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME); - init_connection($link); + if (!init_connection($link)) return; function opml_export($link, $name, $owner_uid, $hide_private_feeds=false, $include_settings=true) { if (!$_REQUEST["debug"]) { diff --git a/prefs.php b/prefs.php index 3787a79b6..40d9a35ac 100644 --- a/prefs.php +++ b/prefs.php @@ -10,7 +10,7 @@ $link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME); - init_connection($link); + if (!init_connection($link)) return; login_sequence($link); diff --git a/public.php b/public.php index 3b0d064b6..2cec82962 100644 --- a/public.php +++ b/public.php @@ -16,10 +16,8 @@ $_REQUEST = array_map('stripslashes_deep', $_REQUEST); } - $op = $_REQUEST["op"]; - require_once "functions.php"; - if ($op != "share") require_once "sessions.php"; + require_once "sessions.php"; require_once "sanity_check.php"; require_once "config.php"; require_once "db.php"; @@ -33,30 +31,37 @@ $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; + + if (ENABLE_GZIP_OUTPUT) { + ob_start("ob_gzhandler"); } - init_connection($link); + function __autoload($class) { + $file = "classes/".strtolower(basename($class)).".php"; + if (file_exists($file)) { + require $file; + } + } - $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 Public_Handler($link, $_REQUEST); - if (ENABLE_GZIP_OUTPUT) { - ob_start("ob_gzhandler"); + if ($handler) { + if ($handler->before()) { + 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); diff --git a/register.php b/register.php index 3694a5e75..33a6628f4 100644 --- a/register.php +++ b/register.php @@ -18,7 +18,7 @@ $link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME); - init_connection($link); + if (!init_connection($link)) return; if ($_REQUEST["format"] == "feed") { header("Content-Type: text/xml"); diff --git a/twitter.php b/twitter.php index 2c325140b..ab9e57a45 100644 --- a/twitter.php +++ b/twitter.php @@ -11,7 +11,7 @@ $link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME); - init_connection($link); + if (!init_connection($link)) return; login_sequence($link); $owner_uid = $_SESSION["uid"]; diff --git a/update.php b/update.php index e6063a9e8..2fa2e2f54 100755 --- a/update.php +++ b/update.php @@ -47,14 +47,6 @@ // Create a database connection. $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; - } - init_connection($link); if ($op == "-feeds") { diff --git a/update_daemon2.php b/update_daemon2.php index 06271de85..27b4c35d6 100755 --- a/update_daemon2.php +++ b/update_daemon2.php @@ -133,13 +133,7 @@ // It is unnecessary to start the fork loop if database is not ok. $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; db_close($link); @@ -190,15 +184,7 @@ $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; - } - - init_connection($link); + if (!init_connection($link)) return; // We disable stamp file, since it is of no use in a multiprocess update. // not really, tho for the time being -fox -- cgit v1.2.3-54-g00ecf