properly calculate marked counters for feeds in nested categories

1 files changed, 24 insertions, 0 deletions

diff --git a/classes/feeds.php b/classes/feeds.php
index 8ef4f1f1c..77add790e 100755
--- a/classes/feeds.php
+++ b/classes/feeds.php
@@ -1290,6 +1290,30 @@ class Feeds extends Handler_Protected {
 		}
 	}
 
+	// only real cats
+	static function getCategoryMarked($cat, $owner_uid = false) {
+
+		if (!$owner_uid) $owner_uid = $_SESSION["uid"];
+
+		$pdo = Db::pdo();
+
+		if ($cat >= 0) {
+
+			$sth = $pdo->prepare("SELECT SUM(CASE WHEN marked THEN 1 ELSE 0 END) AS marked
+				FROM ttrss_user_entries
+				WHERE feed_id IN (SELECT id FROM ttrss_feeds
+                    WHERE (cat_id = :cat OR (:cat IS NULL AND cat_id IS NULL))
+					AND owner_uid = :uid)
+				AND owner_uid = :uid");
+			$sth->execute(["cat" => $cat ? $cat : null, "uid" => $owner_uid]);
+			$row = $sth->fetch();
+
+			return $row["marked"];
+		} else {
+			return 0;
+		}
+	}
+
 	static function getCategoryUnread($cat, $owner_uid = false) {
 
 		if (!$owner_uid) $owner_uid = $_SESSION["uid"];