diff --git a/classes/dlg.php b/classes/dlg.php
index dce583e0..55f6ea72 100644
--- a/classes/dlg.php
+++ b/classes/dlg.php
@@ -700,7 +700,56 @@ class Dlg extends Protected_Handler {
print "";
- printTagCloud($this->link);
+ // from here: http://www.roscripts.com/Create_tag_cloud-71.html
+
+ $query = "SELECT tag_name, COUNT(post_int_id) AS count
+ FROM ttrss_tags WHERE owner_uid = ".$_SESSION["uid"]."
+ GROUP BY tag_name ORDER BY count DESC LIMIT 50";
+
+ $result = db_query($this->link, $query);
+
+ $tags = array();
+
+ while ($line = db_fetch_assoc($result)) {
+ $tags[$line["tag_name"]] = $line["count"];
+ }
+
+ if( count($tags) == 0 ){ return; }
+
+ ksort($tags);
+
+ $max_size = 32; // max font size in pixels
+ $min_size = 11; // min font size in pixels
+
+ // largest and smallest array values
+ $max_qty = max(array_values($tags));
+ $min_qty = min(array_values($tags));
+
+ // find the range of values
+ $spread = $max_qty - $min_qty;
+ if ($spread == 0) { // we don't want to divide by zero
+ $spread = 1;
+ }
+
+ // set the font-size increment
+ $step = ($max_size - $min_size) / ($spread);
+
+ // loop through the tag array
+ foreach ($tags as $key => $value) {
+ // calculate font-size
+ // find the $value in excess of $min_qty
+ // multiply by the font-size increment ($size)
+ // and add the $min_size set above
+ $size = round($min_size + (($value - $min_qty) * $step));
+
+ $key_escaped = str_replace("'", "\\'", $key);
+
+ echo "
' . $key . ' ';
+ }
+
+
print "
";
+
+ $reply .= __('Select:')."
+
".__('All').",
+
".__('Unread').",
+
".__('Invert').",
+
".__('None')."";
+
+ $reply .= " ";
+
+ $reply .= "
";
+
+ $reply .= "
".__('Feed not found.')."
";
+ }
+ }
+
+ if (preg_match("/^-?[0-9][0-9]*$/", $feed) != false) {
+
+ $result = db_query($this->link, "SELECT rtl_content FROM ttrss_feeds
+ WHERE id = '$feed' AND owner_uid = " . $_SESSION["uid"]);
+
+ if (db_num_rows($result) == 1) {
+ $rtl_content = sql_bool_to_bool(db_fetch_result($result, 0, "rtl_content"));
+ } else {
+ $rtl_content = false;
+ }
+
+ if ($rtl_content) {
+ $rtl_tag = "dir=\"RTL\"";
+ } else {
+ $rtl_tag = "";
+ }
+ } else {
+ $rtl_tag = "";
+ $rtl_content = false;
+ }
+
+ @$search = db_escape_string($_REQUEST["query"]);
+
+ if ($search) {
+ $disable_cache = true;
+ }
+
+ @$search_mode = db_escape_string($_REQUEST["search_mode"]);
+ @$match_on = db_escape_string($_REQUEST["match_on"]);
+
+ if (!$match_on) {
+ $match_on = "both";
+ }
+
+ if ($_REQUEST["debug"]) $timing_info = print_checkpoint("H0", $timing_info);
+
+// error_log("format_headlines_list: [" . $feed . "] method [" . $method . "]");
+ if( $search_mode == '' && $method != '' ){
+ $search_mode = $method;
+ }
+// error_log("search_mode: " . $search_mode);
+ $qfh_ret = queryFeedHeadlines($this->link, $feed, $limit, $view_mode, $cat_view,
+ $search, $search_mode, $match_on, $override_order, $offset);
+
+ if ($_REQUEST["debug"]) $timing_info = print_checkpoint("H1", $timing_info);
+
+ $result = $qfh_ret[0];
+ $feed_title = $qfh_ret[1];
+ $feed_site_url = $qfh_ret[2];
+ $last_error = $qfh_ret[3];
+
+ $vgroup_last_feed = $vgr_last_feed;
+
+// if (!$offset) {
+
+ if (db_num_rows($result) > 0) {
+ $reply['toolbar'] = $this->format_headline_subtoolbar($feed_site_url,
+ $feed_title,
+ $feed, $cat_view, $search, $match_on, $search_mode, $view_mode,
+ $last_error);
+ }
+// }
+
+ $headlines_count = db_num_rows($result);
+
+ if (db_num_rows($result) > 0) {
+
+ $lnum = $offset;
+
+ $num_unread = 0;
+ $cur_feed_title = '';
+
+ $fresh_intl = get_pref($this->link, "FRESH_ARTICLE_MAX_AGE") * 60 * 60;
+
+ if ($_REQUEST["debug"]) $timing_info = print_checkpoint("PS", $timing_info);
+
+ while ($line = db_fetch_assoc($result)) {
+
+ $class = ($lnum % 2) ? "even" : "odd";
+
+ $id = $line["id"];
+ $feed_id = $line["feed_id"];
+ $label_cache = $line["label_cache"];
+ $labels = false;
+
+ if ($label_cache) {
+ $label_cache = json_decode($label_cache, true);
+
+ if ($label_cache) {
+ if ($label_cache["no-labels"] == 1)
+ $labels = array();
+ else
+ $labels = $label_cache;
+ }
+ }
+
+ if (!is_array($labels)) $labels = get_article_labels($this->link, $id);
+
+ $labels_str = "";
+ $labels_str .= format_article_labels($labels, $id);
+ $labels_str .= "";
+
+ if (count($topmost_article_ids) < 3) {
+ array_push($topmost_article_ids, $id);
+ }
+
+ if ($line["last_read"] == "" && !sql_bool_to_bool($line["unread"])) {
+
+ $update_pic = "![](\"".)
link, 'images/updated.png')."\"
+ alt=\"Updated\">";
+ } else {
+ $update_pic = "![\"Updated\"](\"images/blank_icon.gif\")
";
+ }
+
+ if (sql_bool_to_bool($line["unread"]) &&
+ time() - strtotime($line["updated_noms"]) < $fresh_intl) {
+
+ $update_pic = "link, 'images/fresh_sign.png')."\" alt=\"Fresh\">";
+ }
+
+ if ($line["unread"] == "t" || $line["unread"] == "1") {
+ $class .= " Unread";
+ ++$num_unread;
+ $is_unread = true;
+ } else {
+ $is_unread = false;
+ }
+
+ if ($line["marked"] == "t" || $line["marked"] == "1") {
+ $marked_pic = "![](\"".theme_image($this-)
link, 'images/mark_set.png')."\"
+ class=\"markedPic\" alt=\"Unstar article\"
+ onclick='javascript:toggleMark($id)'>";
+ } else {
+ $marked_pic = "link, 'images/mark_unset.png')."\"
+ class=\"markedPic\" alt=\"Star article\"
+ onclick='javascript:toggleMark($id)'>";
+ }
+
+ if ($line["published"] == "t" || $line["published"] == "1") {
+ $published_pic = "link,
+ 'images/pub_set.png')."\"
+ class=\"markedPic\"
+ alt=\"Unpublish article\" onclick='javascript:togglePub($id)'>";
+ } else {
+ $published_pic = "link,
+ 'images/pub_unset.png')."\"
+ class=\"markedPic\"
+ alt=\"Publish article\" onclick='javascript:togglePub($id)'>";
+ }
+
+# $content_link = "" .
+# $line["title"] . "";
+
+# $content_link = "" .
+# $line["title"] . "";
+
+# $content_link = "" .
+# $line["title"] . "";
+
+ $updated_fmt = make_local_datetime($this->link, $line["updated_noms"], false);
+
+ if (get_pref($this->link, 'SHOW_CONTENT_PREVIEW')) {
+ $content_preview = truncate_string(strip_tags($line["content_preview"]),
+ 100);
+ }
+
+ $score = $line["score"];
+
+ $score_pic = theme_image($this->link,
+ "images/" . get_score_pic($score));
+
+/* $score_title = __("(Click to change)");
+ $score_pic = "![](\"images/$score_pic\" "\\"$score")
"; */
+
+ $score_pic = "![](\"$score_pic\" "\\"$score\\"")
";
+
+ if ($score > 500) {
+ $hlc_suffix = "H";
+ } else if ($score < -100) {
+ $hlc_suffix = "L";
+ } else {
+ $hlc_suffix = "";
+ }
+
+ $entry_author = $line["author"];
+
+ if ($entry_author) {
+ $entry_author = " - $entry_author";
+ }
+
+ $has_feed_icon = feed_has_icon($feed_id);
+
+ if ($has_feed_icon) {
+ $feed_icon_img = "![\"\"](\"".ICONS_URL."/$feed_id.ico\")
";
+ } else {
+ $feed_icon_img = "![\"\"](\"images/feed-icon-12x12.png\")
";
+ }
+
+ if (!get_pref($this->link, 'COMBINED_DISPLAY_MODE')) {
+
+ if (get_pref($this->link, 'VFEED_GROUP_BY_FEED')) {
+ if ($feed_id != $vgroup_last_feed && $line["feed_title"]) {
+
+ $cur_feed_title = $line["feed_title"];
+ $vgroup_last_feed = $feed_id;
+
+ $cur_feed_title = htmlspecialchars($cur_feed_title);
+
+ $vf_catchup_link = "(".__('mark as read').")";
+
+ $reply['content'] .= "";
+
+ }
+ }
+
+ $mouseover_attrs = "onmouseover='postMouseIn($id)'
+ onmouseout='postMouseOut($id)'";
+
+ $reply['content'] .= "";
+
+ $reply['content'] .= "
$update_pic
";
+
+ $reply['content'] .= "
";
+
+ $reply['content'] .= "";
+
+ $reply['content'] .= "$marked_pic";
+ $reply['content'] .= "$published_pic";
+
+ $reply['content'] .= "
";
+
+ $reply['content'] .= "
";
+
+ $reply['content'] .= "
$updated_fmt";
+ $reply['content'] .= "
";
+
+ $reply['content'] .= $score_pic;
+
+ if ($line["feed_title"] && !get_pref($this->link, 'VFEED_GROUP_BY_FEED')) {
+
+ $reply['content'] .= "
+ $feed_icon_img";
+ }
+
+ $reply['content'] .= "
";
+ $reply['content'] .= "
";
+
+ $reply['content'] .= "";
+
+ $reply['content'] .= "
";
+
+ $reply['content'] .= "
";
+
+ if ($line["orig_feed_id"]) {
+
+ $tmp_result = db_query($this->link, "SELECT * FROM ttrss_archived_feeds
+ WHERE id = ".$line["orig_feed_id"]);
+
+ if (db_num_rows($tmp_result) != 0) {
+
+ $reply['content'] .= "
";
+ $reply['content'] .= __("Originally from:");
+
+ $reply['content'] .= " ";
+
+ $tmp_line = db_fetch_assoc($tmp_result);
+
+ $reply['content'] .= "
" .
+ $tmp_line['title'] . "";
+
+ $reply['content'] .= " ";
+
+ $reply['content'] .= "
";
+ $reply['content'] .= "
";
+
+ $reply['content'] .= "
";
+ }
+ }
+
+ $feed_site_url = $line["site_url"];
+
+ $article_content = sanitize($this->link, $line["content_preview"],
+ false, false, $feed_site_url);
+
+ $reply['content'] .= "
";
+ if ($line['note']) {
+ $reply['content'] .= format_article_note($id, $line['note']);
+ }
+ $reply['content'] .= "
";
+
+ $reply['content'] .= "
";
+ $reply['content'] .= $expand_cdm ? $article_content : '';
+ $reply['content'] .= "";
+
+/* $tmp_result = db_query($this->link, "SELECT always_display_enclosures FROM
+ ttrss_feeds WHERE id = ".
+ (($line['feed_id'] == null) ? $line['orig_feed_id'] :
+ $line['feed_id'])." AND owner_uid = ".$_SESSION["uid"]);
+
+ $always_display_enclosures = sql_bool_to_bool(db_fetch_result($tmp_result,
+ 0, "always_display_enclosures")); */
+
+ $always_display_enclosures = sql_bool_to_bool($line["always_display_enclosures"]);
+
+ $reply['content'] .= format_article_enclosures($this->link, $id, $always_display_enclosures,
+ $article_content);
+
+ $reply['content'] .= "
";
+
+ $reply['content'] .= "";
+
+ $reply['content'] .= "
";
+
+ $reply['content'] .= "
$message";
+
+ $reply['content'] .= "
";
+
+ $result = db_query($this->link, "SELECT ".SUBSTRING_FOR_DATE."(MAX(last_updated), 1, 19) AS last_updated FROM ttrss_feeds
+ WHERE owner_uid = " . $_SESSION['uid']);
+
+ $last_updated = db_fetch_result($result, 0, "last_updated");
+ $last_updated = make_local_datetime($this->link, $last_updated, false);
+
+ $reply['content'] .= sprintf(__("Feeds last updated at %s"), $last_updated);
+
+ $result = db_query($this->link, "SELECT COUNT(id) AS num_errors
+ FROM ttrss_feeds WHERE last_error != '' AND owner_uid = ".$_SESSION["uid"]);
+
+ $num_errors = db_fetch_result($result, 0, "num_errors");
+
+ if ($num_errors > 0) {
+ $reply['content'] .= "
";
+ $reply['content'] .= "".
+ __('Some feeds have update errors (click for details)')."";
+ }
+ $reply['content'] .= "
Article note: " . $line['note'] . "
" .
+ $content;
+ }
+
+ $tpl->setVariable('ARTICLE_CONTENT', $content);
+
+ $tpl->setVariable('ARTICLE_UPDATED', date('c', strtotime($line["updated"])));
+ $tpl->setVariable('ARTICLE_AUTHOR', htmlspecialchars($line['author']));
+
+ $tags = get_article_tags($this->link, $line["id"], $owner_uid);
+
+ foreach ($tags as $tag) {
+ $tpl->setVariable('ARTICLE_CATEGORY', htmlspecialchars($tag));
+ $tpl->addBlock('category');
+ }
+
+ $enclosures = get_article_enclosures($this->link, $line["id"]);
+
+ foreach ($enclosures as $e) {
+ $type = htmlspecialchars($e['content_type']);
+ $url = htmlspecialchars($e['content_url']);
+ $length = $e['duration'];
+
+ $tpl->setVariable('ARTICLE_ENCLOSURE_URL', $url);
+ $tpl->setVariable('ARTICLE_ENCLOSURE_TYPE', $type);
+ $tpl->setVariable('ARTICLE_ENCLOSURE_LENGTH', $length);
+
+ $tpl->addBlock('enclosure');
+ }
+
+ $tpl->addBlock('entry');
+ }
+
+ $tmp = "";
+
+ $tpl->addBlock('feed');
+ $tpl->generateOutputToString($tmp);
+
+ print $tmp;
+ }
+
function getUnread() {
$login = db_escape_string($_REQUEST["login"]);
$fresh = $_REQUEST["fresh"] == "1";
@@ -195,7 +294,7 @@ class Public_Handler extends Handler {
if ($owner_id) {
$_SESSION['uid'] = $owner_id;
- generate_syndicated_feed($this->link, 0, $feed, $is_cat, $limit,
+ $this->generate_syndicated_feed(0, $feed, $is_cat, $limit,
$search, $search_mode, $match_on, $view_mode);
} else {
header('HTTP/1.1 403 Forbidden');
diff --git a/include/functions.php b/include/functions.php
index ef34b3d2..2118858c 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -1370,6 +1370,26 @@
return $data;
}
+ function getCategoryTitle($link, $cat_id) {
+
+ if ($cat_id == -1) {
+ return __("Special");
+ } else if ($cat_id == -2) {
+ return __("Labels");
+ } else {
+
+ $result = db_query($link, "SELECT title FROM ttrss_feed_categories WHERE
+ id = '$cat_id'");
+
+ if (db_num_rows($result) == 1) {
+ return db_fetch_result($result, 0, "title");
+ } else {
+ return "Uncategorized";
+ }
+ }
+ }
+
+
function getCategoryCounters($link) {
$ret_arr = array();
@@ -2522,124 +2542,6 @@
}
- function generate_syndicated_feed($link, $owner_uid, $feed, $is_cat,
- $limit, $search, $search_mode, $match_on, $view_mode = false) {
-
- require_once "lib/MiniTemplator.class.php";
-
- $note_style = "background-color : #fff7d5;
- border-width : 1px; ".
- "padding : 5px; border-style : dashed; border-color : #e7d796;".
- "margin-bottom : 1em; color : #9a8c59;";
-
- if (!$limit) $limit = 30;
-
- if (get_pref($link, "SORT_HEADLINES_BY_FEED_DATE", $owner_uid)) {
- $date_sort_field = "updated";
- } else {
- $date_sort_field = "date_entered";
- }
-
- $qfh_ret = queryFeedHeadlines($link, $feed,
- $limit, $view_mode, $is_cat, $search, $search_mode,
- $match_on, "$date_sort_field DESC", 0, $owner_uid);
-
- $result = $qfh_ret[0];
- $feed_title = htmlspecialchars($qfh_ret[1]);
- $feed_site_url = $qfh_ret[2];
- $last_error = $qfh_ret[3];
-
- $feed_self_url = get_self_url_prefix() .
- "/public.php?op=rss&id=-2&key=" .
- get_feed_access_key($link, -2, false);
-
- if (!$feed_site_url) $feed_site_url = get_self_url_prefix();
-
- $tpl = new MiniTemplator;
-
- $tpl->readTemplateFromFile("templates/generated_feed.txt");
-
- $tpl->setVariable('FEED_TITLE', $feed_title);
- $tpl->setVariable('VERSION', VERSION);
- $tpl->setVariable('FEED_URL', htmlspecialchars($feed_self_url));
-
- if (PUBSUBHUBBUB_HUB && $feed == -2) {
- $tpl->setVariable('HUB_URL', htmlspecialchars(PUBSUBHUBBUB_HUB));
- $tpl->addBlock('feed_hub');
- }
-
- $tpl->setVariable('SELF_URL', htmlspecialchars(get_self_url_prefix()));
-
- while ($line = db_fetch_assoc($result)) {
- $tpl->setVariable('ARTICLE_ID', htmlspecialchars($line['link']));
- $tpl->setVariable('ARTICLE_LINK', htmlspecialchars($line['link']));
- $tpl->setVariable('ARTICLE_TITLE', htmlspecialchars($line['title']));
- $tpl->setVariable('ARTICLE_EXCERPT',
- truncate_string(strip_tags($line["content_preview"]), 100, '...'));
-
- $content = sanitize($link, $line["content_preview"], false, $owner_uid);
-
- if ($line['note']) {
- $content = "Article note: " . $line['note'] . "
" .
- $content;
- }
-
- $tpl->setVariable('ARTICLE_CONTENT', $content);
-
- $tpl->setVariable('ARTICLE_UPDATED', date('c', strtotime($line["updated"])));
- $tpl->setVariable('ARTICLE_AUTHOR', htmlspecialchars($line['author']));
-
- $tags = get_article_tags($link, $line["id"], $owner_uid);
-
- foreach ($tags as $tag) {
- $tpl->setVariable('ARTICLE_CATEGORY', htmlspecialchars($tag));
- $tpl->addBlock('category');
- }
-
- $enclosures = get_article_enclosures($link, $line["id"]);
-
- foreach ($enclosures as $e) {
- $type = htmlspecialchars($e['content_type']);
- $url = htmlspecialchars($e['content_url']);
- $length = $e['duration'];
-
- $tpl->setVariable('ARTICLE_ENCLOSURE_URL', $url);
- $tpl->setVariable('ARTICLE_ENCLOSURE_TYPE', $type);
- $tpl->setVariable('ARTICLE_ENCLOSURE_LENGTH', $length);
-
- $tpl->addBlock('enclosure');
- }
-
- $tpl->addBlock('entry');
- }
-
- $tmp = "";
-
- $tpl->addBlock('feed');
- $tpl->generateOutputToString($tmp);
-
- print $tmp;
- }
-
- function getCategoryTitle($link, $cat_id) {
-
- if ($cat_id == -1) {
- return __("Special");
- } else if ($cat_id == -2) {
- return __("Labels");
- } else {
-
- $result = db_query($link, "SELECT title FROM ttrss_feed_categories WHERE
- id = '$cat_id'");
-
- if (db_num_rows($result) == 1) {
- return db_fetch_result($result, 0, "title");
- } else {
- return "Uncategorized";
- }
- }
- }
-
function sanitize($link, $str, $force_strip_tags = false, $owner = false, $site_url = false) {
global $purifier;
@@ -3051,296 +2953,6 @@
mb_strtolower(strip_tags($title), 'utf-8'));
}
- function format_headline_subtoolbar($link, $feed_site_url, $feed_title,
- $feed_id, $is_cat, $search, $match_on,
- $search_mode, $view_mode, $error) {
-
- $page_prev_link = "viewFeedGoPage(-1)";
- $page_next_link = "viewFeedGoPage(1)";
- $page_first_link = "viewFeedGoPage(0)";
-
- $catchup_page_link = "catchupPage()";
- $catchup_feed_link = "catchupCurrentFeed()";
- $catchup_sel_link = "catchupSelection()";
-
- $archive_sel_link = "archiveSelection()";
- $delete_sel_link = "deleteSelection()";
-
- $sel_all_link = "selectArticles('all')";
- $sel_unread_link = "selectArticles('unread')";
- $sel_none_link = "selectArticles('none')";
- $sel_inv_link = "selectArticles('invert')";
-
- $tog_unread_link = "selectionToggleUnread()";
- $tog_marked_link = "selectionToggleMarked()";
- $tog_published_link = "selectionTogglePublished()";
-
- $reply = "";
-
- $reply .= __('Select:')."
-
".__('All').",
-
".__('Unread').",
-
".__('Invert').",
-
".__('None')."";
-
- $reply .= " ";
-
- $reply .= "
";
-
- $reply .= "
".__('Feed not found.')."
";
- }
- }
-
- if (preg_match("/^-?[0-9][0-9]*$/", $feed) != false) {
-
- $result = db_query($link, "SELECT rtl_content FROM ttrss_feeds
- WHERE id = '$feed' AND owner_uid = " . $_SESSION["uid"]);
-
- if (db_num_rows($result) == 1) {
- $rtl_content = sql_bool_to_bool(db_fetch_result($result, 0, "rtl_content"));
- } else {
- $rtl_content = false;
- }
-
- if ($rtl_content) {
- $rtl_tag = "dir=\"RTL\"";
- } else {
- $rtl_tag = "";
- }
- } else {
- $rtl_tag = "";
- $rtl_content = false;
- }
-
- @$search = db_escape_string($_REQUEST["query"]);
-
- if ($search) {
- $disable_cache = true;
- }
-
- @$search_mode = db_escape_string($_REQUEST["search_mode"]);
- @$match_on = db_escape_string($_REQUEST["match_on"]);
-
- if (!$match_on) {
- $match_on = "both";
- }
-
- if ($_REQUEST["debug"]) $timing_info = print_checkpoint("H0", $timing_info);
-
-// error_log("format_headlines_list: [" . $feed . "] method [" . $method . "]");
- if( $search_mode == '' && $method != '' ){
- $search_mode = $method;
- }
-// error_log("search_mode: " . $search_mode);
- $qfh_ret = queryFeedHeadlines($link, $feed, $limit, $view_mode, $cat_view,
- $search, $search_mode, $match_on, $override_order, $offset);
-
- if ($_REQUEST["debug"]) $timing_info = print_checkpoint("H1", $timing_info);
-
- $result = $qfh_ret[0];
- $feed_title = $qfh_ret[1];
- $feed_site_url = $qfh_ret[2];
- $last_error = $qfh_ret[3];
-
- $vgroup_last_feed = $vgr_last_feed;
-
-// if (!$offset) {
-
- if (db_num_rows($result) > 0) {
- $reply['toolbar'] = format_headline_subtoolbar($link, $feed_site_url,
- $feed_title,
- $feed, $cat_view, $search, $match_on, $search_mode, $view_mode,
- $last_error);
- }
-// }
-
- $headlines_count = db_num_rows($result);
-
- if (db_num_rows($result) > 0) {
-
- $lnum = $offset;
-
- $num_unread = 0;
- $cur_feed_title = '';
-
- $fresh_intl = get_pref($link, "FRESH_ARTICLE_MAX_AGE") * 60 * 60;
-
- if ($_REQUEST["debug"]) $timing_info = print_checkpoint("PS", $timing_info);
-
- while ($line = db_fetch_assoc($result)) {
-
- $class = ($lnum % 2) ? "even" : "odd";
-
- $id = $line["id"];
- $feed_id = $line["feed_id"];
- $label_cache = $line["label_cache"];
- $labels = false;
-
- if ($label_cache) {
- $label_cache = json_decode($label_cache, true);
-
- if ($label_cache) {
- if ($label_cache["no-labels"] == 1)
- $labels = array();
- else
- $labels = $label_cache;
- }
- }
-
- if (!is_array($labels)) $labels = get_article_labels($link, $id);
-
- $labels_str = "";
- $labels_str .= format_article_labels($labels, $id);
- $labels_str .= "";
-
- if (count($topmost_article_ids) < 3) {
- array_push($topmost_article_ids, $id);
- }
-
- if ($line["last_read"] == "" && !sql_bool_to_bool($line["unread"])) {
-
- $update_pic = "";
- } else {
- $update_pic = "";
- }
-
- if (sql_bool_to_bool($line["unread"]) &&
- time() - strtotime($line["updated_noms"]) < $fresh_intl) {
-
- $update_pic = "";
- }
-
- if ($line["unread"] == "t" || $line["unread"] == "1") {
- $class .= " Unread";
- ++$num_unread;
- $is_unread = true;
- } else {
- $is_unread = false;
- }
-
- if ($line["marked"] == "t" || $line["marked"] == "1") {
- $marked_pic = "![\"Unstar](\"".theme_image($link,)
";
- } else {
- $marked_pic = "";
- }
-
- if ($line["published"] == "t" || $line["published"] == "1") {
- $published_pic = "";
- } else {
- $published_pic = "";
- }
-
-# $content_link = "" .
-# $line["title"] . "";
-
-# $content_link = "" .
-# $line["title"] . "";
-
-# $content_link = "" .
-# $line["title"] . "";
-
- $updated_fmt = make_local_datetime($link, $line["updated_noms"], false);
-
- if (get_pref($link, 'SHOW_CONTENT_PREVIEW')) {
- $content_preview = truncate_string(strip_tags($line["content_preview"]),
- 100);
- }
-
- $score = $line["score"];
-
- $score_pic = theme_image($link,
- "images/" . get_score_pic($score));
-
-/* $score_title = __("(Click to change)");
- $score_pic = ""; */
-
- $score_pic = "";
-
- if ($score > 500) {
- $hlc_suffix = "H";
- } else if ($score < -100) {
- $hlc_suffix = "L";
- } else {
- $hlc_suffix = "";
- }
-
- $entry_author = $line["author"];
-
- if ($entry_author) {
- $entry_author = " - $entry_author";
- }
-
- $has_feed_icon = feed_has_icon($feed_id);
-
- if ($has_feed_icon) {
- $feed_icon_img = "";
- } else {
- $feed_icon_img = "";
- }
-
- if (!get_pref($link, 'COMBINED_DISPLAY_MODE')) {
-
- if (get_pref($link, 'VFEED_GROUP_BY_FEED')) {
- if ($feed_id != $vgroup_last_feed && $line["feed_title"]) {
-
- $cur_feed_title = $line["feed_title"];
- $vgroup_last_feed = $feed_id;
-
- $cur_feed_title = htmlspecialchars($cur_feed_title);
-
- $vf_catchup_link = "(".__('mark as read').")";
-
- $reply['content'] .= "";
-
- }
- }
-
- $mouseover_attrs = "onmouseover='postMouseIn($id)'
- onmouseout='postMouseOut($id)'";
-
- $reply['content'] .= "";
-
- $reply['content'] .= "
$update_pic
";
-
- $reply['content'] .= "
";
-
- $reply['content'] .= "";
-
- $reply['content'] .= "$marked_pic";
- $reply['content'] .= "$published_pic";
-
- $reply['content'] .= "
";
-
- $reply['content'] .= "
";
-
- $reply['content'] .= "
$updated_fmt";
- $reply['content'] .= "
";
-
- $reply['content'] .= $score_pic;
-
- if ($line["feed_title"] && !get_pref($link, 'VFEED_GROUP_BY_FEED')) {
-
- $reply['content'] .= "
- $feed_icon_img";
- }
-
- $reply['content'] .= "
";
- $reply['content'] .= "
";
-
- $reply['content'] .= "";
-
- $reply['content'] .= "
";
-
- $reply['content'] .= "
";
-
- if ($line["orig_feed_id"]) {
-
- $tmp_result = db_query($link, "SELECT * FROM ttrss_archived_feeds
- WHERE id = ".$line["orig_feed_id"]);
-
- if (db_num_rows($tmp_result) != 0) {
-
- $reply['content'] .= "
";
- $reply['content'] .= __("Originally from:");
-
- $reply['content'] .= " ";
-
- $tmp_line = db_fetch_assoc($tmp_result);
-
- $reply['content'] .= "
" .
- $tmp_line['title'] . "";
-
- $reply['content'] .= " ";
-
- $reply['content'] .= "
";
- $reply['content'] .= "";
-
- $reply['content'] .= "
";
- }
- }
-
- $feed_site_url = $line["site_url"];
-
- $article_content = sanitize($link, $line["content_preview"],
- false, false, $feed_site_url);
-
- $reply['content'] .= "
";
- if ($line['note']) {
- $reply['content'] .= format_article_note($id, $line['note']);
- }
- $reply['content'] .= "
";
-
- $reply['content'] .= "
";
- $reply['content'] .= $expand_cdm ? $article_content : '';
- $reply['content'] .= "";
-
-/* $tmp_result = db_query($link, "SELECT always_display_enclosures FROM
- ttrss_feeds WHERE id = ".
- (($line['feed_id'] == null) ? $line['orig_feed_id'] :
- $line['feed_id'])." AND owner_uid = ".$_SESSION["uid"]);
-
- $always_display_enclosures = sql_bool_to_bool(db_fetch_result($tmp_result,
- 0, "always_display_enclosures")); */
-
- $always_display_enclosures = sql_bool_to_bool($line["always_display_enclosures"]);
-
- $reply['content'] .= format_article_enclosures($link, $id, $always_display_enclosures,
- $article_content);
-
- $reply['content'] .= "
";
-
- $reply['content'] .= "";
-
- $reply['content'] .= "
";
-
- $reply['content'] .= "
$message";
-
- $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']);
-
- $last_updated = db_fetch_result($result, 0, "last_updated");
- $last_updated = make_local_datetime($link, $last_updated, false);
-
- $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"]);
-
- $num_errors = db_fetch_result($result, 0, "num_errors");
-
- if ($num_errors > 0) {
- $reply['content'] .= "
";
- $reply['content'] .= "".
- __('Some feeds have update errors (click for details)')."";
- }
- $reply['content'] .= "
![Zoom](\"images/art-zoom.png\" "\".__(")
";
+
+ //$note_escaped = htmlspecialchars($line['note'], ENT_QUOTES);
+
+ $reply['content'] .= "![PubNote](\"images/art-pub-note.png\" "\".__(")
";
+
+ if (DIGEST_ENABLE) {
+ $reply['content'] .= "![Dismiss](\"images/digest_checkbox.png\" "\".__(")
";
+
+ $reply['content'] .= "