<?php\r
class Feeds extends Protected_Handler {\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
+ function csrf_ignore($method) {\r
+ $csrf_ignored = array("index");\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
-\r
- return $obj;\r
+ return array_search($method, $csrf_ignored) !== false;\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
- $reply = "<div id=\"subtoolbar_main\">";\r
+ if ($is_cat) $cat_q = "&is_cat=$is_cat";\r
+\r
+ if ($search) {\r
+ $search_q = "&q=$search&m=$match_on&smode=$search_mode";\r
+ } else {\r
+ $search_q = "";\r
+ }\r
+\r
+ $rss_link = htmlspecialchars(get_self_url_prefix() .\r
+ "/public.php?op=rss&id=$feed_id$cat_q$search_q");\r
+\r
+ // right part\r
+\r
+ $reply .= "<span class='r'>";\r
+\r
+ if ($feed_site_url) {\r
+ $target = "target=\"_blank\"";\r
+ $reply .= "<a title=\"".__("Visit the website")."\" $target href=\"$feed_site_url\">".\r
+ truncate_string($feed_title,30)."</a>";\r
+\r
+ if ($error) {\r
+ $reply .= " (<span class=\"error\" title=\"$error\">Error</span>)";\r
+ }\r
+\r
+ } else {\r
+ $reply .= $feed_title;\r
+ }\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
+\r
+ $reply .= "</span>";\r
+\r
+ // left part\r
\r
$reply .= __('Select:')."\r
<a href=\"#\" onclick=\"$sel_all_link\">".__('All')."</a>,\r
$reply .= "<option value=\"emailArticle(false)\">".__('Forward by email').\r
"</option>";\r
\r
- if ($is_cat) $cat_q = "&is_cat=$is_cat";\r
-\r
- if ($search) {\r
- $search_q = "&q=$search&m=$match_on&smode=$search_mode";\r
- } else {\r
- $search_q = "";\r
- }\r
-\r
- $rss_link = htmlspecialchars(get_self_url_prefix() .\r
- "/public.php?op=rss&id=$feed_id$cat_q$search_q");\r
-\r
$reply .= "<option value=\"0\" disabled=\"1\">".__('Feed:')."</option>";\r
\r
$reply .= "<option value=\"catchupPage()\">".__('Mark as read')."</option>";\r
\r
$reply .= "</select>";\r
\r
- $reply .= "</div>";\r
+ //$reply .= "</div>";\r
\r
- $reply .= "<div id=\"subtoolbar_ftitle\">";\r
-\r
- if ($feed_site_url) {\r
- $target = "target=\"_blank\"";\r
- $reply .= "<a title=\"".__("Visit the website")."\" $target href=\"$feed_site_url\">".\r
- truncate_string($feed_title,30)."</a>";\r
-\r
- if ($error) {\r
- $reply .= " (<span class=\"error\" title=\"$error\">Error</span>)";\r
- }\r
-\r
- } else {\r
- if ($feed_id < -10) {\r
- $label_id = -11-$feed_id;\r
-\r
- $result = db_query($this->link, "SELECT fg_color, bg_color\r
- FROM ttrss_labels2 WHERE id = '$label_id' AND owner_uid = " .\r
- $_SESSION["uid"]);\r
-\r
- if (db_num_rows($result) != 0) {\r
- $fg_color = db_fetch_result($result, 0, "fg_color");\r
- $bg_color = db_fetch_result($result, 0, "bg_color");\r
-\r
- $reply .= "<span style=\"background : $bg_color; color : $fg_color\" >";\r
- $reply .= $feed_title;\r
- $reply .= "</span>";\r
- } else {\r
- $reply .= $feed_title;\r
- }\r
-\r
- } else {\r
- $reply .= $feed_title;\r
- }\r
- }\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
-\r
- $reply .= "</div>";\r
+ //$reply .= "</h2";\r
\r
return $reply;\r
}\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
$disable_cache = false;\r
\r
\r
$method_split = explode(":", $method);\r
\r
-/* if ($method == "CatchupSelected") {\r
- $ids = explode(",", db_escape_string($_REQUEST["ids"]));\r
- $cmode = sprintf("%d", $_REQUEST["cmode"]);\r
-\r
- catchupArticlesById($this->link, $ids, $cmode);\r
- } */\r
-\r
- //if ($method == "ForceUpdate" && $feed && is_numeric($feed) > 0) {\r
- // update_rss_feed($this->link, $feed, true);\r
- //}\r
-\r
- if ($method == "MarkAllRead") {\r
- catchup_feed($this->link, $feed, $cat_view);\r
-\r
- if (get_pref($this->link, 'ON_CATCHUP_SHOW_NEXT_FEED')) {\r
- if ($next_unread_feed) {\r
- $feed = $next_unread_feed;\r
- }\r
- }\r
+ if ($method == "ForceUpdate" && $feed && is_numeric($feed) > 0) {\r
+ include "rssfuncs.php";\r
+ update_rss_feed($this->link, $feed, true);\r
}\r
\r
if ($method_split[0] == "MarkAllReadGR") {\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
\r
$headlines_count = db_num_rows($result);\r
\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
+\r
+ if (class_exists($pclass)) {\r
+ $plugin = new $pclass($link);\r
+ array_push($button_plugins, $plugin);\r
+ }\r
+ }\r
+ }\r
+\r
if (db_num_rows($result) > 0) {\r
\r
$lnum = $offset;\r
\r
$cur_feed_title = htmlspecialchars($cur_feed_title);\r
\r
- $vf_catchup_link = "(<a onclick='javascript:catchupFeedInGroup($feed_id);' href='#'>".__('mark as read')."</a>)";\r
+ $vf_catchup_link = "(<a onclick='catchupFeedInGroup($feed_id);' href='#'>".__('mark as read')."</a>)";\r
\r
$reply['content'] .= "<div class='cdmFeedTitle'>".\r
"<div style=\"float : right\">$feed_icon_img</div>".\r
\r
$reply['content'] .= "</div>";\r
\r
+ $reply['content'] .= "<div id=\"PTITLE-FULL-$id\" style=\"display : none\">" .\r
+ strip_tags($line['title']) . "</div>";\r
+\r
$reply['content'] .= "<span id=\"RTITLE-$id\"\r
onclick=\"return cdmClicked(event, $id);\"\r
class=\"titleWrap$hlc_suffix\">\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.gif'></a>";\r
+ $reply['content'] .= "<img title='".__('Feed URL')."'class='tinyFeedIcon' src='images/pub_set.png'></a>";\r
\r
$reply['content'] .= "</div>";\r
}\r
\r
//$note_escaped = htmlspecialchars($line['note'], ENT_QUOTES);\r
\r
- $reply['content'] .= "<img src=\"images/art-pub-note.png\"\r
- style=\"cursor : pointer\" style=\"cursor : pointer\"\r
- onclick=\"editArticleNote($id)\"\r
- alt='PubNote' title='".__('Edit article note')."'>";\r
-\r
- if (DIGEST_ENABLE) {\r
- $reply['content'] .= "<img src=\"".theme_image($this->link, 'images/art-email.png')."\"\r
- style=\"cursor : pointer\"\r
- onclick=\"emailArticle($id)\"\r
- alt='Zoom' title='".__('Forward by email')."'>";\r
- }\r
-\r
- if (ENABLE_TWEET_BUTTON) {\r
- $reply['content'] .= "<img src=\"".theme_image($this->link, 'images/art-tweet.png')."\"\r
- class='tagsPic' style=\"cursor : pointer\"\r
- onclick=\"tweetArticle($id)\"\r
- alt='Zoom' title='".__('Share on Twitter')."'>";\r
+ foreach ($button_plugins as $p) {\r
+ $reply['content'] .= $p->render($id, $line);\r
}\r
\r
- $reply['content'] .= "<img src=\"".theme_image($this->link, 'images/art-share.png')."\"\r
- class='tagsPic' style=\"cursor : pointer\"\r
- onclick=\"shareArticle(".$line['int_id'].")\"\r
- alt='Zoom' title='".__('Share by URL')."'>";\r
-\r
$reply['content'] .= "<img src=\"images/digest_checkbox.png\"\r
style=\"cursor : pointer\" style=\"cursor : pointer\"\r
onclick=\"dismissArticle($id)\"\r
- alt='Dismiss' title='".__('Dismiss article')."'>";\r
+ title='".__('Close article')."'>";\r
\r
$reply['content'] .= "</div>";\r
$reply['content'] .= "</div>";\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
- $age_qpart = getMaxAgeSubquery();\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
- ttrss_feed_categories.title 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
- if (!$tmp_category) $tmp_category = __("Uncategorized");\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
$order_by = db_escape_string($_REQUEST["order_by"]);\r
+ $include_children = $_REQUEST["include_children"] == "true";\r
\r
if (is_numeric($feed)) $feed = (int) $feed;\r
\r
set_pref($this->link, "_DEFAULT_VIEW_MODE", $view_mode);\r
set_pref($this->link, "_DEFAULT_VIEW_LIMIT", $limit);\r
set_pref($this->link, "_DEFAULT_VIEW_ORDER_BY", $order_by);\r
+ set_pref($this->link, "_DEFAULT_INCLUDE_CHILDREN", $include_children);\r
\r
if (!$cat_view && preg_match("/^[0-9][0-9]*$/", $feed)) {\r
db_query($this->link, "UPDATE ttrss_feeds SET last_viewed = NOW()\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, $include_children);\r
\r
$topmost_article_ids = $ret[0];\r
$headlines_count = $ret[1];\r
git.wh0rd.org / tt-rss.git / blobdiff