valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'nested-cats'

This commit is contained in:
Andrew Dolgov 2012-08-14 10:47:24 +04:00
parent f5fdc4f4f1 854a2ace86
commit 675b51e8ff
8 changed files with 390 additions and 275 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

240
classes/feeds.php
View File

@ -7,49 +7,6 @@ class Feeds extends Protected_Handler {
return array_search($method, $csrf_ignored) !== false; 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, private function format_headline_subtoolbar($feed_site_url, $feed_title,
$feed_id, $is_cat, $search, $match_on, $feed_id, $is_cat, $search, $match_on,
$search_mode, $view_mode, $error) { $search_mode, $view_mode, $error) {
@ -162,7 +119,7 @@ class Feeds extends Protected_Handler {
private function format_headlines_list($feed, $method, $view_mode, $limit, $cat_view, private function format_headlines_list($feed, $method, $view_mode, $limit, $cat_view,
$next_unread_feed, $offset, $vgr_last_feed = false, $next_unread_feed, $offset, $vgr_last_feed = false,
$override_order = false) { $override_order = false, $include_children = false) {
$disable_cache = false; $disable_cache = false;
@ -239,7 +196,8 @@ class Feeds extends Protected_Handler {
} }
// error_log("search_mode: " . $search_mode); // error_log("search_mode: " . $search_mode);
$qfh_ret = queryFeedHeadlines($this->link, $feed, $limit, $view_mode, $cat_view, $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); if ($_REQUEST["debug"]) $timing_info = print_checkpoint("H1", $timing_info);
@ -776,168 +734,6 @@ class Feeds extends Protected_Handler {
$vgroup_last_feed, $reply); $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']);
}
}
}
/* 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'
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;
}
function catchupAll() { function catchupAll() {
db_query($this->link, "UPDATE ttrss_user_entries SET db_query($this->link, "UPDATE ttrss_user_entries SET
last_read = NOW(),unread = false WHERE owner_uid = " . $_SESSION["uid"]); last_read = NOW(),unread = false WHERE owner_uid = " . $_SESSION["uid"]);
@ -950,29 +746,6 @@ class Feeds extends Protected_Handler {
toggle_collapse_cat($this->link, $cat_id, $mode); toggle_collapse_cat($this->link, $cat_id, $mode);
} }
function index() {
$root = (bool)$_REQUEST["root"];
if (!$root) {
print json_encode($this->outputFeedList($this->link));
} else {
$feeds = $this->outputFeedList($this->link, false);
$root = array();
$root['id'] = 'root';
$root['name'] = __('Feeds');
$root['items'] = $feeds['items'];
$fl = array();
$fl['identifier'] = 'id';
$fl['label'] = 'name';
$fl['items'] = array($root);
print json_encode($fl);
}
}
function view() { function view() {
$timing_info = getmicrotime(); $timing_info = getmicrotime();
@ -986,11 +759,12 @@ class Feeds extends Protected_Handler {
$method = db_escape_string($_REQUEST["m"]); $method = db_escape_string($_REQUEST["m"]);
$view_mode = db_escape_string($_REQUEST["view_mode"]); $view_mode = db_escape_string($_REQUEST["view_mode"]);
$limit = (int) get_pref($this->link, "DEFAULT_ARTICLE_LIMIT"); $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"]); @$next_unread_feed = db_escape_string($_REQUEST["nuf"]);
@$offset = db_escape_string($_REQUEST["skip"]); @$offset = db_escape_string($_REQUEST["skip"]);
@$vgroup_last_feed = db_escape_string($_REQUEST["vgrlf"]); @$vgroup_last_feed = db_escape_string($_REQUEST["vgrlf"]);
$order_by = db_escape_string($_REQUEST["order_by"]); $order_by = db_escape_string($_REQUEST["order_by"]);
$include_children = $_REQUEST["include_children"] == "true";
if (is_numeric($feed)) $feed = (int) $feed; if (is_numeric($feed)) $feed = (int) $feed;
@ -1032,6 +806,8 @@ class Feeds extends Protected_Handler {
set_pref($this->link, "_DEFAULT_VIEW_LIMIT", $limit); set_pref($this->link, "_DEFAULT_VIEW_LIMIT", $limit);
set_pref($this->link, "_DEFAULT_VIEW_ORDER_BY", $order_by); 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)) { if (!$cat_view && preg_match("/^[0-9][0-9]*$/", $feed)) {
db_query($this->link, "UPDATE ttrss_feeds SET last_viewed = NOW() db_query($this->link, "UPDATE ttrss_feeds SET last_viewed = NOW()
WHERE id = '$feed' AND owner_uid = ".$_SESSION["uid"]); WHERE id = '$feed' AND owner_uid = ".$_SESSION["uid"]);
@ -1084,7 +860,7 @@ class Feeds extends Protected_Handler {
$ret = $this->format_headlines_list($feed, $method, $ret = $this->format_headlines_list($feed, $method,
$view_mode, $limit, $cat_view, $next_unread_feed, $offset, $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]; $topmost_article_ids = $ret[0];
$headlines_count = $ret[1]; $headlines_count = $ret[1];

274
classes/pref_feeds.php
View File

@ -32,6 +32,59 @@ class Pref_Feeds extends Protected_Handler {
return; return;
} }
private function get_category_items($cat_id) {
$items = array();
$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'] = (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['child_unread'] = 0;
$cat['items'] = $this->get_category_items($line['id']);
$cat['param'] = T_sprintf('(%d feeds)', count($cat['items']));
if (count($cat['items']) > 0 || $show_empty_cats)
array_push($items, $cat);
}
$feed_result = db_query($this->link, "SELECT id, title, last_error,
".SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated
FROM ttrss_feeds
WHERE cat_id = '$cat_id' AND owner_uid = ".$_SESSION["uid"].
"$search_qpart ORDER BY order_id, title");
while ($feed_line = db_fetch_assoc($feed_result)) {
$feed = array();
$feed['id'] = 'FEED:' . $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,
$feed_line['last_updated'], true);
array_push($items, $feed);
}
return $items;
}
function getfeedtree() { function getfeedtree() {
$search = $_SESSION["prefs_feed_search"]; $search = $_SESSION["prefs_feed_search"];
@ -44,40 +97,80 @@ class Pref_Feeds extends Protected_Handler {
$root['items'] = array(); $root['items'] = array();
$root['type'] = 'category'; $root['type'] = 'category';
if (get_pref($this->link, 'ENABLE_FEED_CATS')) { $enable_cats = get_pref($this->link, 'ENABLE_FEED_CATS');
$show_empty_cats = get_pref($this->link, '_PREFS_SHOW_EMPTY_CATS');
$result = db_query($this->link, "SELECT id, title FROM ttrss_feed_categories if ($_REQUEST['mode'] == 2) {
WHERE owner_uid = " . $_SESSION["uid"] . " ORDER BY order_id, title");
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)) { while ($line = db_fetch_assoc($result)) {
$cat = array(); $cat = array();
$cat['id'] = 'CAT:' . $line['id']; $cat['id'] = 'CAT:' . $line['id'];
$cat['bare_id'] = $feed_id; $cat['bare_id'] = (int)$line['id'];
$cat['name'] = $line['title']; $cat['name'] = $line['title'];
$cat['items'] = array(); $cat['items'] = array();
$cat['checkbox'] = false; $cat['checkbox'] = false;
$cat['hidden'] = sql_bool_to_bool($line['collapsed']);
$cat['type'] = 'category'; $cat['type'] = 'category';
$cat['unread'] = 0;
$cat['child_unread'] = 0;
$feed_result = db_query($this->link, "SELECT id, title, last_error, $cat['items'] = $this->get_category_items($line['id']);
".SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated
FROM ttrss_feeds
WHERE cat_id = '".$line['id']."' AND owner_uid = ".$_SESSION["uid"].
"$search_qpart ORDER BY order_id, title");
while ($feed_line = db_fetch_assoc($feed_result)) {
$feed = array();
$feed['id'] = 'FEED:' . $feed_line['id'];
$feed['bare_id'] = $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);
array_push($cat['items'], $feed);
}
$cat['param'] = T_sprintf('(%d feeds)', count($cat['items'])); $cat['param'] = T_sprintf('(%d feeds)', count($cat['items']));
@ -94,8 +187,11 @@ class Pref_Feeds extends Protected_Handler {
$cat['bare_id'] = 0; $cat['bare_id'] = 0;
$cat['name'] = __("Uncategorized"); $cat['name'] = __("Uncategorized");
$cat['items'] = array(); $cat['items'] = array();
$cat['hidden'] = get_pref($this->link, "_COLLAPSED_UNCAT");
$cat['type'] = 'category'; $cat['type'] = 'category';
$cat['checkbox'] = false; $cat['checkbox'] = false;
$cat['unread'] = 0;
$cat['child_unread'] = 0;
$feed_result = db_query($this->link, "SELECT id, title,last_error, $feed_result = db_query($this->link, "SELECT id, title,last_error,
".SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated ".SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated
@ -106,13 +202,15 @@ class Pref_Feeds extends Protected_Handler {
while ($feed_line = db_fetch_assoc($feed_result)) { while ($feed_line = db_fetch_assoc($feed_result)) {
$feed = array(); $feed = array();
$feed['id'] = 'FEED:' . $feed_line['id']; $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['name'] = $feed_line['title'];
$feed['checkbox'] = false; $feed['checkbox'] = false;
$feed['error'] = $feed_line['last_error']; $feed['error'] = $feed_line['last_error'];
$feed['icon'] = getFeedIcon($feed_line['id']); $feed['icon'] = getFeedIcon($feed_line['id']);
$feed['param'] = make_local_datetime($this->link, $feed['param'] = make_local_datetime($this->link,
$feed_line['last_updated'], true); $feed_line['last_updated'], true);
$feed['unread'] = 0;
$feed['type'] = 'feed';
array_push($cat['items'], $feed); array_push($cat['items'], $feed);
} }
@ -135,25 +233,31 @@ class Pref_Feeds extends Protected_Handler {
while ($feed_line = db_fetch_assoc($feed_result)) { while ($feed_line = db_fetch_assoc($feed_result)) {
$feed = array(); $feed = array();
$feed['id'] = 'FEED:' . $feed_line['id']; $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['name'] = $feed_line['title'];
$feed['checkbox'] = false; $feed['checkbox'] = false;
$feed['error'] = $feed_line['last_error']; $feed['error'] = $feed_line['last_error'];
$feed['icon'] = getFeedIcon($feed_line['id']); $feed['icon'] = getFeedIcon($feed_line['id']);
$feed['param'] = make_local_datetime($this->link, $feed['param'] = make_local_datetime($this->link,
$feed_line['last_updated'], true); $feed_line['last_updated'], true);
$feed['unread'] = 0;
$feed['type'] = 'feed';
array_push($root['items'], $feed); array_push($root['items'], $feed);
} }
$root['param'] = T_sprintf('(%d feeds)', count($root['items'])); $root['param'] = T_sprintf('(%d feeds)', count($root['items']));
} }
$fl = array(); $fl = array();
$fl['identifier'] = 'id'; $fl['identifier'] = 'id';
$fl['label'] = 'name'; $fl['label'] = 'name';
$fl['items'] = array($root);
if ($_REQUEST['mode'] != 2) {
$fl['items'] = array($root);
} else {
$fl['items'] =& $root['items'];
}
print json_encode($fl); print json_encode($fl);
return; return;
@ -176,17 +280,77 @@ class Pref_Feeds extends Protected_Handler {
(get_pref($this->link, '_PREFS_SHOW_EMPTY_CATS') ? 'false' : 'true')); (get_pref($this->link, '_PREFS_SHOW_EMPTY_CATS') ? 'false' : 'true'));
} }
private function process_category_order($data_map, $item_id, $parent_id = false) {
# print "C: $item_id P: $parent_id\n";
$bare_id = substr($item_id, strpos($item_id, ':')+1);
if ($item_id != 'root') {
if ($parent_id && $parent_id != 'root') {
$parent_bare_id = substr($parent_id, strpos($parent_id, ':')+1);
$parent_qpart = db_escape_string($parent_bare_id);
} else {
$parent_qpart = 'NULL';
}
db_query($this->link, "UPDATE ttrss_feed_categories
SET parent_cat = $parent_qpart WHERE id = '$bare_id' AND
owner_uid = " . $_SESSION["uid"]);
}
$order_id = 0;
$cat = $data_map[$item_id];
if ($cat && is_array($cat)) {
foreach ($cat as $item) {
$id = $item['_reference'];
$bare_id = substr($id, strpos($id, ':')+1);
# print "[$order_id] $id/$bare_id\n";
if ($item['_reference']) {
if (strpos($id, "FEED") === 0) {
db_query($this->link, "UPDATE ttrss_feeds
SET order_id = '$order_id' WHERE id = '$bare_id' AND
owner_uid = " . $_SESSION["uid"]);
} else if (strpos($id, "CAT:") === 0) {
$this->process_category_order(&$data_map, $item['_reference'], $item_id);
if ($item_id != 'root') {
$parent_qpart = db_escape_string($bare_id);
} else {
$parent_qpart = 'NULL';
}
db_query($this->link, "UPDATE ttrss_feed_categories
SET order_id = '$order_id' WHERE id = '$bare_id' AND
owner_uid = " . $_SESSION["uid"]);
}
}
++$order_id;
}
}
}
function savefeedorder() { function savefeedorder() {
$data = json_decode($_POST['payload'], true); $data = json_decode($_POST['payload'], true);
#file_put_contents("/tmp/saveorder.json", $_POST['payload']);
#$data = json_decode(file_get_contents("/tmp/saveorder.json"), true);
if (is_array($data) && is_array($data['items'])) { if (is_array($data) && is_array($data['items'])) {
$cat_order_id = 0; $cat_order_id = 0;
$data_map = array(); $data_map = array();
$root_item = false;
foreach ($data['items'] as $item) { foreach ($data['items'] as $item) {
if ($item['id'] != 'root') { # if ($item['id'] != 'root') {
if (is_array($item['items'])) { if (is_array($item['items'])) {
if (isset($item['items']['_reference'])) { if (isset($item['items']['_reference'])) {
$data_map[$item['id']] = array($item['items']); $data_map[$item['id']] = array($item['items']);
@ -194,10 +358,14 @@ class Pref_Feeds extends Protected_Handler {
$data_map[$item['id']] =& $item['items']; $data_map[$item['id']] =& $item['items'];
} }
} }
if ($item['id'] == 'root') {
$root_item = $item['id'];
} }
} }
foreach ($data['items'][0]['items'] as $item) { $this->process_category_order(&$data_map, $root_item);
/* foreach ($data['items'][0]['items'] as $item) {
$id = $item['_reference']; $id = $item['_reference'];
$bare_id = substr($id, strpos($id, ':')+1); $bare_id = substr($id, strpos($id, ':')+1);
@ -230,7 +398,7 @@ class Pref_Feeds extends Protected_Handler {
++$feed_order_id; ++$feed_order_id;
} }
} }
} } */
} }
return; return;
@ -1591,5 +1759,49 @@ class Pref_Feeds extends Protected_Handler {
print "</div>"; #container print "</div>"; #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;
}
} }
?> ?>

64
include/functions.php
View File

@ -1501,7 +1501,9 @@
array_push($ret_arr, $cv); 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 FROM ttrss_feed_categories, ttrss_cat_counters_cache
WHERE ttrss_cat_counters_cache.feed_id = id AND WHERE ttrss_cat_counters_cache.feed_id = id AND
ttrss_feed_categories.owner_uid = " . $_SESSION["uid"]); ttrss_feed_categories.owner_uid = " . $_SESSION["uid"]);
@ -1509,7 +1511,14 @@
while ($line = db_fetch_assoc($result)) { while ($line = db_fetch_assoc($result)) {
$line["cat_id"] = (int) $line["cat_id"]; $line["cat_id"] = (int) $line["cat_id"];
if ($line["num_children"] > 0) {
$child_counter = getCategoryChildrenUnread($link, $line["cat_id"], $_SESSION["uid"]);
} else {
$child_counter = 0;
}
$cv = array("id" => $line["cat_id"], "kind" => "cat", $cv = array("id" => $line["cat_id"], "kind" => "cat",
"child_counter" => $child_counter,
"counter" => $line["unread"]); "counter" => $line["unread"]);
array_push($ret_arr, $cv); array_push($ret_arr, $cv);
@ -1525,6 +1534,23 @@
return $ret_arr; return $ret_arr;
} }
// only accepts real cats (>= 0)
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'
AND owner_uid = $owner_uid");
$unread = 0;
while ($line = db_fetch_assoc($result)) {
$unread += getCategoryUnread($link, $line["id"], $owner_uid);
$unread += getCategoryChildrenUnread($link, $line["id"], $owner_uid);
}
return $unread;
}
function getCategoryUnread($link, $cat, $owner_uid = false) { function getCategoryUnread($link, $cat, $owner_uid = false) {
if (!$owner_uid) $owner_uid = $_SESSION["uid"]; if (!$owner_uid) $owner_uid = $_SESSION["uid"];
@ -2111,6 +2137,7 @@
$params["icons_url"] = ICONS_URL; $params["icons_url"] = ICONS_URL;
$params["cookie_lifetime"] = SESSION_COOKIE_LIFETIME; $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_mode"] = get_pref($link, "_DEFAULT_VIEW_MODE");
$params["default_view_limit"] = (int) get_pref($link, "_DEFAULT_VIEW_LIMIT"); $params["default_view_limit"] = (int) get_pref($link, "_DEFAULT_VIEW_LIMIT");
$params["default_view_order_by"] = get_pref($link, "_DEFAULT_VIEW_ORDER_BY"); $params["default_view_order_by"] = get_pref($link, "_DEFAULT_VIEW_ORDER_BY");
@ -2247,8 +2274,21 @@
return $search_query_part; return $search_query_part;
} }
function getChildCategories($link, $cat, $owner_uid) {
$rv = array();
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) { $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, $include_children = false) {
if (!$owner_uid) $owner_uid = $_SESSION["uid"]; if (!$owner_uid) $owner_uid = $_SESSION["uid"];
@ -2292,6 +2332,10 @@
$view_query_part = " "; $view_query_part = " ";
} else if ($feed != -1) { } else if ($feed != -1) {
$unread = getFeedUnread($link, $feed, $cat_view); $unread = getFeedUnread($link, $feed, $cat_view);
if ($cat_view && $feed > 0 && $include_children)
$unread += getCategoryChildrenUnread($link, $feed);
if ($unread > 0) { if ($unread > 0) {
$view_query_part = " unread = true AND "; $view_query_part = " unread = true AND ";
} }
@ -2363,7 +2407,21 @@
if ($cat_view) { if ($cat_view) {
if ($feed > 0) { if ($feed > 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 {
$query_strategy_part = "cat_id = '$feed'";
}
} else { } else {
$query_strategy_part = "cat_id IS NULL"; $query_strategy_part = "cat_id IS NULL";
} }

19
index.php
View File

@ -79,7 +79,11 @@
} }
foreach (array("tt-rss", "functions", "feedlist", "viewfeed", "FeedTree") as $js) { 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");
}
} }
?> ?>
</script> </script>
@ -179,6 +183,19 @@
<option value="score"><?php echo __('Score') ?></option> <option value="score"><?php echo __('Score') ?></option>
</select> </select>
&nbsp;
<!-- <input dojoType="dijit.form.CheckBox" type="checkbox"
onchange="viewCurrentFeed()"
name="include_children" id="include_children">
<label id="include_children_label" for="include_children">
<?php echo __('With subcategories') ?></label> -->
<button dojoType="dijit.form.ToggleButton" name="include_children"
id="include_children"
onchange="viewCurrentFeed()">
<?php echo __('With subcategories') ?></button>
<button dojoType="dijit.form.Button" name="update" <button dojoType="dijit.form.Button" name="update"
onclick="scheduleFeedUpdate()"> onclick="scheduleFeedUpdate()">
<?php echo __('Update') ?></button> <?php echo __('Update') ?></button>

27
js/FeedTree.js
View File

@ -120,6 +120,14 @@ dojo.declare("fox.FeedTree", dijit.Tree, {
dojo.place(span, tnode.iconNode, 'replace'); 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) { if (id.match("FEED:") && bare_id > 0) {
var menu = new dijit.Menu(); var menu = new dijit.Menu();
menu.row_id = bare_id; menu.row_id = bare_id;
@ -183,11 +191,15 @@ dojo.declare("fox.FeedTree", dijit.Tree, {
name = name.replace(/&lt;/g, "<"); name = name.replace(/&lt;/g, "<");
name = name.replace(/&gt;/g, ">"); name = name.replace(/&gt;/g, ">");
var label;
if (item.unread > 0) { if (item.unread > 0) {
return name + " (" + item.unread + ")"; label = name + " (" + item.unread + ")";
} else { } else {
return name; label = name;
} }
return label;
}, },
selectFeed: function(feed, is_cat) { selectFeed: function(feed, is_cat) {
if (is_cat) if (is_cat)
@ -443,4 +455,15 @@ dojo.declare("fox.FeedTree", dijit.Tree, {
return false; 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);
},
}); });

2
js/PrefFeedTree.js
View File

@ -71,7 +71,7 @@ dojo.declare("fox.PrefFeedTree", lib.CheckBoxTree, {
return ((id.match("CAT:") && position == "over") || return ((id.match("CAT:") && position == "over") ||
(id.match("FEED:") && position != "over")); (id.match("FEED:") && position != "over"));
} else if (source_id.match("CAT:")) { } else if (source_id.match("CAT:")) {
return ((id.match("CAT:") && position != "over") || return ((id.match("CAT:") && !id.match("CAT:0")) ||
(id.match("root") && position == "over")); (id.match("root") && position == "over"));
} }
}, },

17
js/feedlist.js
View File

@ -170,6 +170,7 @@ function viewfeed(feed, method, is_cat, offset, background, infscroll_req) {
} }
query += "&cat=" + is_cat; query += "&cat=" + is_cat;
query += "&include_children=" + dijit.byId("include_children").attr("checked");
console.log(query); console.log(query);
@ -286,6 +287,7 @@ function parse_counters(elems, scheduled_call) {
var error = elems[l].error; var error = elems[l].error;
var has_img = elems[l].has_img; var has_img = elems[l].has_img;
var updated = elems[l].updated; var updated = elems[l].updated;
var child_unread = parseInt(elems[l].child_counter);
if (id == "global-unread") { if (id == "global-unread") {
global_unread = ctr; global_unread = ctr;
@ -322,6 +324,8 @@ function parse_counters(elems, scheduled_call) {
setFeedIcon(id, false, 'images/blank_icon.gif'); setFeedIcon(id, false, 'images/blank_icon.gif');
} }
} }
} else {
setCatParam(id, child_unread);
} }
} }
@ -411,6 +415,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) { function selectFeed(feed, is_cat) {
try { try {
var tree = dijit.byId("feedTree"); var tree = dijit.byId("feedTree");

16
js/tt-rss.js
View File

@ -42,6 +42,9 @@ function setActiveFeedId(id, is_cat) {
selectFeed(id, is_cat); selectFeed(id, is_cat);
dijit.byId("include_children").attr("disabled", !(is_cat && id > 0));
} catch (e) { } catch (e) {
exception_error("setActiveFeedId", e); exception_error("setActiveFeedId", e);
} }
@ -61,12 +64,12 @@ function updateFeedList() {
} }
var store = new dojo.data.ItemFileWriteStore({ 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({ var treeModel = new fox.FeedStoreModel({
store: store, store: store,
query: { query: {
"type": "feed" "type": getInitParam('enable_feed_cats') == 1 ? "category" : "feed"
}, },
rootId: "root", rootId: "root",
rootLabel: "Feeds", rootLabel: "Feeds",
@ -105,6 +108,8 @@ function updateFeedList() {
id: "feedTree", id: "feedTree",
}, "feedTree"); }, "feedTree");
_force_scheduled_update = true;
/* var menu = new dijit.Menu({id: 'feedMenu'}); /* var menu = new dijit.Menu({id: 'feedMenu'});
menu.addChild(new dijit.MenuItem({ menu.addChild(new dijit.MenuItem({
@ -324,6 +329,13 @@ function init_second_stage() {
dijit.getEnclosingWidget(toolbar.order_by).attr('value', dijit.getEnclosingWidget(toolbar.order_by).attr('value',
getInitParam("default_view_order_by")); getInitParam("default_view_order_by"));
if (getInitParam("enable_feed_cats") == 0)
Element.hide(dijit.byId("include_children").domNode);
dijit.byId("include_children").attr("checked",
getInitParam("default_include_children"));
feeds_sort_by_unread = getInitParam("feeds_sort_by_unread") == 1; feeds_sort_by_unread = getInitParam("feeds_sort_by_unread") == 1;
loading_set_progress(30); loading_set_progress(30);