From 2a060a94562a2e1678f15d69a7e71e376325e9c1 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Mon, 13 Aug 2012 14:47:43 +0400 Subject: initial work on nested categories --- include/functions.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/functions.php b/include/functions.php index 4ba60e844..009955c99 100644 --- a/include/functions.php +++ b/include/functions.php @@ -1,6 +1,6 @@ Date: Mon, 13 Aug 2012 19:52:34 +0400 Subject: add special indication for categories having unread items in child categories --- classes/pref_feeds.php | 3 +++ include/functions.php | 28 +++++++++++++++++++++++++++- js/FeedTree.js | 27 +++++++++++++++++++++++++-- js/feedlist.js | 16 ++++++++++++++++ 4 files changed, 71 insertions(+), 3 deletions(-) (limited to 'include') diff --git a/classes/pref_feeds.php b/classes/pref_feeds.php index a6760b9e1..c87b0e549 100644 --- a/classes/pref_feeds.php +++ b/classes/pref_feeds.php @@ -50,6 +50,7 @@ class Pref_Feeds extends Protected_Handler { $cat['hidden'] = sql_bool_to_bool($line['collapsed']); $cat['type'] = 'category'; $cat['unread'] = 0; + $cat['child_unread'] = 0; $cat['items'] = $this->get_category_items($line['id']); @@ -167,6 +168,7 @@ class Pref_Feeds extends Protected_Handler { $cat['hidden'] = sql_bool_to_bool($line['collapsed']); $cat['type'] = 'category'; $cat['unread'] = 0; + $cat['child_unread'] = 0; $cat['items'] = $this->get_category_items($line['id']); @@ -189,6 +191,7 @@ class Pref_Feeds extends Protected_Handler { $cat['type'] = 'category'; $cat['checkbox'] = false; $cat['unread'] = 0; + $cat['child_unread'] = 0; $feed_result = db_query($this->link, "SELECT id, title,last_error, ".SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated diff --git a/include/functions.php b/include/functions.php index 009955c99..b2319e6e1 100644 --- a/include/functions.php +++ b/include/functions.php @@ -1501,7 +1501,9 @@ array_push($ret_arr, $cv); - $result = db_query($link, "SELECT id AS cat_id, value AS unread + $result = db_query($link, "SELECT id AS cat_id, value AS unread, + (SELECT COUNT(id) FROM ttrss_feed_categories AS c2 + WHERE c2.parent_cat = ttrss_feed_categories.id) AS num_children FROM ttrss_feed_categories, ttrss_cat_counters_cache WHERE ttrss_cat_counters_cache.feed_id = id AND ttrss_feed_categories.owner_uid = " . $_SESSION["uid"]); @@ -1509,7 +1511,14 @@ while ($line = db_fetch_assoc($result)) { $line["cat_id"] = (int) $line["cat_id"]; + if ($line["num_children"] > 0) { + $child_counter = getCategoryUnreadRecursive($link, $line["cat_id"], $_SESSION["uid"]); + } else { + $child_counter = 0; + } + $cv = array("id" => $line["cat_id"], "kind" => "cat", + "child_counter" => $child_counter, "counter" => $line["unread"]); array_push($ret_arr, $cv); @@ -1525,6 +1534,23 @@ return $ret_arr; } + // only accepts real cats (>= 0) + function getCategoryUnreadRecursive($link, $cat, $owner_uid = false) { + if (!$owner_uid) $owner_uid = $_SESSION["uid"]; + + $result = db_query($link, "SELECT id FROM ttrss_feed_categories WHERE parent_cat = '$cat' + AND owner_uid = $owner_uid"); + + $unread = 0; + + while ($line = db_fetch_assoc($result)) { + $unread += getCategoryUnread($link, $line["id"], $owner_uid); + $unread += getCategoryUnreadRecursive($link, $line["id"], $owner_uid); + } + + return $unread; + } + function getCategoryUnread($link, $cat, $owner_uid = false) { if (!$owner_uid) $owner_uid = $_SESSION["uid"]; diff --git a/js/FeedTree.js b/js/FeedTree.js index 30e625015..b39e72862 100644 --- a/js/FeedTree.js +++ b/js/FeedTree.js @@ -120,6 +120,14 @@ dojo.declare("fox.FeedTree", dijit.Tree, { dojo.place(span, tnode.iconNode, 'replace'); } + if (id.match("CAT:") && bare_id > 0) { + param = dojo.doc.createElement('span'); + param.className = 'feedParam'; + param.innerHTML = ""; + dojo.place(param, tnode.labelNode, 'after'); + tnode._paramNode = param; + } + if (id.match("FEED:") && bare_id > 0) { var menu = new dijit.Menu(); menu.row_id = bare_id; @@ -183,11 +191,15 @@ dojo.declare("fox.FeedTree", dijit.Tree, { name = name.replace(/</g, "<"); name = name.replace(/>/g, ">"); + var label; + if (item.unread > 0) { - return name + " (" + item.unread + ")"; + label = name + " (" + item.unread + ")"; } else { - return name; + label = name; } + + return label; }, selectFeed: function(feed, is_cat) { if (is_cat) @@ -443,4 +455,15 @@ dojo.declare("fox.FeedTree", dijit.Tree, { return false; } }, + setCatParam: function(cat, value) { + var treeNode = this._itemNodesMap['CAT:' + cat]; + + if (treeNode && treeNode[0] && treeNode[0]._paramNode) { + if (value > 0) + treeNode[0]._paramNode.innerHTML = '+' + value; + else + treeNode[0]._paramNode.innerHTML = ""; + } + this.model.setFeedValue(cat, true, 'child_unread', value); + }, }); diff --git a/js/feedlist.js b/js/feedlist.js index 13cdc2694..18d4a9770 100644 --- a/js/feedlist.js +++ b/js/feedlist.js @@ -286,6 +286,7 @@ function parse_counters(elems, scheduled_call) { var error = elems[l].error; var has_img = elems[l].has_img; var updated = elems[l].updated; + var child_unread = parseInt(elems[l].child_counter); if (id == "global-unread") { global_unread = ctr; @@ -322,6 +323,8 @@ function parse_counters(elems, scheduled_call) { setFeedIcon(id, false, 'images/blank_icon.gif'); } } + } else { + setCatParam(id, child_unread); } } @@ -411,6 +414,19 @@ function setFeedValue(feed, is_cat, key, value) { } } +function setCatParam(cat, value) { + try { + var tree = dijit.byId("feedTree"); + + if (tree && tree.model) + return tree.setCatParam(cat, value); + + } catch (e) { + // + } +} + + function selectFeed(feed, is_cat) { try { var tree = dijit.byId("feedTree"); -- cgit v1.2.3-54-g00ecf From 6d8d00e8c0293dbc7c643df21fe56e7d2a601157 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Mon, 13 Aug 2012 20:53:45 +0400 Subject: allow queryFeedHeadlines() to show child category entries --- include/functions.php | 29 ++++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) (limited to 'include') diff --git a/include/functions.php b/include/functions.php index b2319e6e1..0e2424c58 100644 --- a/include/functions.php +++ b/include/functions.php @@ -2273,6 +2273,19 @@ return $search_query_part; } + function getChildCategories($link, $cat, $owner_uid) { + $rv = array(); + + $result = db_query($link, "SELECT id FROM ttrss_feed_categories + WHERE parent_cat = '$cat' AND owner_uid = $owner_uid"); + + while ($line = db_fetch_assoc($result)) { + array_push($rv, $line["id"]); + $rv = array_merge($rv, getChildCategories($link, $line["id"], $owner_uid)); + } + + return $rv; + } function queryFeedHeadlines($link, $feed, $limit, $view_mode, $cat_view, $search, $search_mode, $match_on, $override_order = false, $offset = 0, $owner_uid = 0, $filter = false, $since_id = 0) { @@ -2318,6 +2331,10 @@ $view_query_part = " "; } else if ($feed != -1) { $unread = getFeedUnread($link, $feed, $cat_view); + + if ($cat_view && $feed > 0) + $unread = getCategoryUnreadRecursive($link, $feed); + if ($unread > 0) { $view_query_part = " unread = true AND "; } @@ -2389,7 +2406,17 @@ if ($cat_view) { if ($feed > 0) { - $query_strategy_part = "cat_id = '$feed'"; + # sub-cats + $subcats = getChildCategories($link, $feed, $owner_uid); + + if (count($subcats) == 0) { + $query_strategy_part = "cat_id = '$feed'"; + } else { + array_push($subcats, $feed); + $query_strategy_part = "cat_id IN (". + implode(",", $subcats).")"; + } + } else { $query_strategy_part = "cat_id IS NULL"; } -- cgit v1.2.3-54-g00ecf From 99c9e91a51a99ab5d8b9ded85ab61ad82cb2a9e7 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Mon, 13 Aug 2012 21:02:52 +0400 Subject: fix queryFeedHeadlines, rename getCategoryUnreadRecursive --- include/functions.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'include') diff --git a/include/functions.php b/include/functions.php index 0e2424c58..1116e422c 100644 --- a/include/functions.php +++ b/include/functions.php @@ -1512,7 +1512,7 @@ $line["cat_id"] = (int) $line["cat_id"]; if ($line["num_children"] > 0) { - $child_counter = getCategoryUnreadRecursive($link, $line["cat_id"], $_SESSION["uid"]); + $child_counter = getCategoryChildrenUnread($link, $line["cat_id"], $_SESSION["uid"]); } else { $child_counter = 0; } @@ -1535,7 +1535,7 @@ } // only accepts real cats (>= 0) - function getCategoryUnreadRecursive($link, $cat, $owner_uid = false) { + function getCategoryChildrenUnread($link, $cat, $owner_uid = false) { if (!$owner_uid) $owner_uid = $_SESSION["uid"]; $result = db_query($link, "SELECT id FROM ttrss_feed_categories WHERE parent_cat = '$cat' @@ -1545,7 +1545,7 @@ while ($line = db_fetch_assoc($result)) { $unread += getCategoryUnread($link, $line["id"], $owner_uid); - $unread += getCategoryUnreadRecursive($link, $line["id"], $owner_uid); + $unread += getCategoryChildrenUnread($link, $line["id"], $owner_uid); } return $unread; @@ -2333,7 +2333,7 @@ $unread = getFeedUnread($link, $feed, $cat_view); if ($cat_view && $feed > 0) - $unread = getCategoryUnreadRecursive($link, $feed); + $unread += getCategoryChildrenUnread($link, $feed); if ($unread > 0) { $view_query_part = " unread = true AND "; -- cgit v1.2.3-54-g00ecf From 09101297ee0596a6c66d9c7388795e8602c24113 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Mon, 13 Aug 2012 21:25:46 +0400 Subject: add toolbar checkbox to include subcategories to viewfeed() --- classes/feeds.php | 10 ++++++---- include/functions.php | 24 ++++++++++++++---------- index.php | 8 ++++++++ js/tt-rss.js | 8 ++++++++ 4 files changed, 36 insertions(+), 14 deletions(-) (limited to 'include') diff --git a/classes/feeds.php b/classes/feeds.php index 4f0ac4f3f..502efd401 100644 --- a/classes/feeds.php +++ b/classes/feeds.php @@ -119,7 +119,7 @@ class Feeds extends Protected_Handler { private function format_headlines_list($feed, $method, $view_mode, $limit, $cat_view, $next_unread_feed, $offset, $vgr_last_feed = false, - $override_order = false) { + $override_order = false, $include_children = false) { $disable_cache = false; @@ -196,7 +196,8 @@ class Feeds extends Protected_Handler { } // 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); + $search, $search_mode, $match_on, $override_order, $offset, 0, + false, 0, $include_children); if ($_REQUEST["debug"]) $timing_info = print_checkpoint("H1", $timing_info); @@ -758,11 +759,12 @@ class Feeds extends Protected_Handler { $method = db_escape_string($_REQUEST["m"]); $view_mode = db_escape_string($_REQUEST["view_mode"]); $limit = (int) get_pref($this->link, "DEFAULT_ARTICLE_LIMIT"); - @$cat_view = db_escape_string($_REQUEST["cat"]) == "true"; + @$cat_view = $_REQUEST["cat"] == "true"; @$next_unread_feed = db_escape_string($_REQUEST["nuf"]); @$offset = db_escape_string($_REQUEST["skip"]); @$vgroup_last_feed = db_escape_string($_REQUEST["vgrlf"]); $order_by = db_escape_string($_REQUEST["order_by"]); + $include_children = $_REQUEST["include_children"] == "on"; if (is_numeric($feed)) $feed = (int) $feed; @@ -856,7 +858,7 @@ class Feeds extends Protected_Handler { $ret = $this->format_headlines_list($feed, $method, $view_mode, $limit, $cat_view, $next_unread_feed, $offset, - $vgroup_last_feed, $override_order); + $vgroup_last_feed, $override_order, $include_children); $topmost_article_ids = $ret[0]; $headlines_count = $ret[1]; diff --git a/include/functions.php b/include/functions.php index 1116e422c..3cb503fd8 100644 --- a/include/functions.php +++ b/include/functions.php @@ -2287,7 +2287,7 @@ return $rv; } - function queryFeedHeadlines($link, $feed, $limit, $view_mode, $cat_view, $search, $search_mode, $match_on, $override_order = false, $offset = 0, $owner_uid = 0, $filter = false, $since_id = 0) { + function queryFeedHeadlines($link, $feed, $limit, $view_mode, $cat_view, $search, $search_mode, $match_on, $override_order = false, $offset = 0, $owner_uid = 0, $filter = false, $since_id = 0, $include_children = false) { if (!$owner_uid) $owner_uid = $_SESSION["uid"]; @@ -2332,7 +2332,7 @@ } else if ($feed != -1) { $unread = getFeedUnread($link, $feed, $cat_view); - if ($cat_view && $feed > 0) + if ($cat_view && $feed > 0 && $include_children) $unread += getCategoryChildrenUnread($link, $feed); if ($unread > 0) { @@ -2406,15 +2406,19 @@ if ($cat_view) { if ($feed > 0) { - # sub-cats - $subcats = getChildCategories($link, $feed, $owner_uid); - - if (count($subcats) == 0) { - $query_strategy_part = "cat_id = '$feed'"; + if ($include_children) { + # sub-cats + $subcats = getChildCategories($link, $feed, $owner_uid); + + if (count($subcats) == 0) { + $query_strategy_part = "cat_id = '$feed'"; + } else { + array_push($subcats, $feed); + $query_strategy_part = "cat_id IN (". + implode(",", $subcats).")"; + } } else { - array_push($subcats, $feed); - $query_strategy_part = "cat_id IN (". - implode(",", $subcats).")"; + $query_strategy_part = "cat_id = '$feed'"; } } else { diff --git a/index.php b/index.php index c17a10416..96d13558d 100644 --- a/index.php +++ b/index.php @@ -183,6 +183,14 @@ +   + + + + diff --git a/js/tt-rss.js b/js/tt-rss.js index a4c67bfcc..11d5ef9c1 100644 --- a/js/tt-rss.js +++ b/js/tt-rss.js @@ -42,6 +42,14 @@ function setActiveFeedId(id, is_cat) { selectFeed(id, is_cat); + if (is_cat && id > 0) { + document.forms["main_toolbar_form"].include_children.disabled = false; + $("include_children_label").removeClassName("insensitive"); + } else { + document.forms["main_toolbar_form"].include_children.disabled = true; + $("include_children_label").addClassName("insensitive"); + } + } catch (e) { exception_error("setActiveFeedId", e); } -- cgit v1.2.3-54-g00ecf From 854a2ace869b29f805d203bb74968ef1500eb54b Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Mon, 13 Aug 2012 21:39:40 +0400 Subject: change include_children to a togglebutton; add placeholder setting save in a session --- classes/feeds.php | 4 +++- include/functions.php | 1 + index.php | 9 +++++++-- js/feedlist.js | 1 + js/tt-rss.js | 18 ++++++++++-------- 5 files changed, 22 insertions(+), 11 deletions(-) (limited to 'include') diff --git a/classes/feeds.php b/classes/feeds.php index 502efd401..be7886472 100644 --- a/classes/feeds.php +++ b/classes/feeds.php @@ -764,7 +764,7 @@ class Feeds extends Protected_Handler { @$offset = db_escape_string($_REQUEST["skip"]); @$vgroup_last_feed = db_escape_string($_REQUEST["vgrlf"]); $order_by = db_escape_string($_REQUEST["order_by"]); - $include_children = $_REQUEST["include_children"] == "on"; + $include_children = $_REQUEST["include_children"] == "true"; if (is_numeric($feed)) $feed = (int) $feed; @@ -806,6 +806,8 @@ class Feeds extends Protected_Handler { set_pref($this->link, "_DEFAULT_VIEW_LIMIT", $limit); set_pref($this->link, "_DEFAULT_VIEW_ORDER_BY", $order_by); + $_SESSION["_DEFAULT_INCLUDE_CHILDREN"] = $include_children; + if (!$cat_view && preg_match("/^[0-9][0-9]*$/", $feed)) { db_query($this->link, "UPDATE ttrss_feeds SET last_viewed = NOW() WHERE id = '$feed' AND owner_uid = ".$_SESSION["uid"]); diff --git a/include/functions.php b/include/functions.php index 3cb503fd8..cb24cb877 100644 --- a/include/functions.php +++ b/include/functions.php @@ -2137,6 +2137,7 @@ $params["icons_url"] = ICONS_URL; $params["cookie_lifetime"] = SESSION_COOKIE_LIFETIME; + $params["default_include_children"] = $_SESSION["_DEFAULT_INCLUDE_CHILDREN"]; $params["default_view_mode"] = get_pref($link, "_DEFAULT_VIEW_MODE"); $params["default_view_limit"] = (int) get_pref($link, "_DEFAULT_VIEW_LIMIT"); $params["default_view_order_by"] = get_pref($link, "_DEFAULT_VIEW_ORDER_BY"); diff --git a/index.php b/index.php index 96d13558d..3a68c90f6 100644 --- a/index.php +++ b/index.php @@ -185,11 +185,16 @@   - + --> + +