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

getFeedArticles/getFeedUnread: add support for tag feeds

This commit is contained in:
Andrew Dolgov 2009-12-29 22:57:52 +03:00
parent 87e3d2dd89
commit 326469fcb5
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
functions.php
View File

@ -2464,6 +2464,15 @@
if ($is_cat) { if ($is_cat) {
return getCategoryUnread($link, $n_feed, $owner_uid); return getCategoryUnread($link, $n_feed, $owner_uid);
} if ($feed != "0" && $n_feed == 0) {
$result = db_query($link, "SELECT SUM((SELECT COUNT(int_id)
FROM ttrss_user_entries,ttrss_entries WHERE int_id = post_int_id
AND ref_id = id AND $age_qpart
AND $unread_qpart)) AS count FROM ttrss_tags
WHERE owner_uid = $owner_uid AND tag_name = '$feed'");
return db_fetch_result($result, 0, "count");
} else if ($n_feed == -1) { } else if ($n_feed == -1) {
$match_part = "marked = true"; $match_part = "marked = true";
} else if ($n_feed == -2) { } else if ($n_feed == -2) {
@ -4472,13 +4481,8 @@
foreach (array_keys($tags) as $tag) { foreach (array_keys($tags) as $tag) {
$unread = $tags[$tag]; $unread = $tags[$tag];
$class = "tag"; $class = "tag";
if ($unread > 0) {
$class .= "Unread";
}
printFeedEntry($tag, $class, $tag, $unread, "images/tag.png", $link); printFeedEntry($tag, $class, $tag, $unread, "images/tag.png", $link);
} }

2
modules/popup-dialog.php
View File

@ -442,7 +442,7 @@
print "<div class=\"infoBoxContents\">"; print "<div class=\"infoBoxContents\">";
print __("Showing most popular tags ")." (<a print __("Showing most popular tags ")." (<a
href='javascript:toggleTags(true)'>".__('browse more')."</a>):<br/>"; href='javascript:toggleTags(true)'>".__('more tags')."</a>):<br/>";
print "<div class=\"tagCloudContainer\">"; print "<div class=\"tagCloudContainer\">";