public/tt-rss
1
0
Fork 0
mirror of https://git.tt-rss.org/git/tt-rss.git synced 2025-12-22 05:51:28 +00:00
Code Issues Releases Wiki Activity

labels: add auxcounters

Browse Source
This commit is contained in:
Andrew Dolgov
2013-05-24 10:57:47 +04:00
parent 1874c8d6df
commit d7b5a9e7f5
1 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
include/functions.php
View File

@@ -1493,11 +1493,13 @@
$owner_uid = $_SESSION["uid"]; $owner_uid = $_SESSION["uid"];
$result = db_query("SELECT id,caption,COUNT(unread) AS unread $result = db_query("SELECT id,caption,COUNT(u1.unread) AS unread,COUNT(u2.unread) AS total
FROM ttrss_labels2 LEFT JOIN ttrss_user_labels2 ON FROM ttrss_labels2 LEFT JOIN ttrss_user_labels2 ON
(ttrss_labels2.id = label_id) (ttrss_labels2.id = label_id)
LEFT JOIN ttrss_user_entries ON (ref_id = article_id AND unread = true LEFT JOIN ttrss_user_entries AS u1 ON (u1.ref_id = article_id AND u1.unread = true
AND ttrss_user_entries.owner_uid = $owner_uid) AND u1.owner_uid = $owner_uid)
LEFT JOIN ttrss_user_entries AS u2 ON (u2.ref_id = article_id AND u2.unread = false
AND u2.owner_uid = $owner_uid)
WHERE ttrss_labels2.owner_uid = $owner_uid GROUP BY ttrss_labels2.id, WHERE ttrss_labels2.owner_uid = $owner_uid GROUP BY ttrss_labels2.id,
ttrss_labels2.caption"); ttrss_labels2.caption");
@@ -1505,17 +1507,12 @@
$id = label_to_feed_id($line["id"]); $id = label_to_feed_id($line["id"]);
$label_name = $line["caption"];
$count = $line["unread"];
$cv = array("id" => $id, $cv = array("id" => $id,
"counter" => (int) $count); "counter" => (int) $line["unread"],
"auxcounter" => (int) $line["total"]);
if ($descriptions) if ($descriptions)
$cv["description"] = $label_name; $cv["description"] = $line["caption"];
// if (get_pref('EXTENDED_FEEDLIST'))
// $cv["xmsg"] = getFeedArticles($id)." ".__("total");
array_push($ret_arr, $cv); array_push($ret_arr, $cv);
} }