diff options
| -rw-r--r-- | backend.php | 23 | ||||
| -rw-r--r-- | functions.php | 4 | ||||
| -rw-r--r-- | mobile/functions.php | 18 |
3 files changed, 12 insertions, 33 deletions
diff --git a/backend.php b/backend.php index 8928582b3..428939fe9 100644 --- a/backend.php +++ b/backend.php @@ -172,12 +172,7 @@ print "<li id=\"feedCatHolder\"><ul class=\"feedCatList\">"; } - $result = db_query($link, "SELECT count(id) as num_starred - FROM ttrss_entries,ttrss_user_entries - WHERE marked = true AND - ttrss_user_entries.ref_id = ttrss_entries.id AND - unread = true AND owner_uid = '$owner_uid'"); - $num_starred = db_fetch_result($result, 0, "num_starred"); + $num_starred = getFeedUnread($link, -1); $class = "virt"; @@ -207,16 +202,10 @@ while ($line = db_fetch_assoc($result)) { error_reporting (0); - - $tmp_result = db_query($link, "SELECT count(ttrss_entries.id) as count - FROM ttrss_entries,ttrss_user_entries,ttrss_feeds - WHERE (" . $line["sql_exp"] . ") AND unread = true AND - ttrss_user_entries.ref_id = ttrss_entries.id AND - ttrss_user_entries.feed_id = ttrss_feeds.id - AND ttrss_user_entries.owner_uid = '$owner_uid'"); - - $count = db_fetch_result($tmp_result, 0, "count"); - + + $label_id = -$line['id'] - 11; + $count = getFeedUnread($link, $label_id); + $class = "label"; if ($count > 0) { @@ -225,7 +214,7 @@ error_reporting (DEFAULT_ERROR_LEVEL); - printFeedEntry(-$line["id"]-11, + printFeedEntry($label_id, $class, db_unescape_string($line["description"]), $count, "images/label.png", $link); diff --git a/functions.php b/functions.php index 5a0e75c18..728d10f4e 100644 --- a/functions.php +++ b/functions.php @@ -1492,6 +1492,7 @@ } else if ($n_feed > 0) { $result = db_query($link, "SELECT id FROM ttrss_feeds WHERE parent_feed = '$n_feed' + AND hidden = false AND owner_uid = " . $_SESSION["uid"]); if (db_num_rows($result) > 0) { @@ -1504,7 +1505,7 @@ $match_part = implode(" OR ", $linked_feeds); $result = db_query($link, "SELECT COUNT(int_id) AS unread - FROM ttrss_user_entries + FROM ttrss_user_entries WHERE unread = true AND ($match_part) AND owner_uid = " . $_SESSION["uid"]); $unread = 0; @@ -1520,6 +1521,7 @@ $match_part = "feed_id = '$n_feed'"; } } else if ($feed < -10) { + $label_id = -$feed - 11; $result = db_query($link, "SELECT sql_exp FROM ttrss_labels WHERE diff --git a/mobile/functions.php b/mobile/functions.php index 29db101ca..d35e6e237 100644 --- a/mobile/functions.php +++ b/mobile/functions.php @@ -32,12 +32,7 @@ print "<li class=\"feedCatHolder\"><ul class=\"feedCatList\">"; } - $result = db_query($link, "SELECT count(id) as num_starred - FROM ttrss_entries,ttrss_user_entries - WHERE marked = true AND - ttrss_user_entries.ref_id = ttrss_entries.id AND - unread = true AND owner_uid = '$owner_uid'"); - $num_starred = db_fetch_result($result, 0, "num_starred"); + $num_starred = getFeedUnread($link, -1); $class = "virt"; @@ -52,7 +47,7 @@ if (GLOBAL_ENABLE_LABELS && get_pref($link, 'ENABLE_LABELS')) { - $result = db_query($link, "SELECT id,sql_exp,description FROM + $result = db_query($link, "SELECT id,description FROM ttrss_labels WHERE owner_uid = '$owner_uid' ORDER by description"); if (db_num_rows($result) > 0) { @@ -68,14 +63,7 @@ error_reporting (0); - $tmp_result = db_query($link, "SELECT count(ttrss_entries.id) as count - FROM ttrss_entries,ttrss_user_entries,ttrss_feeds - WHERE (" . $line["sql_exp"] . ") AND unread = true AND - ttrss_user_entries.ref_id = ttrss_entries.id AND - ttrss_user_entries.feed_id = ttrss_feeds.id - AND ttrss_user_entries.owner_uid = '$owner_uid'"); - - $count = db_fetch_result($tmp_result, 0, "count"); + $count = getFeedUnread($link, -$line["id"]-11); $class = "label"; |