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 '";
+ 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 "".
+ __('Close this window')." ";
+ print "
";
+
+ print "";
+
+ //return;
+ }
+
+ function editPrefProfiles() {
+ print "";
+
+ print "".
+ __('Create profile')."
";
+
+ $result = db_query($this->link, "SELECT title,id FROM ttrss_settings_profiles
+ WHERE owner_uid = ".$_SESSION["uid"]." ORDER BY title");
+
+ print "";
+
+ print "
";
+ print "
".__('Public OPML URL')." ";
+ print "link);
+
+ print __("Your Public OPML URL is:");
+
+ print "";
+
+ print "";
+
+ print "".
+ __('Generate new URL')." ";
+
+ print "".
+ __('Close this window')." ";
+
+ 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 "".
+ __('Close this window')." ";
+
+ print "
";
+ print "]]> ";
+
+ //return;
+ }
+
+ function quickAddFeed() {
+ print "".__("Feed")."
";
+ print "";
+
+ print "
+
+
' . __('Available feeds') . '
+
'.
+ '
+
+ '.
+ '
+ ".
+ __('This feed requires authentication.')."
";
+
+ print "";
+
+ print "
+ ".__('Subscribe')."
+ ".__('More feeds')."
+ ".__('Cancel')."
+
";
+
+ //return;
+ }
+
+ function feedBrowser() {
+ $browser_search = db_escape_string($_REQUEST["search"]);
+
+ print "
+
+
+
+
".__('Search')."
+
";
+
+ print "
+ " . __('Popular feeds') . "
+ " . __('Feed archive') . "
+ ";
+
+ print __("limit:");
+
+ print "
";
+
+ foreach (array(25, 50, 100, 200) as $l) {
+ $issel = ($l == $limit) ? "selected=\"1\"" : "";
+ print "$l ";
+ }
+
+ print " ";
+
+ print "
";
+ print make_feed_browser($this->link, $search, 25);
+ print " ";
+
+ print "
+ ".__('Subscribe')."
+ ".__('Remove')."
+ ".__('Cancel')."
";
+
+ }
+
+ 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 "
+ ".__('All feeds')." ";
+
+ $feed_title = getFeedTitle($this->link, $active_feed_id);
+
+ if (!$is_cat) {
+ $feed_cat_title = getFeedCatTitle($this->link, $active_feed_id);
+ } else {
+ $feed_cat_title = getCategoryTitle($this->link, $active_feed_id);
+ }
+
+ if ($active_feed_id && !$is_cat) {
+ print "$feed_title ";
+ } else {
+ print "".__('This feed')." ";
+ }
+
+ if ($is_cat) {
+ $cat_preselected = "selected=\"1\"";
+ }
+
+ if (get_pref($this->link, 'ENABLE_FEED_CATS') && ($active_feed_id > 0 || $is_cat)) {
+ print "$feed_cat_title ";
+ } else {
+ //print "".__('This category')." ";
+ }
+
+ print " ";
+
+ print "";
+
+ print "";
+ }
+
+ function quickAddFilter() {
+ $active_feed_id = db_escape_string($_REQUEST["param"]);
+
+ 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 " ".
+ __('Check it')." ";
+ print " ";
+
+ print "
".__("Perform Action")."
";
+
+ print "";
+
+ print "";
+
+ $result = db_query($this->link, "SELECT id,description FROM ttrss_filter_actions
+ ORDER BY name");
+
+ while ($line = db_fetch_assoc($result)) {
+ printf("%s ", $line["id"], __($line["description"]));
+ }
+
+ print " ";
+
+ print "";
+ print " " . __("with parameters:") . " ";
+ print " ";
+
+ print " "; // tiny layout hack
+
+ print "
";
+
+ print "".__("Options")."
";
+ print "";
+
+ print "".__('Enabled')."
".__('Inverse match')." ";
+
+ print "";
+
+ print "";
+
+ print "".
+ __('Test')." ";
+
+ print "".
+ __('Create')." ";
+
+ print "".
+ __('Cancel')." ";
+
+ 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 "
";
+ print "
";
+
+ print "
";
+ print "
";
+
+ print "
+
";
+
+ print "
";
+
+ print "";
+
+ print "".__('Save')." ";
+ print "".__('Cancel')." ";
+ print "
";
+
+ }
+
+ function printTagCloud() {
+ print "".__('Tag Cloud')." ";
+ print "";
+
+ printTagCloud($this->link);
+
+ print "";
+
+ print "";
+ print "".
+ __('Close this window')." ";
+ print "
";
+
+ print "]]> ";
+ }
+
+ function printTagSelect() {
+
+ print "" . __('Select item(s) by tags') . " ";
+ print " Any ";
+ print "";
+ $result = db_query($this->link, "SELECT DISTINCT tag_name FROM ttrss_tags WHERE owner_uid = ".$_SESSION['uid']."
+ AND LENGTH(tag_name) <= 30 ORDER BY tag_name ASC");
+
+ while ($row = db_fetch_assoc($result)) {
+ $tmp = htmlspecialchars($row["tag_name"]);
+ print "$tmp ";
+ }
+
+ print " ";
+
+ print "";
+ print "" . __('Display entries') . " ";
+ print " ";
+ print "" .
+ __('Close this window') . " ";
+ print "
";
+
+ print "]]> ";
+ }
+
+ function emailArticle() {
+
+ $secretkey = sha1(uniqid(rand(), true));
+
+ $_SESSION['email_secretkey'] = $secretkey;
+
+ print "";
+ print "".__('Send e-mail')." ";
+ print "".__('Cancel')." ";
+ 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 "";
+
+ print "".
+ __('Generate new URL')." ";
+
+ print "".
+ __('Close this window')." ";
+
+ 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 "".__("Details")." ";
+ print "".__("Download")." ";
+ print "".
+ __('Close this window')." ";
+ print "
";
+
+ }
+
+ function customizeCSS() {
+ $value = get_pref($this->link, "USER_STYLESHEET");
+
+ $value = str_replace("This file can be used as a baseline.", "tt-rss.css");
+
+ print "";
+ print "".__('Save')." ";
+ print "".__('Cancel')." ";
+ 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 "";
+ print "".__('Save')." ";
+ print "".__('Cancel')." ";
+ print "
";
+
+ }
+
+ function about() {
+ 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 "".
+ __('Close this window')." ";
+ print "
";
+ }
+
+ function addInstance() {
+ print "".__("Instance")."
";
+
+ 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 "";
+
+ /* 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 "".
+ __('Close this window')." ";
+
+ 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 "".
- __('Close this window')." ";
- 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 "".
- __('Create profile')."
";
-
-# print "
";
-
- print "
";
- print "
".__('Public OPML URL')." ";
- print "";
- print "$url_path ";
- print "";
-
- print "";
-
- print "".
- __('Generate new URL')." ";
-
- print "".
- __('Close this window')." ";
-
- 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 "".
- __('Close this window')." ";
-
- print "
";
- print "]]> ";
-
- //return;
- }
-
- if ($id == "quickAddFeed") {
-
- print "".__("Feed")."
";
- print "";
-
- print "
-
-
' . __('Available feeds') . '
-
'.
- '
-
- '.
- '
- ".
- __('This feed requires authentication.')."
";
-
- print "";
-
- print "
- ".__('Subscribe')."
- ".__('More feeds')."
- ".__('Cancel')."
-
";
-
- //return;
- }
-
- if ($id == "feedBrowser") {
-
- $browser_search = db_escape_string($_REQUEST["search"]);
-
-# print " ![](".
+ theme_image($this->link, )
+
+
+ ![](\"images/logo_big.png\"){kind=logo}
";
+ print "