";
+ $reply = "
";
+
+ $reply .= "";
- print __('Select:')."
- ".__('All').",
- ".__('Unread').",
- ".__('Invert').",
- ".__('None')."";
+ $reply .= __('Select:')."
+ ".__('All').",
+ ".__('Unread').",
+ ".__('Invert').",
+ ".__('None')."";
- print " ";
+ $reply .= " ";
- print "
";
-
- print "";
-
- if ($feed_site_url) {
- $target = "target=\"_blank\"";
- print "".
- truncate_string($feed_title,30)."";
-
- if ($error) {
- print " (Error)";
- }
-
- } else {
- if ($feed_id < -10) {
- $label_id = -11-$feed_id;
-
- $result = db_query($link, "SELECT fg_color, bg_color
- FROM ttrss_labels2 WHERE id = '$label_id' AND owner_uid = " .
- $_SESSION["uid"]);
-
- if (db_num_rows($result) != 0) {
- $fg_color = db_fetch_result($result, 0, "fg_color");
- $bg_color = db_fetch_result($result, 0, "bg_color");
-
- print "";
- print $feed_title;
- print "";
- } else {
- print $feed_title;
- }
-
- } else {
- print $feed_title;
- }
- }
-
- if ($search) {
- $search_q = "&q=$search&m=$match_on&smode=$search_mode";
- } else {
- $search_q = "";
- }
-
- // Adaptive doesn't really make any sense for generated feeds
- // All Articles is the default, so no need to insert it either
- if ($view_mode == "adaptive" || $view_mode == "all_articles")
- $view_mode = "";
- else
- $view_mode = "&view-mode=$view_mode";
-
- print "
-
- ![](\"images/feed-icon-12x12.png\")
";
-
- print "
";
+ if ($feed_id != "0") {
+ $reply .= "";
+ } else {
+ $reply .= "";
+ $reply .= "";
}
+ $reply .= "";
+
+ $rss_link = htmlspecialchars(get_self_url_prefix() .
+ "/backend.php?op=rss&id=$feed_id&is_cat=$is_cat&view_mode=$view_mode$search_q");
+
+ $reply .= "";
+
+ $reply .= "";
+
+ $reply .= "";
+
+ $reply .= "";
+
+ $reply .= "";
-
- print "";
+
+ if ($feed_site_url) {
+ $target = "target=\"_blank\"";
+ $reply .= "".
+ truncate_string($feed_title,30)."";
+
+ if ($error) {
+ $reply .= " (Error)";
+ }
+
+ } else {
+ if ($feed_id < -10) {
+ $label_id = -11-$feed_id;
+
+ $result = db_query($link, "SELECT fg_color, bg_color
+ FROM ttrss_labels2 WHERE id = '$label_id' AND owner_uid = " .
+ $_SESSION["uid"]);
+
+ if (db_num_rows($result) != 0) {
+ $fg_color = db_fetch_result($result, 0, "fg_color");
+ $bg_color = db_fetch_result($result, 0, "bg_color");
+
+ $reply .= "";
+ $reply .= $feed_title;
+ $reply .= "";
+ } else {
+ $reply .= $feed_title;
+ }
+
+ } else {
+ $reply .= $feed_title;
+ }
+ }
+
+ if ($search) {
+ $search_q = "&q=$search&m=$match_on&smode=$search_mode";
+ } else {
+ $search_q = "";
+ }
+
+ // Adaptive doesn't really make any sense for generated feeds
+ // All Articles is the default, so no need to insert it either
+ if ($view_mode == "adaptive" || $view_mode == "all_articles")
+ $view_mode = "";
+ else
+ $view_mode = "&view-mode=$view_mode";
+
+ $reply .= "
+
+ ";
+
+ $reply .= "
";
+
+ return $reply;
+ }
+
function outputFeedList($link, $special = true) {
$feedlist = array();
@@ -4730,12 +4731,14 @@
}
- function outputHeadlinesList($link, $feed, $subop, $view_mode, $limit, $cat_view,
+ function format_headlines_list($link, $feed, $subop, $view_mode, $limit, $cat_view,
$next_unread_feed, $offset, $vgr_last_feed = false,
$override_order = false) {
$disable_cache = false;
+ $reply = array();
+
$timing_info = getmicrotime();
$topmost_article_ids = array();
@@ -4780,8 +4783,7 @@
"SELECT id FROM ttrss_feeds WHERE id = '$feed' LIMIT 1");
if (db_num_rows($result) == 0) {
- print "";
+
+ $reply .= "".__('Feed not found.')."
";
- return;
+ $reply['content'] = "".__('Feed not found.')."
";
}
}
@@ -4837,34 +4839,17 @@
$vgroup_last_feed = $vgr_last_feed;
-/* if ($feed == -2) {
- $feed_site_url = article_publish_url($link);
- } */
-
/// STOP //////////////////////////////////////////////////////////////////////////////////
- print "".__("Could not display feed (query failed). Please check label match syntax or local configuration.")."
";
- return;
- }
if (db_num_rows($result) > 0) {
- print_headline_subtoolbar($link, $feed_site_url, $feed_title,
+ $reply['toolbar'] = format_headline_subtoolbar($link, $feed_site_url, $feed_title,
$feed, $cat_view, $search, $match_on, $search_mode, $view_mode,
$last_error);
-
-// print "";
-
}
}
- print "]]> 0) {
@@ -5006,7 +4991,7 @@
$vf_catchup_link = "(".__('mark as read').")";
- print "![\"\"](\"images/blank_icon.gif\")
";
}
- print "
";
}
@@ -5309,9 +5292,9 @@
}
if (!$offset && $message) {
- print "".
+ $reply['content'] .= "
";
} else {
@@ -5095,7 +5078,7 @@
//$feed_icon_img = "".
"
";
@@ -5017,36 +5002,36 @@
$mouseover_attrs = "onmouseover='postMouseIn($id)'
onmouseout='postMouseOut($id)'";
- print "$feed_icon_img
".
"".
$line["feed_title"]." $vf_catchup_link";
+ $reply['content'] .= "
";
+ $reply['content'] .= "";
- print "
";
-
-
- print "$update_pic
";
+ $reply['content'] .= "$update_pic
";
- print "";
+ $reply['content'] .= "
";
- print "";
- print "";
- print "$marked_pic";
- print "$published_pic";
+ $reply['content'] .= "$marked_pic";
+ $reply['content'] .= "$published_pic";
- print "
";
+ $reply['content'] .= "";
- print "" .
$line["title"];
if (get_pref($link, 'SHOW_CONTENT_PREVIEW')) {
if ($content_preview) {
- print " - $content_preview";
+ $reply['content'] .= " - $content_preview";
}
}
- print "";
+ $reply['content'] .= "";
- print $labels_str;
+ $reply['content'] .= $labels_str;
/* if (!get_pref($link, 'VFEED_GROUP_BY_FEED')) {
if (@$line["feed_title"]) {
@@ -5057,23 +5042,21 @@
}
} */
- print "
";
+ $reply['content'] .= "";
- print "$updated_fmt";
- print $score_pic;
+ $reply['content'] .= "
";
+ $reply['content'] .= "";
+ $reply['content'] .= "$updated_fmt";
+ $reply['content'] .= $score_pic;
if ($line["feed_title"] && !get_pref($link, 'VFEED_GROUP_BY_FEED')) {
- print "
$feed_icon_img";
}
- print "
";
- print "";
}
- print "".
+ $reply['content'] .= "
";
+ $reply['content'] .= "".
"
";
@@ -5107,31 +5090,31 @@
$mouseover_attrs = "onmouseover='postMouseIn($id)'
onmouseout='postMouseOut($id)'";
- print "$feed_icon_img
".
"".
$line["feed_title"]." $vf_catchup_link";
- print "
";
- print "";
+ $reply['content'] .= "
";
- print "";
- print "
";
+ $reply['content'] .= "";
- print "$updated_fmt";
- print "$score_pic";
+ $reply['content'] .= "
";
- print "";
- print "$marked_pic";
- print "$published_pic";
+ $reply['content'] .= "$marked_pic";
+ $reply['content'] .= "$published_pic";
- print "
";
- print $labels_str;
+ $reply['content'] .= $labels_str;
if (!$expand_cdm)
$content_hidden = "style=\"display : none\"";
else
$excerpt_hidden = "style=\"display : none\"";
- print " - $content_preview";
- print "";
+ $reply['content'] .= "";
- print "";
+ $reply['content'] .= "$updated_fmt";
+ $reply['content'] .= "$score_pic";
if (!get_pref($link, "VFEED_GROUP_BY_FEED") && $line["feed_title"]) {
- print "$feed_icon_img";
}
- print "
";
+ $reply['content'] .= "$update_pic
";
+ $reply['content'] .= "$update_pic
";
- print "";
- print "
";
+ $reply['content'] .= "";
+ $reply['content'] .= "
";
- print "";
if ($line["orig_feed_id"]) {
@@ -5168,23 +5151,23 @@
if (db_num_rows($tmp_result) != 0) {
- print "
";
+ $reply['content'] .= "";
- print __("Originally from:");
+ $reply['content'] .= "
";
}
}
@@ -5210,13 +5193,13 @@
$article_content = '';
}
- print "";
+ $reply['content'] .= __("Originally from:");
- print " ";
+ $reply['content'] .= " ";
$tmp_line = db_fetch_assoc($tmp_result);
- print "" .
$tmp_line['title'] . "";
- print " ";
+ $reply['content'] .= " ";
- print "";
- print "
";
+ $reply['content'] .= "";
+ $reply['content'] .= "";
- print "
";
+ $reply['content'] .= "";
+ $reply['content'] .= "";
+ $reply['content'] .= "";
- print "";
+ $reply['content'] .= "
";
- print "$article_content";
+ $reply['content'] .= "$article_content";
$tmp_result = db_query($link, "SELECT always_display_enclosures FROM
ttrss_feeds WHERE id = ".
@@ -5226,24 +5209,24 @@
$always_display_enclosures = sql_bool_to_bool(db_fetch_result($tmp_result,
0, "always_display_enclosures"));
- print format_article_enclosures($link, $id, $always_display_enclosures,
+ $reply['content'] .= format_article_enclosures($link, $id, $always_display_enclosures,
$article_content);
- print "";
if ($line['note']) {
- print format_article_note($id, $line['note']);
+ $reply['content'] .= format_article_note($id, $line['note']);
}
- print "
";
+ $reply['content'] .= "";
+ $reply['content'] .= "
";
- print "";
$tags_str = format_tags_string(get_article_tags($link, $id), $id);
- print "![Tags](".theme_image($link,
+ $reply[ "Tags")
$tags_str
(+)";
- print "
";
+ $reply['content'] .= "";
+ $reply['content'] .= "
";
+ $reply['content'] .= "";
- print "![Zoom](\"images/art-zoom.png\" "\".__(")
";
if (DIGEST_ENABLE) {
- print "![Zoom](\"".theme_image($link, "\".__(")
";
}
if (ENABLE_TWEET_BUTTON) {
- print "";
}
- print "![Dismiss](\"images/digest_checkbox.png\" "\".__(")
";
- print "
";
- print "";
if (DIGEST_ENABLE) {
- print "";
- print "$message";
+ $reply['content'] .= "
";
}
}
@@ -5340,9 +5323,10 @@
# print "";
# }
- print "]]>";
+ #print "]]>";
- return array($topmost_article_ids, $headlines_count, $feed, $disable_cache, $vgroup_last_feed);
+ return array($topmost_article_ids, $headlines_count, $feed, $disable_cache,
+ $vgroup_last_feed, $reply['content'], $reply['toolbar']);
}
// from here: http://www.roscripts.com/Create_tag_cloud-71.html
@@ -6608,16 +6592,34 @@
return $headlines;
}
+ function generate_error_feed($link, $error) {
+ $reply = array();
+
+ $reply['headlines']['id'] = -6;
+ $reply['headlines']['is_cat'] = false;
+
+ $reply['headlines']['toolbar'] = '';
+ $reply['headlines']['content'] = "$message";
- print "
";
+ $reply['content'] .= "";
+ $reply['content'] .= " ";
$result = db_query($link, "SELECT ".SUBSTRING_FOR_DATE."(MAX(last_updated), 1, 19) AS last_updated FROM ttrss_feeds
WHERE owner_uid = " . $_SESSION['uid']);
@@ -5319,7 +5302,7 @@
$last_updated = db_fetch_result($result, 0, "last_updated");
$last_updated = make_local_datetime($link, $last_updated, false);
- printf(__("Feeds last updated at %s"), $last_updated);
+ $reply['content'] .= sprintf(__("Feeds last updated at %s"), $last_updated);
$result = db_query($link, "SELECT COUNT(id) AS num_errors
FROM ttrss_feeds WHERE last_error != '' AND owner_uid = ".$_SESSION["uid"]);
@@ -5327,11 +5310,11 @@
$num_errors = db_fetch_result($result, 0, "num_errors");
if ($num_errors > 0) {
- print "
";
- print "".
+ $reply['content'] .= "
";
+ $reply['content'] .= "".
__('Some feeds have update errors (click for details)')."";
}
- print "
". $error . "
";
+
+ $reply['headlines-info'] = array("count" => 0,
+ "vgroup_last_feed" => '',
+ "unread" => 0,
+ "disable_cache" => true);
+
+ return $reply;
+ }
+
+
function generate_dashboard_feed($link) {
- print "".__('No feed selected.');
-
- print " 0,
+ $reply['headlines-info'] = array("count" => 0,
"vgroup_last_feed" => '',
"unread" => 0,
"disable_cache" => true);
- print json_encode($info);
-
- print "]]> ";
-
+ return $reply;
}
function save_email_address($link, $email) {
diff --git a/viewfeed.js b/viewfeed.js
index 6e220bb4e..0e11a6080 100644
--- a/viewfeed.js
+++ b/viewfeed.js
@@ -25,47 +25,35 @@ function headlines_callback2(transport, feed_cur_page) {
var is_cat = false;
var feed_id = false;
- if (transport.responseXML) {
- var headlines = transport.responseXML.getElementsByTagName("headlines")[0];
- if (headlines) {
- is_cat = headlines.getAttribute("is_cat");
- feed_id = headlines.getAttribute("id");
- setActiveFeedId(feed_id, is_cat);
- }
- }
-
- var update_btn = document.forms["main_toolbar_form"].update;
-
- update_btn.disabled = !(feed_id >= 0 && !is_cat);
+ var reply;
try {
- if (feed_cur_page == 0) {
- $("headlines-frame").scrollTop = 0;
- }
- } catch (e) { };
+ reply = JSON.parse(transport.responseText);
+ } catch (e) {
+ console.error(e);
+ }
- if (transport.responseXML) {
- var response = transport.responseXML;
+ if (reply) {
- var headlines = response.getElementsByTagName("headlines")[0];
+ is_cat = reply['headlines']['is_cat'];
+ feed_id = reply['headlines']['id'];
- var headlines_content = headlines.getElementsByTagName("content")[0];
- var headlines_toolbar = headlines.getElementsByTagName("toolbar")[0];
+ setActiveFeedId(feed_id, is_cat);
- var headlines_info = response.getElementsByTagName("headlines-info")[0];
+ var update_btn = document.forms["main_toolbar_form"].update;
- if (headlines_info)
- headlines_info = JSON.parse(headlines_info.firstChild.nodeValue);
- else {
- console.error("didn't find headlines-info object in response");
- return;
- }
+ update_btn.disabled = !(feed_id >= 0 && !is_cat);
- var headlines_count = headlines_info.count;
- var headlines_unread = headlines_info.unread;
- var disable_cache = headlines_info.disable_cache;
+ try {
+ if (feed_cur_page == 0) {
+ $("headlines-frame").scrollTop = 0;
+ }
+ } catch (e) { };
- vgroup_last_feed = headlines_info.vgroup_last_feed;
+ var headlines_count = reply['headlines-info']['count'];
+ var headlines_unread = reply['headlines-info']['unread'];
+
+ vgroup_last_feed = reply['headlines-info']['vgroup_last_feed'];
if (parseInt(headlines_count) < getInitParam("default_article_limit")) {
_infscroll_disable = 1;
@@ -73,82 +61,49 @@ function headlines_callback2(transport, feed_cur_page) {
_infscroll_disable = 0;
}
- var counters = response.getElementsByTagName("counters")[0];
- var articles = response.getElementsByTagName("article");
- var runtime_info = response.getElementsByTagName("runtime-info");
+ var counters = reply['counters'];
+ var articles = reply['articles'];
+ var runtime_info = reply['runtime-info'];
if (feed_cur_page == 0) {
- if (headlines) {
- dijit.byId("headlines-frame").attr('content',
- headlines_content.firstChild.nodeValue);
+ dijit.byId("headlines-frame").attr('content',
+ reply['headlines']['content']);
- dijit.byId("headlines-toolbar").attr('content',
- headlines_toolbar.firstChild.nodeValue);
+ dijit.byId("headlines-toolbar").attr('content',
+ reply['headlines']['toolbar']);
+
+ initHeadlinesMenu();
+
+ } else {
+ if (headlines_count > 0) {
+ console.log("adding some more headlines...");
+
+ var c = dijit.byId("headlines-frame");
+ var ids = getSelectedArticleIds2();
+
+ $("headlines-tmp").innerHTML = reply['headlines']['content'];
+
+ $$("#headlines-tmp > div").each(function(row) {
+ c.domNode.appendChild(row);
+ });
+
+ console.log("restore selected ids: " + ids);
+
+ for (var i = 0; i < ids.length; i++) {
+ markHeadline(ids[i]);
+ }
initHeadlinesMenu();
-/* var cache_prefix = "";
-
- if (is_cat) {
- cache_prefix = "C:";
- } else {
- cache_prefix = "F:";
- }
-
- cache_invalidate(cache_prefix + feed_id);
-
- if (!disable_cache) {
- cache_inject(cache_prefix + feed_id,
- $("headlines-frame").innerHTML, headlines_unread);
- } */
-
} else {
- console.warn("headlines_callback: returned no data");
- dijit.byId("headlines-frame").attr('content',
- "
");
}
-
-
_feed_cur_page = feed_cur_page;
_infscroll_request_sent = 0;
";
+ $reply['headlines']['content'] .= " ";
$result = db_query($link, "SELECT ".SUBSTRING_FOR_DATE."(MAX(last_updated), 1, 19) AS last_updated FROM ttrss_feeds
WHERE owner_uid = " . $_SESSION['uid']);
@@ -6625,7 +6627,7 @@
$last_updated = db_fetch_result($result, 0, "last_updated");
$last_updated = make_local_datetime($link, $last_updated, false);
- printf(__("Feeds last updated at %s"), $last_updated);
+ $reply['headlines']['content'] .= sprintf(__("Feeds last updated at %s"), $last_updated);
$result = db_query($link, "SELECT COUNT(id) AS num_errors
FROM ttrss_feeds WHERE last_error != '' AND owner_uid = ".$_SESSION["uid"]);
@@ -6633,26 +6635,18 @@
$num_errors = db_fetch_result($result, 0, "num_errors");
if ($num_errors > 0) {
- print "
";
- print "".
+ $reply['headlines']['content'] .= "
";
+ $reply['headlines']['content'] .= "".
__('Some feeds have update errors (click for details)')."";
}
- print "
" +
- __('Could not update headlines (missing XML data)') + "
");
-
+ console.log("no new headlines received");
}
- } else {
- if (headlines) {
- if (headlines_count > 0) {
- console.log("adding some more headlines...");
-
- var c = dijit.byId("headlines-frame");
- var ids = getSelectedArticleIds2();
-
- //c.attr('content', c.attr('content') +
- // headlines_content.firstChild.nodeValue);
-
- $("headlines-tmp").innerHTML = headlines_content.firstChild.nodeValue;
-
- $$("#headlines-tmp > div").each(function(row) {
- c.domNode.appendChild(row);
- });
-
- console.log("restore selected ids: " + ids);
-
- for (var i = 0; i < ids.length; i++) {
- markHeadline(ids[i]);
- }
-
- initHeadlinesMenu();
-
- } else {
- console.log("no new headlines received");
- }
- } else {
- console.warn("headlines_callback: returned no data");
- notify_error("Error while trying to load more headlines");
- }
-
}
if (articles) {
for (var i = 0; i < articles.length; i++) {
- var a_id = articles[i].getAttribute("id");
- //console.log("found id: " + a_id);
- cache_inject(a_id, articles[i].firstChild.nodeValue);
+ var a_id = articles[i]['id'];
+ cache_inject(a_id, articles[i]['content']);
}
} else {
console.log("no cached articles received");
@@ -162,11 +117,9 @@ function headlines_callback2(transport, feed_cur_page) {
} else {
console.warn("headlines_callback: returned no XML object");
dijit.byId("headlines-frame").attr('content', "" +
- __('Could not update headlines (missing XML object)') + "
");
+ __('Could not update headlines (invalid object received)') + "