<?php\r
-class Feeds extends Protected_Handler {\r
+require_once "colors.php";\r
+\r
+class Feeds extends Handler_Protected {\r
\r
function csrf_ignore($method) {\r
$csrf_ignored = array("index");\r
return array_search($method, $csrf_ignored) !== false;\r
}\r
\r
- private function feedlist_init_cat($cat_id, $hidden = false) {\r
- $obj = array();\r
- $cat_id = (int) $cat_id;\r
-\r
- if ($cat_id > 0) {\r
- $cat_unread = ccache_find($this->link, $cat_id, $_SESSION["uid"], true);\r
- } else if ($cat_id == 0 || $cat_id == -2) {\r
- $cat_unread = getCategoryUnread($this->link, $cat_id);\r
- }\r
-\r
- $obj['id'] = 'CAT:' . $cat_id;\r
- $obj['items'] = array();\r
- $obj['name'] = getCategoryTitle($this->link, $cat_id);\r
- $obj['type'] = 'feed';\r
- $obj['unread'] = (int) $cat_unread;\r
- $obj['hidden'] = $hidden;\r
- $obj['bare_id'] = $cat_id;\r
-\r
- return $obj;\r
- }\r
-\r
- private function feedlist_init_feed($feed_id, $title = false, $unread = false, $error = '', $updated = '') {\r
- $obj = array();\r
- $feed_id = (int) $feed_id;\r
-\r
- if (!$title)\r
- $title = getFeedTitle($this->link, $feed_id, false);\r
-\r
- if ($unread === false)\r
- $unread = getFeedUnread($this->link, $feed_id, false);\r
-\r
- $obj['id'] = 'FEED:' . $feed_id;\r
- $obj['name'] = $title;\r
- $obj['unread'] = (int) $unread;\r
- $obj['type'] = 'feed';\r
- $obj['error'] = $error;\r
- $obj['updated'] = $updated;\r
- $obj['icon'] = getFeedIcon($feed_id);\r
- $obj['bare_id'] = $feed_id;\r
+ private function make_gradient($end, $class) {\r
+ $start = $class == "even" ? "#f0f0f0" : "#ffffff";\r
\r
- return $obj;\r
+ return "style='background: linear-gradient(left , $start 6%, $end 100%);\r
+ background: -o-linear-gradient(left , $start 6%, $end 100%);\r
+ background: -moz-linear-gradient(left , $start 6%, $end 100%);\r
+ background: -webkit-linear-gradient(left , $start 6%, $end 100%);\r
+ background: -ms-linear-gradient(left , $start 6%, $end 100%);\r
+ background: -webkit-gradient(linear, left top, right top,\r
+ color-stop(0.06, $start), color-stop(1, $end));'";\r
}\r
\r
private function format_headline_subtoolbar($feed_site_url, $feed_title,\r
$tog_marked_link = "selectionToggleMarked()";\r
$tog_published_link = "selectionTogglePublished()";\r
\r
+ $set_score_link = "setSelectionScore()";\r
+\r
if ($is_cat) $cat_q = "&is_cat=$is_cat";\r
\r
if ($search) {\r
// right part\r
\r
$reply .= "<span class='r'>";\r
+ $reply .= "<span id='feed_title'>";\r
\r
if ($feed_site_url) {\r
$target = "target=\"_blank\"";\r
$reply .= $feed_title;\r
}\r
\r
+ $reply .= "</span>";\r
+\r
$reply .= "\r
<a href=\"#\"\r
title=\"".__("View as RSS feed")."\"\r
onclick=\"displayDlg('generatedFeed', '$feed_id:$is_cat:$rss_link')\">\r
- <img class=\"noborder\" style=\"vertical-align : middle\" src=\"images/feed-icon-12x12.png\"></a>";\r
+ <img class=\"noborder\" style=\"vertical-align : middle\" src=\"images/pub_set.svg\"></a>";\r
\r
$reply .= "</span>";\r
\r
$reply .= "<option value=\"0\" disabled=\"1\">".__('Selection:')."</option>";\r
\r
$reply .= "<option value=\"$catchup_sel_link\">".__('Mark as read')."</option>";\r
+ $reply .= "<option value=\"$set_score_link\">".__('Set score')."</option>";\r
\r
if ($feed_id != "0") {\r
$reply .= "<option value=\"$archive_sel_link\">".__('Archive')."</option>";\r
\r
private function format_headlines_list($feed, $method, $view_mode, $limit, $cat_view,\r
$next_unread_feed, $offset, $vgr_last_feed = false,\r
- $override_order = false) {\r
+ $override_order = false, $include_children = false) {\r
+\r
+ if (isset($_REQUEST["DevForceUpdate"]))\r
+ header("Content-Type: text/plain");\r
\r
$disable_cache = false;\r
\r
\r
$method_split = explode(":", $method);\r
\r
- if ($method == "ForceUpdate" && $feed && is_numeric($feed) > 0) {\r
- include "rssfuncs.php";\r
- update_rss_feed($this->link, $feed, true);\r
+ if ($method == "ForceUpdate" && $feed > 0 && is_numeric($feed)) {\r
+ // Update the feed if required with some basic flood control\r
+\r
+ $result = db_query($this->link,\r
+ "SELECT cache_images,cache_content,".SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated\r
+ FROM ttrss_feeds WHERE id = '$feed'");\r
+\r
+ if (db_num_rows($result) != 0) {\r
+ $last_updated = strtotime(db_fetch_result($result, 0, "last_updated"));\r
+ $cache_images = sql_bool_to_bool(db_fetch_result($result, 0, "cache_images"));\r
+ $cache_content = sql_bool_to_bool(db_fetch_result($result, 0, "cache_content"));\r
+\r
+ if (!$cache_images && !$cache_content && time() - $last_updated > 120 || isset($_REQUEST['DevForceUpdate'])) {\r
+ include "rssfuncs.php";\r
+ update_rss_feed($this->link, $feed, true, true);\r
+ } else {\r
+ db_query($this->link, "UPDATE ttrss_feeds SET last_updated = '1970-01-01', last_update_started = '1970-01-01'\r
+ WHERE id = '$feed'");\r
+ }\r
+ }\r
}\r
\r
if ($method_split[0] == "MarkAllReadGR") {\r
}\r
}\r
\r
- if (preg_match("/^-?[0-9][0-9]*$/", $feed) != false) {\r
+ if (is_numeric($feed) && $feed > 0) {\r
\r
$result = db_query($this->link, "SELECT rtl_content FROM ttrss_feeds\r
WHERE id = '$feed' AND owner_uid = " . $_SESSION["uid"]);\r
}\r
\r
@$search_mode = db_escape_string($_REQUEST["search_mode"]);\r
- @$match_on = db_escape_string($_REQUEST["match_on"]);\r
-\r
- if (!$match_on) {\r
- $match_on = "both";\r
- }\r
+ $match_on = "both"; // deprecated, TODO: remove\r
\r
if ($_REQUEST["debug"]) $timing_info = print_checkpoint("H0", $timing_info);\r
\r
}\r
// error_log("search_mode: " . $search_mode);\r
$qfh_ret = queryFeedHeadlines($this->link, $feed, $limit, $view_mode, $cat_view,\r
- $search, $search_mode, $match_on, $override_order, $offset);\r
+ $search, $search_mode, $match_on, $override_order, $offset, 0,\r
+ false, 0, $include_children);\r
\r
if ($_REQUEST["debug"]) $timing_info = print_checkpoint("H1", $timing_info);\r
\r
$feed_title = $qfh_ret[1];\r
$feed_site_url = $qfh_ret[2];\r
$last_error = $qfh_ret[3];\r
+ $cache_content = true;\r
\r
$vgroup_last_feed = $vgr_last_feed;\r
\r
-// if (!$offset) {\r
-\r
- if (db_num_rows($result) > 0) {\r
- $reply['toolbar'] = $this->format_headline_subtoolbar($feed_site_url,\r
- $feed_title,\r
- $feed, $cat_view, $search, $match_on, $search_mode, $view_mode,\r
- $last_error);\r
- }\r
-// }\r
+ $reply['toolbar'] = $this->format_headline_subtoolbar($feed_site_url,\r
+ $feed_title,\r
+ $feed, $cat_view, $search, $match_on, $search_mode, $view_mode,\r
+ $last_error);\r
\r
$headlines_count = db_num_rows($result);\r
\r
- if (get_pref($this->link, 'COMBINED_DISPLAY_MODE')) {\r
+ /* if (get_pref($this->link, 'COMBINED_DISPLAY_MODE')) {\r
$button_plugins = array();\r
foreach (explode(",", ARTICLE_BUTTON_PLUGINS) as $p) {\r
- $pclass = trim("${p}_button");\r
+ $pclass = "button_" . trim($p);\r
\r
if (class_exists($pclass)) {\r
$plugin = new $pclass($link);\r
array_push($button_plugins, $plugin);\r
}\r
}\r
- }\r
+ } */\r
+\r
+ global $pluginhost;\r
\r
if (db_num_rows($result) > 0) {\r
\r
if ($_REQUEST["debug"]) $timing_info = print_checkpoint("PS", $timing_info);\r
\r
while ($line = db_fetch_assoc($result)) {\r
-\r
$class = ($lnum % 2) ? "even" : "odd";\r
\r
$id = $line["id"];\r
$feed_id = $line["feed_id"];\r
$label_cache = $line["label_cache"];\r
$labels = false;\r
+ $label_row_style = "";\r
\r
if ($label_cache) {\r
$label_cache = json_decode($label_cache, true);\r
\r
if (!is_array($labels)) $labels = get_article_labels($this->link, $id);\r
\r
- $labels_str = "<span id=\"HLLCTR-$id\">";\r
- $labels_str .= format_article_labels($labels, $id);\r
- $labels_str .= "</span>";\r
+ if (count($labels) > 0) {\r
+ for ($i = 0; $i < min(4, count($labels)); $i++) {\r
+ $bg = rgb2hsl(_color_unpack($labels[$i][3]));\r
\r
- if (count($topmost_article_ids) < 3) {\r
- array_push($topmost_article_ids, $id);\r
- }\r
+ if ($bg && $bg[1] > 0) {\r
+ $bg[1] = 0.1;\r
+ $bg[2] = 1;\r
\r
- if ($line["last_read"] == "" && !sql_bool_to_bool($line["unread"])) {\r
+ $bg = _color_pack(hsl2rgb($bg));\r
+ $label_row_style = $this->make_gradient($bg, $class);;\r
\r
- $update_pic = "<img id='FUPDPIC-$id' src=\"".\r
- theme_image($this->link, 'images/updated.png')."\"\r
- alt=\"Updated\">";\r
- } else {\r
- $update_pic = "<img id='FUPDPIC-$id' src=\"images/blank_icon.gif\"\r
- alt=\"Updated\">";\r
+ break;\r
+ }\r
+ }\r
}\r
\r
- if (sql_bool_to_bool($line["unread"]) &&\r
- time() - strtotime($line["updated_noms"]) < $fresh_intl) {\r
+ $labels_str = "<span id=\"HLLCTR-$id\">";\r
+ $labels_str .= format_article_labels($labels, $id);\r
+ $labels_str .= "</span>";\r
\r
- $update_pic = "<img id='FUPDPIC-$id' src=\"".\r
- theme_image($this->link, 'images/fresh_sign.png')."\" alt=\"Fresh\">";\r
+ if (count($topmost_article_ids) < 3) {\r
+ array_push($topmost_article_ids, $id);\r
}\r
\r
if ($line["unread"] == "t" || $line["unread"] == "1") {\r
\r
if ($line["marked"] == "t" || $line["marked"] == "1") {\r
$marked_pic = "<img id=\"FMPIC-$id\"\r
- src=\"".theme_image($this->link, 'images/mark_set.png')."\"\r
+ src=\"".theme_image($this->link, 'images/mark_set.svg')."\"\r
class=\"markedPic\" alt=\"Unstar article\"\r
onclick='javascript:toggleMark($id)'>";\r
} else {\r
$marked_pic = "<img id=\"FMPIC-$id\"\r
- src=\"".theme_image($this->link, 'images/mark_unset.png')."\"\r
+ src=\"".theme_image($this->link, 'images/mark_unset.svg')."\"\r
class=\"markedPic\" alt=\"Star article\"\r
onclick='javascript:toggleMark($id)'>";\r
}\r
\r
if ($line["published"] == "t" || $line["published"] == "1") {\r
$published_pic = "<img id=\"FPPIC-$id\" src=\"".theme_image($this->link,\r
- 'images/pub_set.png')."\"\r
+ 'images/pub_set.svg')."\"\r
class=\"markedPic\"\r
alt=\"Unpublish article\" onclick='javascript:togglePub($id)'>";\r
} else {\r
$published_pic = "<img id=\"FPPIC-$id\" src=\"".theme_image($this->link,\r
- 'images/pub_unset.png')."\"\r
+ 'images/pub_unset.svg')."\"\r
class=\"markedPic\"\r
alt=\"Publish article\" onclick='javascript:togglePub($id)'>";\r
}\r
$updated_fmt = make_local_datetime($this->link, $line["updated_noms"], false);\r
\r
if (get_pref($this->link, 'SHOW_CONTENT_PREVIEW')) {\r
- $content_preview = strip_tags($line["content_preview"]);\r
+ $content_preview = truncate_string(strip_tags($line["content_preview"]),\r
+ 100);\r
}\r
\r
$score = $line["score"];\r
$score_pic = "<img class='hlScorePic' src=\"images/$score_pic\"\r
onclick=\"adjustArticleScore($id, $score)\" title=\"$score $score_title\">"; */\r
\r
- $score_pic = "<img class='hlScorePic' src=\"$score_pic\"\r
+ $score_pic = "<img class='hlScorePic' score='$score' onclick='changeScore($id, this)' src=\"$score_pic\"\r
title=\"$score\">";\r
\r
if ($score > 500) {\r
if ($has_feed_icon) {\r
$feed_icon_img = "<img class=\"tinyFeedIcon\" src=\"".ICONS_URL."/$feed_id.ico\" alt=\"\">";\r
} else {\r
- $feed_icon_img = "<img class=\"tinyFeedIcon\" src=\"images/feed-icon-12x12.png\" alt=\"\">";\r
+ $feed_icon_img = "<img class=\"tinyFeedIcon\" src=\"images/pub_set.svg\" alt=\"\">";\r
}\r
\r
if (!get_pref($this->link, 'COMBINED_DISPLAY_MODE')) {\r
$mouseover_attrs = "onmouseover='postMouseIn($id)'\r
onmouseout='postMouseOut($id)'";\r
\r
- $reply['content'] .= "<div class='$class' id='RROW-$id' $mouseover_attrs>";\r
-\r
- $reply['content'] .= "<div class='hlUpdPic'>$update_pic</div>";\r
+ $reply['content'] .= "<div class='$class' id='RROW-$id' $label_row_style $mouseover_attrs>";\r
\r
$reply['content'] .= "<div class='hlLeft'>";\r
\r
- $reply['content'] .= "<input type=\"checkbox\" onclick=\"tSR(this)\"\r
+ $reply['content'] .= "<input dojoType=\"dijit.form.CheckBox\"\r
+ type=\"checkbox\" onclick=\"toggleSelectRow2(this)\"\r
id=\"RCHK-$id\">";\r
\r
$reply['content'] .= "$marked_pic";\r
$reply['content'] .= "<a id=\"RTITLE-$id\"\r
href=\"" . htmlspecialchars($line["link"]) . "\"\r
onclick=\"\">" .\r
- $line["title"];\r
+ truncate_string($line["title"], 200);\r
\r
if (get_pref($this->link, 'SHOW_CONTENT_PREVIEW')) {\r
if ($content_preview) {\r
$mouseover_attrs = "onmouseover='postMouseIn($id)'\r
onmouseout='postMouseOut($id)'";\r
\r
- $reply['content'] .= "<div class=\"$class\"\r
+ $reply['content'] .= "<div class=\"$class\" $label_row_style\r
id=\"RROW-$id\" $mouseover_attrs'>";\r
\r
$reply['content'] .= "<div class=\"cdmHeader\">";\r
\r
$reply['content'] .= "<div>";\r
\r
- $reply['content'] .= "<input type=\"checkbox\" onclick=\"toggleSelectRowById(this,\r
- 'RROW-$id')\" id=\"RCHK-$id\"/>";\r
+ $reply['content'] .= "<input dojoType=\"dijit.form.CheckBox\"\r
+ type=\"checkbox\" onclick=\"toggleSelectRow2(this)\"\r
+ id=\"RCHK-$id\">";\r
\r
$reply['content'] .= "$marked_pic";\r
$reply['content'] .= "$published_pic";\r
$reply['content'] .= "</div>";\r
\r
$reply['content'] .= "<div id=\"PTITLE-FULL-$id\" style=\"display : none\">" .\r
- strip_tags($line['title']) . "</div>";\r
+ htmlspecialchars(strip_tags($line['title'])) . "</div>";\r
\r
$reply['content'] .= "<span id=\"RTITLE-$id\"\r
onclick=\"return cdmClicked(event, $id);\"\r
title=\"".htmlspecialchars($line['title'])."\"\r
target=\"_blank\" href=\"".\r
htmlspecialchars($line["link"])."\">".\r
- truncate_string($line["title"], 100) .\r
+ $line["title"] .\r
" $entry_author</a>";\r
\r
$reply['content'] .= $labels_str;\r
title=\"".htmlspecialchars($line["feed_title"])."\"\r
onclick=\"viewfeed($feed_id)\">$feed_icon_img</span>";\r
}\r
- $reply['content'] .= "<div class=\"updPic\">$update_pic</div>";\r
$reply['content'] .= "</div>";\r
\r
$reply['content'] .= "</div>";\r
$reply['content'] .= " ";\r
\r
$reply['content'] .= "<a target='_blank' href='" . htmlspecialchars($tmp_line['feed_url']) . "'>";\r
- $reply['content'] .= "<img title='".__('Feed URL')."'class='tinyFeedIcon' src='images/pub_set.png'></a>";\r
+ $reply['content'] .= "<img title='".__('Feed URL')."'class='tinyFeedIcon' src='images/pub_unset.svg'></a>";\r
\r
$reply['content'] .= "</div>";\r
}\r
\r
$feed_site_url = $line["site_url"];\r
\r
+ if ($cache_content && $line["cached_content"] != "") {\r
+ $line["content_preview"] =& $line["cached_content"];\r
+ }\r
+\r
$article_content = sanitize($this->link, $line["content_preview"],\r
false, false, $feed_site_url);\r
\r
$reply['content'] .= "</div>";\r
\r
$reply['content'] .= "<span id=\"CWRAP-$id\">";\r
- $reply['content'] .= $expand_cdm ? $article_content : '';\r
+ $reply['content'] .= $article_content;\r
$reply['content'] .= "</span>";\r
\r
/* $tmp_result = db_query($this->link, "SELECT always_display_enclosures FROM\r
\r
if ($num_comments > 0) {\r
if ($line["comments"]) {\r
- $comments_url = $line["comments"];\r
+ $comments_url = htmlspecialchars($line["comments"]);\r
} else {\r
- $comments_url = $line["link"];\r
+ $comments_url = htmlspecialchars($line["link"]);\r
}\r
$entry_comments = "<a target='_blank' href=\"$comments_url\">$num_comments comments</a>";\r
} else {\r
if ($line["comments"] && $line["link"] != $line["comments"]) {\r
- $entry_comments = "<a target='_blank' href=\"".$line["comments"]."\">comments</a>";\r
+ $entry_comments = "<a target='_blank' href=\"".htmlspecialchars($line["comments"])."\">comments</a>";\r
}\r
}\r
\r
\r
//$note_escaped = htmlspecialchars($line['note'], ENT_QUOTES);\r
\r
- foreach ($button_plugins as $p) {\r
- $reply['content'] .= $p->render($id, $line);\r
+ foreach ($pluginhost->get_hooks($pluginhost::HOOK_ARTICLE_BUTTON) as $p) {\r
+ $reply['content'] .= $p->hook_article_button($line);\r
}\r
\r
- $reply['content'] .= "<img src=\"images/digest_checkbox.png\"\r
+ $reply['content'] .= "<img src=\"images/close_article.png\"\r
style=\"cursor : pointer\" style=\"cursor : pointer\"\r
onclick=\"dismissArticle($id)\"\r
title='".__('Close article')."'>";\r
$vgroup_last_feed, $reply);\r
}\r
\r
- private function outputFeedList($special = true) {\r
-\r
- $feedlist = array();\r
-\r
- $enable_cats = get_pref($this->link, 'ENABLE_FEED_CATS');\r
-\r
- $feedlist['identifier'] = 'id';\r
- $feedlist['label'] = 'name';\r
- $feedlist['items'] = array();\r
-\r
- $owner_uid = $_SESSION["uid"];\r
-\r
- /* virtual feeds */\r
-\r
- if ($special) {\r
-\r
- if ($enable_cats) {\r
- $cat_hidden = get_pref($this->link, "_COLLAPSED_SPECIAL");\r
- $cat = $this->feedlist_init_cat(-1, $cat_hidden);\r
- } else {\r
- $cat['items'] = array();\r
- }\r
-\r
- foreach (array(-4, -3, -1, -2, 0) as $i) {\r
- array_push($cat['items'], $this->feedlist_init_feed($i));\r
- }\r
-\r
- if ($enable_cats) {\r
- array_push($feedlist['items'], $cat);\r
- } else {\r
- $feedlist['items'] = array_merge($feedlist['items'], $cat['items']);\r
- }\r
-\r
- $result = db_query($this->link, "SELECT * FROM\r
- ttrss_labels2 WHERE owner_uid = '$owner_uid' ORDER by caption");\r
-\r
- if (db_num_rows($result) > 0) {\r
-\r
- if (get_pref($this->link, 'ENABLE_FEED_CATS')) {\r
- $cat_hidden = get_pref($this->link, "_COLLAPSED_LABELS");\r
- $cat = $this->feedlist_init_cat(-2, $cat_hidden);\r
- } else {\r
- $cat['items'] = array();\r
- }\r
-\r
- while ($line = db_fetch_assoc($result)) {\r
-\r
- $label_id = -$line['id'] - 11;\r
- $count = getFeedUnread($this->link, $label_id);\r
-\r
- $feed = $this->feedlist_init_feed($label_id, false, $count);\r
-\r
- $feed['fg_color'] = $line['fg_color'];\r
- $feed['bg_color'] = $line['bg_color'];\r
-\r
- array_push($cat['items'], $feed);\r
- }\r
-\r
- if ($enable_cats) {\r
- array_push($feedlist['items'], $cat);\r
- } else {\r
- $feedlist['items'] = array_merge($feedlist['items'], $cat['items']);\r
- }\r
- }\r
- }\r
-\r
-/* if (get_pref($this->link, 'ENABLE_FEED_CATS')) {\r
- if (get_pref($this->link, "FEEDS_SORT_BY_UNREAD")) {\r
- $order_by_qpart = "order_id,category,unread DESC,title";\r
- } else {\r
- $order_by_qpart = "order_id,category,title";\r
- }\r
- } else {\r
- if (get_pref($this->link, "FEEDS_SORT_BY_UNREAD")) {\r
- $order_by_qpart = "unread DESC,title";\r
- } else {\r
- $order_by_qpart = "title";\r
- }\r
- } */\r
-\r
- /* real feeds */\r
-\r
- if ($enable_cats)\r
- $order_by_qpart = "ttrss_feed_categories.order_id,category,\r
- ttrss_feeds.order_id,title";\r
- else\r
- $order_by_qpart = "title";\r
-\r
- $query = "SELECT ttrss_feeds.id, ttrss_feeds.title,\r
- ".SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated_noms,\r
- cat_id,last_error,\r
- COALESCE(ttrss_feed_categories.title, '".__('Uncategorized')."') AS category,\r
- ttrss_feed_categories.collapsed,\r
- value AS unread\r
- FROM ttrss_feeds LEFT JOIN ttrss_feed_categories\r
- ON (ttrss_feed_categories.id = cat_id)\r
- LEFT JOIN ttrss_counters_cache\r
- ON\r
- (ttrss_feeds.id = feed_id)\r
- WHERE\r
- ttrss_feeds.owner_uid = '$owner_uid'\r
- ORDER BY $order_by_qpart";\r
-\r
- $result = db_query($this->link, $query);\r
-\r
- $actid = $_REQUEST["actid"];\r
-\r
- if (db_num_rows($result) > 0) {\r
-\r
- $category = "";\r
-\r
- if (!$enable_cats)\r
- $cat['items'] = array();\r
- else\r
- $cat = false;\r
-\r
- while ($line = db_fetch_assoc($result)) {\r
-\r
- $feed = htmlspecialchars(trim($line["title"]));\r
-\r
- if (!$feed) $feed = "[Untitled]";\r
-\r
- $feed_id = $line["id"];\r
- $unread = $line["unread"];\r
-\r
- $cat_id = $line["cat_id"];\r
- $tmp_category = $line["category"];\r
-\r
- if ($category != $tmp_category && $enable_cats) {\r
-\r
- $category = $tmp_category;\r
-\r
- $collapsed = sql_bool_to_bool($line["collapsed"]);\r
-\r
- // workaround for NULL category\r
- if ($category == __("Uncategorized")) {\r
- $collapsed = get_pref($this->link, "_COLLAPSED_UNCAT");\r
- }\r
-\r
- if ($cat) array_push($feedlist['items'], $cat);\r
-\r
- $cat = $this->feedlist_init_cat($cat_id, $collapsed);\r
- }\r
-\r
- $updated = make_local_datetime($this->link, $line["updated_noms"], false);\r
-\r
- array_push($cat['items'], $this->feedlist_init_feed($feed_id,\r
- $feed, $unread, $line['last_error'], $updated));\r
- }\r
-\r
- if ($enable_cats) {\r
- array_push($feedlist['items'], $cat);\r
- } else {\r
- $feedlist['items'] = array_merge($feedlist['items'], $cat['items']);\r
- }\r
-\r
- }\r
-\r
- return $feedlist;\r
- }\r
-\r
-\r
function catchupAll() {\r
db_query($this->link, "UPDATE ttrss_user_entries SET\r
last_read = NOW(),unread = false WHERE owner_uid = " . $_SESSION["uid"]);\r
toggle_collapse_cat($this->link, $cat_id, $mode);\r
}\r
\r
- function index() {\r
- $root = (bool)$_REQUEST["root"];\r
-\r
- if (!$root) {\r
- print json_encode($this->outputFeedList($this->link));\r
- } else {\r
-\r
- $feeds = $this->outputFeedList($this->link, false);\r
-\r
- $root = array();\r
- $root['id'] = 'root';\r
- $root['name'] = __('Feeds');\r
- $root['items'] = $feeds['items'];\r
-\r
- $fl = array();\r
- $fl['identifier'] = 'id';\r
- $fl['label'] = 'name';\r
- $fl['items'] = array($root);\r
-\r
- print json_encode($fl);\r
- }\r
- }\r
-\r
function view() {\r
$timing_info = getmicrotime();\r
\r
$method = db_escape_string($_REQUEST["m"]);\r
$view_mode = db_escape_string($_REQUEST["view_mode"]);\r
$limit = (int) get_pref($this->link, "DEFAULT_ARTICLE_LIMIT");\r
- @$cat_view = db_escape_string($_REQUEST["cat"]) == "true";\r
+ @$cat_view = $_REQUEST["cat"] == "true";\r
@$next_unread_feed = db_escape_string($_REQUEST["nuf"]);\r
@$offset = db_escape_string($_REQUEST["skip"]);\r
@$vgroup_last_feed = db_escape_string($_REQUEST["vgrlf"]);\r
* when there's nothing to load - e.g. no stuff in fresh feed */\r
\r
if ($feed == -5) {\r
- print json_encode(generate_dashboard_feed($this->link));\r
+ print json_encode($this->generate_dashboard_feed($this->link));\r
return;\r
}\r
\r
}\r
\r
if ($result && db_num_rows($result) == 0) {\r
- print json_encode(generate_error_feed($this->link, __("Feed not found.")));\r
+ print json_encode($this->generate_error_feed($this->link, __("Feed not found.")));\r
return;\r
}\r
\r
set_pref($this->link, "_DEFAULT_VIEW_LIMIT", $limit);\r
set_pref($this->link, "_DEFAULT_VIEW_ORDER_BY", $order_by);\r
\r
- if (!$cat_view && preg_match("/^[0-9][0-9]*$/", $feed)) {\r
+ if (!$cat_view && is_numeric($feed) && $feed > 0) {\r
db_query($this->link, "UPDATE ttrss_feeds SET last_viewed = NOW()\r
WHERE id = '$feed' AND owner_uid = ".$_SESSION["uid"]);\r
}\r
\r
$ret = $this->format_headlines_list($feed, $method,\r
$view_mode, $limit, $cat_view, $next_unread_feed, $offset,\r
- $vgroup_last_feed, $override_order);\r
+ $vgroup_last_feed, $override_order, true);\r
\r
$topmost_article_ids = $ret[0];\r
$headlines_count = $ret[1];\r
print json_encode($reply);\r
\r
}\r
+\r
+ private function generate_dashboard_feed($link) {\r
+ $reply = array();\r
+\r
+ $reply['headlines']['id'] = -5;\r
+ $reply['headlines']['is_cat'] = false;\r
+\r
+ $reply['headlines']['toolbar'] = '';\r
+ $reply['headlines']['content'] = "<div class='whiteBox'>".__('No feed selected.');\r
+\r
+ $reply['headlines']['content'] .= "<p class=\"small\"><span class=\"insensitive\">";\r
+\r
+ $result = db_query($link, "SELECT ".SUBSTRING_FOR_DATE."(MAX(last_updated), 1, 19) AS last_updated FROM ttrss_feeds\r
+ WHERE owner_uid = " . $_SESSION['uid']);\r
+\r
+ $last_updated = db_fetch_result($result, 0, "last_updated");\r
+ $last_updated = make_local_datetime($link, $last_updated, false);\r
+\r
+ $reply['headlines']['content'] .= sprintf(__("Feeds last updated at %s"), $last_updated);\r
+\r
+ $result = db_query($link, "SELECT COUNT(id) AS num_errors\r
+ FROM ttrss_feeds WHERE last_error != '' AND owner_uid = ".$_SESSION["uid"]);\r
+\r
+ $num_errors = db_fetch_result($result, 0, "num_errors");\r
+\r
+ if ($num_errors > 0) {\r
+ $reply['headlines']['content'] .= "<br/>";\r
+ $reply['headlines']['content'] .= "<a class=\"insensitive\" href=\"#\" onclick=\"showFeedsWithErrors()\">".\r
+ __('Some feeds have update errors (click for details)')."</a>";\r
+ }\r
+ $reply['headlines']['content'] .= "</span></p>";\r
+\r
+ $reply['headlines-info'] = array("count" => 0,\r
+ "vgroup_last_feed" => '',\r
+ "unread" => 0,\r
+ "disable_cache" => true);\r
+\r
+ return $reply;\r
+ }\r
+\r
+ private function generate_error_feed($link, $error) {\r
+ $reply = array();\r
+\r
+ $reply['headlines']['id'] = -6;\r
+ $reply['headlines']['is_cat'] = false;\r
+\r
+ $reply['headlines']['toolbar'] = '';\r
+ $reply['headlines']['content'] = "<div class='whiteBox'>". $error . "</div>";\r
+\r
+ $reply['headlines-info'] = array("count" => 0,\r
+ "vgroup_last_feed" => '',\r
+ "unread" => 0,\r
+ "disable_cache" => true);\r
+\r
+ return $reply;\r
+ }\r
+\r
+\r
}\r
?>\r
git.wh0rd.org / tt-rss.git / blobdiff