From 2ecd2df560b60868f10830ce623f32257c2ddfbf Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Mon, 13 Aug 2012 18:56:55 +0400 Subject: [PATCH] sorta-kinda fix the feedlist --- classes/feeds.php | 326 ----------------------------------------- classes/pref_feeds.php | 136 +++++++++++++++-- index.php | 6 +- js/tt-rss.js | 6 +- 4 files changed, 134 insertions(+), 340 deletions(-) diff --git a/classes/feeds.php b/classes/feeds.php index 0762b0067..d1ef16738 100644 --- a/classes/feeds.php +++ b/classes/feeds.php @@ -7,49 +7,6 @@ class Feeds extends Protected_Handler { return array_search($method, $csrf_ignored) !== false; } - private function feedlist_init_cat($cat_id, $hidden = false) { - $obj = array(); - $cat_id = (int) $cat_id; - - if ($cat_id > 0) { - $cat_unread = ccache_find($this->link, $cat_id, $_SESSION["uid"], true); - } else if ($cat_id == 0 || $cat_id == -2) { - $cat_unread = getCategoryUnread($this->link, $cat_id); - } - - $obj['id'] = 'CAT:' . $cat_id; - $obj['items'] = array(); - $obj['name'] = getCategoryTitle($this->link, $cat_id); - $obj['type'] = 'feed'; - $obj['unread'] = (int) $cat_unread; - $obj['hidden'] = $hidden; - $obj['bare_id'] = $cat_id; - - return $obj; - } - - private function feedlist_init_feed($feed_id, $title = false, $unread = false, $error = '', $updated = '') { - $obj = array(); - $feed_id = (int) $feed_id; - - if (!$title) - $title = getFeedTitle($this->link, $feed_id, false); - - if ($unread === false) - $unread = getFeedUnread($this->link, $feed_id, false); - - $obj['id'] = 'FEED:' . $feed_id; - $obj['name'] = $title; - $obj['unread'] = (int) $unread; - $obj['type'] = 'feed'; - $obj['error'] = $error; - $obj['updated'] = $updated; - $obj['icon'] = getFeedIcon($feed_id); - $obj['bare_id'] = $feed_id; - - return $obj; - } - private function format_headline_subtoolbar($feed_site_url, $feed_title, $feed_id, $is_cat, $search, $match_on, $search_mode, $view_mode, $error) { @@ -776,289 +733,6 @@ class Feeds extends Protected_Handler { $vgroup_last_feed, $reply); } - private function outputFeedList($special = true) { - - $feedlist = array(); - - $enable_cats = get_pref($this->link, 'ENABLE_FEED_CATS'); - - $feedlist['identifier'] = 'id'; - $feedlist['label'] = 'name'; - $feedlist['items'] = array(); - - $owner_uid = $_SESSION["uid"]; - - /* virtual feeds */ - - if ($special) { - - if ($enable_cats) { - $cat_hidden = get_pref($this->link, "_COLLAPSED_SPECIAL"); - $cat = $this->feedlist_init_cat(-1, $cat_hidden); - } else { - $cat['items'] = array(); - } - - foreach (array(-4, -3, -1, -2, 0) as $i) { - array_push($cat['items'], $this->feedlist_init_feed($i)); - } - - if ($enable_cats) { - array_push($feedlist['items'], $cat); - } else { - $feedlist['items'] = array_merge($feedlist['items'], $cat['items']); - } - - $result = db_query($this->link, "SELECT * FROM - ttrss_labels2 WHERE owner_uid = '$owner_uid' ORDER by caption"); - - if (db_num_rows($result) > 0) { - - if (get_pref($this->link, 'ENABLE_FEED_CATS')) { - $cat_hidden = get_pref($this->link, "_COLLAPSED_LABELS"); - $cat = $this->feedlist_init_cat(-2, $cat_hidden); - } else { - $cat['items'] = array(); - } - - while ($line = db_fetch_assoc($result)) { - - $label_id = -$line['id'] - 11; - $count = getFeedUnread($this->link, $label_id); - - $feed = $this->feedlist_init_feed($label_id, false, $count); - - $feed['fg_color'] = $line['fg_color']; - $feed['bg_color'] = $line['bg_color']; - - array_push($cat['items'], $feed); - } - - if ($enable_cats) { - array_push($feedlist['items'], $cat); - } else { - $feedlist['items'] = array_merge($feedlist['items'], $cat['items']); - } - } - } - - $this->feedlist_process_category('root', &$feedlist); - -/* if (get_pref($this->link, 'ENABLE_FEED_CATS')) { - if (get_pref($this->link, "FEEDS_SORT_BY_UNREAD")) { - $order_by_qpart = "order_id,category,unread DESC,title"; - } else { - $order_by_qpart = "order_id,category,title"; - } - } else { - if (get_pref($this->link, "FEEDS_SORT_BY_UNREAD")) { - $order_by_qpart = "unread DESC,title"; - } else { - $order_by_qpart = "title"; - } - } */ - - /* real feeds */ - - /* if ($enable_cats) - $order_by_qpart = "ttrss_feed_categories.order_id,category, - ttrss_feeds.order_id,title"; - else - $order_by_qpart = "title"; - - $query = "SELECT ttrss_feeds.id, ttrss_feeds.title, - ".SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated_noms, - cat_id,last_error, - COALESCE(ttrss_feed_categories.title, '".__('Uncategorized')."') AS category, - ttrss_feed_categories.collapsed, - value AS unread - FROM ttrss_feeds LEFT JOIN ttrss_feed_categories - ON (ttrss_feed_categories.id = cat_id) - LEFT JOIN ttrss_counters_cache - ON - (ttrss_feeds.id = feed_id) - WHERE - ttrss_feeds.owner_uid = '$owner_uid' AND parent_cat IS NULL - ORDER BY $order_by_qpart"; - - $result = db_query($this->link, $query); - - $actid = $_REQUEST["actid"]; - - if (db_num_rows($result) > 0) { - - $category = ""; - - if (!$enable_cats) - $cat['items'] = array(); - else - $cat = false; - - while ($line = db_fetch_assoc($result)) { - - $feed = htmlspecialchars(trim($line["title"])); - - if (!$feed) $feed = "[Untitled]"; - - $feed_id = $line["id"]; - $unread = $line["unread"]; - - $cat_id = $line["cat_id"]; - $tmp_category = $line["category"]; - - if ($category != $tmp_category && $enable_cats) { - - $category = $tmp_category; - - $collapsed = sql_bool_to_bool($line["collapsed"]); - - // workaround for NULL category - if ($category == __("Uncategorized")) { - $collapsed = get_pref($this->link, "_COLLAPSED_UNCAT"); - } - - if ($cat) array_push($feedlist['items'], $cat); - - $cat = $this->feedlist_init_cat($cat_id, $collapsed); - } - - $updated = make_local_datetime($this->link, $line["updated_noms"], false); - - array_push($cat['items'], $this->feedlist_init_feed($feed_id, - $feed, $unread, $line['last_error'], $updated)); - } - - if ($enable_cats) { - array_push($feedlist['items'], $cat); - } else { - $feedlist['items'] = array_merge($feedlist['items'], $cat['items']); - } - - } */ - - return $feedlist; - } - - private function feedlist_process_category($cat_id, &$feedlist) { - $owner_uid = $_SESSION['uid']; - $enable_cats = get_pref($this->link, 'ENABLE_FEED_CATS'); - - if (get_pref($this->link, 'ENABLE_FEED_CATS')) { - if (get_pref($this->link, "FEEDS_SORT_BY_UNREAD")) { - $order_by_qpart = "order_id,category,unread DESC,title"; - } else { - $order_by_qpart = "order_id,category,title"; - } - } else { - if (get_pref($this->link, "FEEDS_SORT_BY_UNREAD")) { - $order_by_qpart = "unread DESC,title"; - } else { - $order_by_qpart = "title"; - } - } - - if ($enable_cats) - $order_by_qpart = "ttrss_feed_categories.order_id,category, - ttrss_feeds.order_id,title"; - else - $order_by_qpart = "title"; - - /* real feeds */ - - if ($enable_cats) - $order_by_qpart = "ttrss_feed_categories.order_id,category, - ttrss_feeds.order_id,title"; - else - $order_by_qpart = "title"; - - if (!$enable_cats) { - $parent_qpart = "true"; - } else if ($cat_id == 'root') { - $parent_qpart = 'parent_cat IS NULL'; - } else { - $parent_qpart = 'parent_cat = '.db_escape_string($cat_id); - } - - $query = "SELECT ttrss_feeds.id, ttrss_feeds.title, - ".SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated_noms, - cat_id,last_error, - COALESCE(ttrss_feed_categories.title, '".__('Uncategorized')."') AS category, - ttrss_feed_categories.collapsed, - value AS unread - FROM ttrss_feeds LEFT JOIN ttrss_feed_categories - ON (ttrss_feed_categories.id = cat_id) - LEFT JOIN ttrss_counters_cache - ON - (ttrss_feeds.id = feed_id) - WHERE - ttrss_feeds.owner_uid = '$owner_uid' AND $parent_qpart - ORDER BY $order_by_qpart"; - - $result = db_query($this->link, $query); - - $actid = $_REQUEST["actid"]; - - if (db_num_rows($result) > 0) { - - $category = ""; - - if (!$enable_cats) - $cat['items'] = array(); - else - $cat = false; - - while ($line = db_fetch_assoc($result)) { - - $feed = htmlspecialchars(trim($line["title"])); - - if (!$feed) $feed = "[Untitled]"; - - $feed_id = $line["id"]; - $unread = $line["unread"]; - - $cat_id = $line["cat_id"]; - $tmp_category = $line["category"]; - - if ($category != $tmp_category && $enable_cats) { - - $category = $tmp_category; - - $collapsed = sql_bool_to_bool($line["collapsed"]); - - // workaround for NULL category - if ($category == __("Uncategorized")) { - $collapsed = get_pref($this->link, "_COLLAPSED_UNCAT"); - } - - if ($cat) array_push($feedlist['items'], $cat); - - $cat = $this->feedlist_init_cat($cat_id, $collapsed); - - if ($cat_id) { - $cat_items = $this->feedlist_process_category($cat_id, &$feedlist); - if (count($cat_items) > 0) { - array_push($cat['items'], $cat_items); - } - } - } - - $updated = make_local_datetime($this->link, $line["updated_noms"], false); - - array_push($cat['items'], $this->feedlist_init_feed($feed_id, - $feed, $unread, $line['last_error'], $updated)); - } - - if ($enable_cats) { - array_push($feedlist['items'], $cat); - } else { - $feedlist['items'] = array_merge($feedlist['items'], $cat['items']); - } - - } - - } - - function catchupAll() { db_query($this->link, "UPDATE ttrss_user_entries SET last_read = NOW(),unread = false WHERE owner_uid = " . $_SESSION["uid"]); diff --git a/classes/pref_feeds.php b/classes/pref_feeds.php index ea061b6b2..a6760b9e1 100644 --- a/classes/pref_feeds.php +++ b/classes/pref_feeds.php @@ -36,18 +36,20 @@ class Pref_Feeds extends Protected_Handler { $items = array(); - $result = db_query($this->link, "SELECT id, title FROM ttrss_feed_categories + $result = db_query($this->link, "SELECT id, title, collapsed FROM ttrss_feed_categories WHERE owner_uid = " . $_SESSION["uid"] . " AND parent_cat = '$cat_id' ORDER BY order_id, title"); while ($line = db_fetch_assoc($result)) { $cat = array(); $cat['id'] = 'CAT:' . $line['id']; - $cat['bare_id'] = $feed_id; + $cat['bare_id'] = (int)$line['id']; $cat['name'] = $line['title']; $cat['items'] = array(); $cat['checkbox'] = false; + $cat['hidden'] = sql_bool_to_bool($line['collapsed']); $cat['type'] = 'category'; + $cat['unread'] = 0; $cat['items'] = $this->get_category_items($line['id']); @@ -67,9 +69,10 @@ class Pref_Feeds extends Protected_Handler { while ($feed_line = db_fetch_assoc($feed_result)) { $feed = array(); $feed['id'] = 'FEED:' . $feed_line['id']; - $feed['bare_id'] = $feed_line['id']; + $feed['bare_id'] = (int)$feed_line['id']; $feed['name'] = $feed_line['title']; $feed['checkbox'] = false; + $feed['unread'] = 0; $feed['error'] = $feed_line['last_error']; $feed['icon'] = getFeedIcon($feed_line['id']); $feed['param'] = make_local_datetime($this->link, @@ -93,20 +96,77 @@ class Pref_Feeds extends Protected_Handler { $root['items'] = array(); $root['type'] = 'category'; - if (get_pref($this->link, 'ENABLE_FEED_CATS')) { - $show_empty_cats = get_pref($this->link, '_PREFS_SHOW_EMPTY_CATS'); + $enable_cats = get_pref($this->link, 'ENABLE_FEED_CATS'); - $result = db_query($this->link, "SELECT id, title FROM ttrss_feed_categories + if ($_REQUEST['mode'] == 2) { + + if ($enable_cats) { + $cat_hidden = get_pref($this->link, "_COLLAPSED_SPECIAL"); + $cat = $this->feedlist_init_cat(-1, $cat_hidden); + } else { + $cat['items'] = array(); + } + + foreach (array(-4, -3, -1, -2, 0) as $i) { + array_push($cat['items'], $this->feedlist_init_feed($i)); + } + + if ($enable_cats) { + array_push($root['items'], $cat); + } else { + $root['items'] = array_merge($root['items'], $cat['items']); + } + + $result = db_query($this->link, "SELECT * FROM + ttrss_labels2 WHERE owner_uid = ".$_SESSION['uid']." ORDER by caption"); + + if (db_num_rows($result) > 0) { + + if (get_pref($this->link, 'ENABLE_FEED_CATS')) { + $cat_hidden = get_pref($this->link, "_COLLAPSED_LABELS"); + $cat = $this->feedlist_init_cat(-2, $cat_hidden); + } else { + $cat['items'] = array(); + } + + while ($line = db_fetch_assoc($result)) { + + $label_id = -$line['id'] - 11; + $count = getFeedUnread($this->link, $label_id); + + $feed = $this->feedlist_init_feed($label_id, false, $count); + + $feed['fg_color'] = $line['fg_color']; + $feed['bg_color'] = $line['bg_color']; + + array_push($cat['items'], $feed); + } + + if ($enable_cats) { + array_push($root['items'], $cat); + } else { + $root['items'] = array_merge($root['items'], $cat['items']); + } + } + } + + if ($enable_cats) { + $show_empty_cats = $_REQUEST['mode'] != 2 && + get_pref($this->link, '_PREFS_SHOW_EMPTY_CATS'); + + $result = db_query($this->link, "SELECT id, title, collapsed FROM ttrss_feed_categories WHERE owner_uid = " . $_SESSION["uid"] . " AND parent_cat IS NULL ORDER BY order_id, title"); while ($line = db_fetch_assoc($result)) { $cat = array(); $cat['id'] = 'CAT:' . $line['id']; - $cat['bare_id'] = $feed_id; + $cat['bare_id'] = (int)$line['id']; $cat['name'] = $line['title']; $cat['items'] = array(); $cat['checkbox'] = false; + $cat['hidden'] = sql_bool_to_bool($line['collapsed']); $cat['type'] = 'category'; + $cat['unread'] = 0; $cat['items'] = $this->get_category_items($line['id']); @@ -125,8 +185,10 @@ class Pref_Feeds extends Protected_Handler { $cat['bare_id'] = 0; $cat['name'] = __("Uncategorized"); $cat['items'] = array(); + $cat['hidden'] = get_pref($this->link, "_COLLAPSED_UNCAT"); $cat['type'] = 'category'; $cat['checkbox'] = false; + $cat['unread'] = 0; $feed_result = db_query($this->link, "SELECT id, title,last_error, ".SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated @@ -137,13 +199,15 @@ class Pref_Feeds extends Protected_Handler { while ($feed_line = db_fetch_assoc($feed_result)) { $feed = array(); $feed['id'] = 'FEED:' . $feed_line['id']; - $feed['bare_id'] = $feed_line['id']; + $feed['bare_id'] = (int)$feed_line['id']; $feed['name'] = $feed_line['title']; $feed['checkbox'] = false; $feed['error'] = $feed_line['last_error']; $feed['icon'] = getFeedIcon($feed_line['id']); $feed['param'] = make_local_datetime($this->link, $feed_line['last_updated'], true); + $feed['unread'] = 0; + $feed['type'] = 'feed'; array_push($cat['items'], $feed); } @@ -166,25 +230,31 @@ class Pref_Feeds extends Protected_Handler { while ($feed_line = db_fetch_assoc($feed_result)) { $feed = array(); $feed['id'] = 'FEED:' . $feed_line['id']; - $feed['bare_id'] = $feed_line['id']; + $feed['bare_id'] = (int)$feed_line['id']; $feed['name'] = $feed_line['title']; $feed['checkbox'] = false; $feed['error'] = $feed_line['last_error']; $feed['icon'] = getFeedIcon($feed_line['id']); $feed['param'] = make_local_datetime($this->link, $feed_line['last_updated'], true); + $feed['unread'] = 0; + $feed['type'] = 'feed'; array_push($root['items'], $feed); } $root['param'] = T_sprintf('(%d feeds)', count($root['items'])); - } $fl = array(); $fl['identifier'] = 'id'; $fl['label'] = 'name'; - $fl['items'] = array($root); + + if ($_REQUEST['mode'] != 2) { + $fl['items'] = array($root); + } else { + $fl['items'] =& $root['items']; + } print json_encode($fl); return; @@ -1686,5 +1756,49 @@ class Pref_Feeds extends Protected_Handler { print ""; #container } + + private function feedlist_init_cat($cat_id, $hidden = false) { + $obj = array(); + $cat_id = (int) $cat_id; + + if ($cat_id > 0) { + $cat_unread = ccache_find($this->link, $cat_id, $_SESSION["uid"], true); + } else if ($cat_id == 0 || $cat_id == -2) { + $cat_unread = getCategoryUnread($this->link, $cat_id); + } + + $obj['id'] = 'CAT:' . $cat_id; + $obj['items'] = array(); + $obj['name'] = getCategoryTitle($this->link, $cat_id); + $obj['type'] = 'category'; + $obj['unread'] = (int) $cat_unread; + $obj['hidden'] = $hidden; + $obj['bare_id'] = $cat_id; + + return $obj; + } + + private function feedlist_init_feed($feed_id, $title = false, $unread = false, $error = '', $updated = '') { + $obj = array(); + $feed_id = (int) $feed_id; + + if (!$title) + $title = getFeedTitle($this->link, $feed_id, false); + + if ($unread === false) + $unread = getFeedUnread($this->link, $feed_id, false); + + $obj['id'] = 'FEED:' . $feed_id; + $obj['name'] = $title; + $obj['unread'] = (int) $unread; + $obj['type'] = 'feed'; + $obj['error'] = $error; + $obj['updated'] = $updated; + $obj['icon'] = getFeedIcon($feed_id); + $obj['bare_id'] = $feed_id; + + return $obj; + } + } ?> diff --git a/index.php b/index.php index 53901ec6e..c17a10416 100644 --- a/index.php +++ b/index.php @@ -79,7 +79,11 @@ } foreach (array("tt-rss", "functions", "feedlist", "viewfeed", "FeedTree") as $js) { - echo JSMin::minify(file_get_contents("js/$js.js")); + if (!isset($_GET['debug'])) { + echo JSMin::minify(file_get_contents("js/$js.js")); + } else { + echo file_get_contents("js/$js.js"); + } } ?> diff --git a/js/tt-rss.js b/js/tt-rss.js index ef5d72e5b..a4c67bfcc 100644 --- a/js/tt-rss.js +++ b/js/tt-rss.js @@ -61,12 +61,12 @@ function updateFeedList() { } var store = new dojo.data.ItemFileWriteStore({ - url: "backend.php?op=feeds"}); + url: "backend.php?op=pref_feeds&method=getfeedtree&mode=2"}); var treeModel = new fox.FeedStoreModel({ store: store, query: { - "type": "feed" + "type": init_params['enable_feed_cats'] == 1 ? "category" : "feed" }, rootId: "root", rootLabel: "Feeds", @@ -105,6 +105,8 @@ function updateFeedList() { id: "feedTree", }, "feedTree"); + _force_scheduled_update = true; + /* var menu = new dijit.Menu({id: 'feedMenu'}); menu.addChild(new dijit.MenuItem({