From 020f062a76746a313fae9c82fbcf9b37fcc9d459 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Mon, 15 Feb 2021 15:43:07 +0300
Subject: feeds: unify naming

---
 classes/counters.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'classes/counters.php')

diff --git a/classes/counters.php b/classes/counters.php
index 59605df18..29ced3d6c 100644
--- a/classes/counters.php
+++ b/classes/counters.php
@@ -25,8 +25,8 @@ class Counters {
 		while ($line = $sth->fetch()) {
 			list ($tmp_unread, $tmp_marked) = self::getCategoryChildrenCounters($line["id"], $owner_uid);
 
-			$unread += $tmp_unread + Feeds::getCategoryUnread($line["id"], $owner_uid);
-			$marked += $tmp_marked + Feeds::getCategoryMarked($line["id"], $owner_uid);
+			$unread += $tmp_unread + Feeds::_get_cat_unread($line["id"], $owner_uid);
+			$marked += $tmp_marked + Feeds::_get_cat_marked($line["id"], $owner_uid);
 		}
 
 		return [$unread, $marked];
@@ -38,7 +38,7 @@ class Counters {
 		/* Labels category */
 
 		$cv = array("id" => -2, "kind" => "cat",
-			"counter" => Feeds::getCategoryUnread(-2));
+			"counter" => Feeds::_get_cat_unread(-2));
 
 		array_push($ret, $cv);
 
@@ -114,8 +114,8 @@ class Counters {
 			$last_error = htmlspecialchars($line["last_error"]);
 			$last_updated = TimeHelper::make_local_datetime($line['last_updated'], false);
 
-			if (Feeds::feedHasIcon($id)) {
-				$has_img = filemtime(Feeds::getIconFile($id));
+			if (Feeds::_has_icon($id)) {
+				$has_img = filemtime(Feeds::_get_icon_file($id));
 			} else {
 				$has_img = false;
 			}
@@ -149,7 +149,7 @@ class Counters {
 		$ret = [];
 
 		if ($global_unread == -1) {
-			$global_unread = Feeds::getGlobalUnread();
+			$global_unread = Feeds::_get_global_unread();
 		}
 
 		$cv = [
@@ -187,7 +187,7 @@ class Counters {
 			$count = getFeedUnread($i);
 
 			if ($i == 0 || $i == -1 || $i == -2)
-				$auxctr = Feeds::getFeedArticles($i, false);
+				$auxctr = Feeds::_get_counters($i, false);
 			else
 				$auxctr = 0;
 
-- 
cgit v1.2.3


From 5704deb460f740ed56be5ae4dbddbf5296a9c603 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Mon, 15 Feb 2021 16:00:54 +0300
Subject: counters: unify naming

---
 classes/counters.php | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'classes/counters.php')

diff --git a/classes/counters.php b/classes/counters.php
index 29ced3d6c..e8c179a95 100644
--- a/classes/counters.php
+++ b/classes/counters.php
@@ -1,13 +1,13 @@
 <?php
 class Counters {
 
-	static function getAllCounters() {
-		$data = self::getGlobalCounters();
+	static function get_all() {
+		$data = self::get_global();
 
-		$data = array_merge($data, self::getVirtCounters());
-		$data = array_merge($data, self::getLabelCounters());
-		$data = array_merge($data, self::getFeedCounters());
-		$data = array_merge($data, self::getCategoryCounters());
+		$data = array_merge($data, self::get_virt(),
+			self::get_labels(),
+			self::get_feeds(),
+			self::get_cats());
 
 		return $data;
 	}
@@ -32,7 +32,7 @@ class Counters {
 		return [$unread, $marked];
 	}
 
-	static function getCategoryCounters() {
+	private static function get_cats() {
 		$ret = [];
 
 		/* Labels category */
@@ -90,7 +90,7 @@ class Counters {
 	}
 
 
-	static function getFeedCounters($active_feed = false) {
+	private static function get_feeds($active_feed = false) {
 
 		$ret = [];
 
@@ -145,7 +145,7 @@ class Counters {
 		return $ret;
 	}
 
-	static function getGlobalCounters($global_unread = -1) {
+	private static function get_global($global_unread = -1) {
 		$ret = [];
 
 		if ($global_unread == -1) {
@@ -178,7 +178,7 @@ class Counters {
 		return $ret;
 	}
 
-	static function getVirtCounters() {
+	private static function get_virt() {
 
 		$ret = [];
 
@@ -222,7 +222,7 @@ class Counters {
 		return $ret;
 	}
 
-	static function getLabelCounters($descriptions = false) {
+	static function get_labels($descriptions = false) {
 
 		$ret = [];
 
-- 
cgit v1.2.3


From 71f2f4288f33152653f759755f351a200506b80a Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Mon, 15 Feb 2021 16:14:48 +0300
Subject: counters: one more

---
 classes/counters.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'classes/counters.php')

diff --git a/classes/counters.php b/classes/counters.php
index e8c179a95..8392df32f 100644
--- a/classes/counters.php
+++ b/classes/counters.php
@@ -12,7 +12,7 @@ class Counters {
 		return $data;
 	}
 
-	static private function getCategoryChildrenCounters($cat_id, $owner_uid) {
+	static private function get_cat_children($cat_id, $owner_uid) {
 		$pdo = Db::pdo();
 
 		$sth = $pdo->prepare("SELECT id FROM ttrss_feed_categories WHERE parent_cat = ?
@@ -23,7 +23,7 @@ class Counters {
 		$marked = 0;
 
 		while ($line = $sth->fetch()) {
-			list ($tmp_unread, $tmp_marked) = self::getCategoryChildrenCounters($line["id"], $owner_uid);
+			list ($tmp_unread, $tmp_marked) = self::get_cat_children($line["id"], $owner_uid);
 
 			$unread += $tmp_unread + Feeds::_get_cat_unread($line["id"], $owner_uid);
 			$marked += $tmp_marked + Feeds::_get_cat_marked($line["id"], $owner_uid);
@@ -68,7 +68,7 @@ class Counters {
 
 		while ($line = $sth->fetch()) {
 			if ($line["num_children"] > 0) {
-				list ($child_counter, $child_marked_counter) = self::getCategoryChildrenCounters($line["id"], $_SESSION["uid"]);
+				list ($child_counter, $child_marked_counter) = self::get_cat_children($line["id"], $_SESSION["uid"]);
 			} else {
 				$child_counter = 0;
 				$child_marked_counter = 0;
-- 
cgit v1.2.3


From d4157b9e4e494e737038f6a00e921bc93b234780 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Mon, 15 Feb 2021 17:01:05 +0300
Subject: counters: just merge everything at once

---
 classes/counters.php | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'classes/counters.php')

diff --git a/classes/counters.php b/classes/counters.php
index 8392df32f..fb2553ec2 100644
--- a/classes/counters.php
+++ b/classes/counters.php
@@ -2,14 +2,13 @@
 class Counters {
 
 	static function get_all() {
-		$data = self::get_global();
-
-		$data = array_merge($data, self::get_virt(),
+		return array_merge(
+			self::get_global(),
+			self::get_virt(),
 			self::get_labels(),
 			self::get_feeds(),
-			self::get_cats());
-
-		return $data;
+			self::get_cats()
+		);
 	}
 
 	static private function get_cat_children($cat_id, $owner_uid) {
-- 
cgit v1.2.3


From d6203bf3508ba77e3943ddc412eb562edb327f22 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Wed, 24 Feb 2021 09:47:26 +0300
Subject: try to calculate counters conditionally based on feed ids

---
 classes/counters.php | 126 ++++++++++++++++++++++++++++++++++++---------------
 1 file changed, 89 insertions(+), 37 deletions(-)

(limited to 'classes/counters.php')

diff --git a/classes/counters.php b/classes/counters.php
index fb2553ec2..b4309cf7b 100644
--- a/classes/counters.php
+++ b/classes/counters.php
@@ -11,6 +11,15 @@ class Counters {
 		);
 	}
 
+	static function get_for_feeds($feed_ids) {
+		return array_merge(
+			self::get_global(),
+			self::get_virt(),
+			self::get_labels(),
+			self::get_feeds($feed_ids),
+			self::get_cats(Feeds::_cats_of($feed_ids, $_SESSION["uid"], true)));
+	}
+
 	static private function get_cat_children($cat_id, $owner_uid) {
 		$pdo = Db::pdo();
 
@@ -31,7 +40,7 @@ class Counters {
 		return [$unread, $marked];
 	}
 
-	private static function get_cats() {
+	private static function get_cats(array $cat_ids = []) {
 		$ret = [];
 
 		/* Labels category */
@@ -43,27 +52,57 @@ class Counters {
 
 		$pdo = Db::pdo();
 
-		$sth = $pdo->prepare("SELECT fc.id,
-				SUM(CASE WHEN unread THEN 1 ELSE 0 END) AS count,
-       			SUM(CASE WHEN marked THEN 1 ELSE 0 END) AS count_marked,
-       			(SELECT COUNT(id) FROM ttrss_feed_categories fcc
-       			WHERE fcc.parent_cat = fc.id) AS num_children
-			FROM ttrss_feed_categories fc
-    			LEFT JOIN ttrss_feeds f ON (f.cat_id = fc.id)
-    			LEFT JOIN ttrss_user_entries ue ON (ue.feed_id = f.id)
-			WHERE fc.owner_uid = :uid
-			GROUP BY fc.id
-		UNION
-			SELECT 0,
-				SUM(CASE WHEN unread THEN 1 ELSE 0 END) AS count,
-			   	SUM(CASE WHEN marked THEN 1 ELSE 0 END) AS count_marked,
-			   	0
-			FROM ttrss_feeds f, ttrss_user_entries ue
-			WHERE f.cat_id IS NULL AND
-			    ue.feed_id = f.id AND
-			    ue.owner_uid = :uid");
-
-		$sth->execute(["uid" => $_SESSION['uid']]);
+		if (count($cat_ids) == 0) {
+			$sth = $pdo->prepare("SELECT fc.id,
+					SUM(CASE WHEN unread THEN 1 ELSE 0 END) AS count,
+						SUM(CASE WHEN marked THEN 1 ELSE 0 END) AS count_marked,
+						(SELECT COUNT(id) FROM ttrss_feed_categories fcc
+						WHERE fcc.parent_cat = fc.id) AS num_children
+				FROM ttrss_feed_categories fc
+					LEFT JOIN ttrss_feeds f ON (f.cat_id = fc.id)
+					LEFT JOIN ttrss_user_entries ue ON (ue.feed_id = f.id)
+				WHERE fc.owner_uid = :uid
+				GROUP BY fc.id
+			UNION
+				SELECT 0,
+					SUM(CASE WHEN unread THEN 1 ELSE 0 END) AS count,
+						SUM(CASE WHEN marked THEN 1 ELSE 0 END) AS count_marked,
+						0
+				FROM ttrss_feeds f, ttrss_user_entries ue
+				WHERE f.cat_id IS NULL AND
+					ue.feed_id = f.id AND
+					ue.owner_uid = :uid");
+
+			$sth->execute(["uid" => $_SESSION['uid']]);
+		} else {
+			$cat_ids_qmarks = arr_qmarks($cat_ids);
+
+			$sth = $pdo->prepare("SELECT fc.id,
+					SUM(CASE WHEN unread THEN 1 ELSE 0 END) AS count,
+						SUM(CASE WHEN marked THEN 1 ELSE 0 END) AS count_marked,
+						(SELECT COUNT(id) FROM ttrss_feed_categories fcc
+						WHERE fcc.parent_cat = fc.id) AS num_children
+				FROM ttrss_feed_categories fc
+					LEFT JOIN ttrss_feeds f ON (f.cat_id = fc.id)
+					LEFT JOIN ttrss_user_entries ue ON (ue.feed_id = f.id)
+				WHERE fc.owner_uid = ? AND fc.id IN ($cat_ids_qmarks)
+				GROUP BY fc.id
+			UNION
+				SELECT 0,
+					SUM(CASE WHEN unread THEN 1 ELSE 0 END) AS count,
+						SUM(CASE WHEN marked THEN 1 ELSE 0 END) AS count_marked,
+						0
+				FROM ttrss_feeds f, ttrss_user_entries ue
+				WHERE f.cat_id IS NULL AND
+					ue.feed_id = f.id AND
+					ue.owner_uid = ?");
+
+			$sth->execute(array_merge(
+				[$_SESSION['uid']],
+				$cat_ids,
+				[$_SESSION['uid']]
+			));
+		}
 
 		while ($line = $sth->fetch()) {
 			if ($line["num_children"] > 0) {
@@ -83,29 +122,42 @@ class Counters {
 			array_push($ret, $cv);
 		}
 
-		array_push($ret, $cv);
-
 		return $ret;
 	}
 
-
-	private static function get_feeds($active_feed = false) {
+	private static function get_feeds(array $feed_ids = []) {
 
 		$ret = [];
 
 		$pdo = Db::pdo();
 
-		$sth = $pdo->prepare("SELECT f.id,
-				f.title,
-				".SUBSTRING_FOR_DATE."(f.last_updated,1,19) AS last_updated,
-				f.last_error,
-				SUM(CASE WHEN unread THEN 1 ELSE 0 END) AS count,
-				SUM(CASE WHEN marked THEN 1 ELSE 0 END) AS count_marked
-			FROM ttrss_feeds f, ttrss_user_entries ue
-			WHERE f.id = ue.feed_id AND ue.owner_uid = :uid
-			GROUP BY f.id");
-
-		$sth->execute(["uid" => $_SESSION['uid']]);
+		if (count($feed_ids) == 0) {
+			$sth = $pdo->prepare("SELECT f.id,
+					f.title,
+					".SUBSTRING_FOR_DATE."(f.last_updated,1,19) AS last_updated,
+					f.last_error,
+					SUM(CASE WHEN unread THEN 1 ELSE 0 END) AS count,
+					SUM(CASE WHEN marked THEN 1 ELSE 0 END) AS count_marked
+				FROM ttrss_feeds f, ttrss_user_entries ue
+				WHERE f.id = ue.feed_id AND ue.owner_uid = :uid
+				GROUP BY f.id");
+
+			$sth->execute(["uid" => $_SESSION['uid']]);
+		} else {
+			$feed_ids_qmarks = arr_qmarks($feed_ids);
+
+			$sth = $pdo->prepare("SELECT f.id,
+					f.title,
+					".SUBSTRING_FOR_DATE."(f.last_updated,1,19) AS last_updated,
+					f.last_error,
+					SUM(CASE WHEN unread THEN 1 ELSE 0 END) AS count,
+					SUM(CASE WHEN marked THEN 1 ELSE 0 END) AS count_marked
+				FROM ttrss_feeds f, ttrss_user_entries ue
+				WHERE f.id = ue.feed_id AND ue.owner_uid = ? AND f.id IN ($feed_ids_qmarks)
+				GROUP BY f.id");
+
+			$sth->execute(array_merge([$_SESSION['uid']], $feed_ids));
+		}
 
 		while ($line = $sth->fetch()) {
 
-- 
cgit v1.2.3


From 9313ebf2e745731263a8e24d19473adb70dfee47 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Wed, 24 Feb 2021 13:25:26 +0300
Subject: fix warning in counters::get_feeds()

---
 classes/counters.php | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to 'classes/counters.php')

diff --git a/classes/counters.php b/classes/counters.php
index b4309cf7b..1c75e009e 100644
--- a/classes/counters.php
+++ b/classes/counters.php
@@ -162,7 +162,6 @@ class Counters {
 		while ($line = $sth->fetch()) {
 
 			$id = $line["id"];
-			$last_error = htmlspecialchars($line["last_error"]);
 			$last_updated = TimeHelper::make_local_datetime($line['last_updated'], false);
 
 			if (Feeds::_has_icon($id)) {
@@ -183,11 +182,8 @@ class Counters {
 				"has_img" => (int) $has_img
 			];
 
-			if ($last_error)
-				$cv["error"] = $last_error;
-
-			if ($active_feed && $id == $active_feed)
-				$cv["title"] = truncate_string($line["title"], 30);
+			$cv["error"] = $line["last_error"];
+			$cv["title"] = truncate_string($line["title"], 30);
 
 			array_push($ret, $cv);
 
-- 
cgit v1.2.3


From 553548b6897f8ef292ab56af9dcc196ef8ee0cb3 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Wed, 24 Feb 2021 15:07:31 +0300
Subject: request label counters conditionally

---
 classes/counters.php | 107 +++++++++++++++++++++++++++++++--------------------
 1 file changed, 66 insertions(+), 41 deletions(-)

(limited to 'classes/counters.php')

diff --git a/classes/counters.php b/classes/counters.php
index 1c75e009e..b4602825c 100644
--- a/classes/counters.php
+++ b/classes/counters.php
@@ -11,13 +11,14 @@ class Counters {
 		);
 	}
 
-	static function get_for_feeds($feed_ids) {
+	static function get_conditional(array $feed_ids = null, array $label_ids = null) {
 		return array_merge(
 			self::get_global(),
 			self::get_virt(),
-			self::get_labels(),
+			self::get_labels($label_ids),
 			self::get_feeds($feed_ids),
-			self::get_cats(Feeds::_cats_of($feed_ids, $_SESSION["uid"], true)));
+			self::get_cats(is_array($feed_ids) ? Feeds::_cats_of($feed_ids, $_SESSION["uid"], true) : null)
+		);
 	}
 
 	static private function get_cat_children($cat_id, $owner_uid) {
@@ -40,7 +41,7 @@ class Counters {
 		return [$unread, $marked];
 	}
 
-	private static function get_cats(array $cat_ids = []) {
+	private static function get_cats(array $cat_ids = null) {
 		$ret = [];
 
 		/* Labels category */
@@ -52,7 +53,12 @@ class Counters {
 
 		$pdo = Db::pdo();
 
-		if (count($cat_ids) == 0) {
+		if (is_array($cat_ids)) {
+			if (count($cat_ids) == 0)
+				return [];
+
+			$cat_ids_qmarks = arr_qmarks($cat_ids);
+
 			$sth = $pdo->prepare("SELECT fc.id,
 					SUM(CASE WHEN unread THEN 1 ELSE 0 END) AS count,
 						SUM(CASE WHEN marked THEN 1 ELSE 0 END) AS count_marked,
@@ -61,7 +67,7 @@ class Counters {
 				FROM ttrss_feed_categories fc
 					LEFT JOIN ttrss_feeds f ON (f.cat_id = fc.id)
 					LEFT JOIN ttrss_user_entries ue ON (ue.feed_id = f.id)
-				WHERE fc.owner_uid = :uid
+				WHERE fc.owner_uid = ? AND fc.id IN ($cat_ids_qmarks)
 				GROUP BY fc.id
 			UNION
 				SELECT 0,
@@ -71,12 +77,15 @@ class Counters {
 				FROM ttrss_feeds f, ttrss_user_entries ue
 				WHERE f.cat_id IS NULL AND
 					ue.feed_id = f.id AND
-					ue.owner_uid = :uid");
+					ue.owner_uid = ?");
 
-			$sth->execute(["uid" => $_SESSION['uid']]);
-		} else {
-			$cat_ids_qmarks = arr_qmarks($cat_ids);
+			$sth->execute(array_merge(
+				[$_SESSION['uid']],
+				$cat_ids,
+				[$_SESSION['uid']]
+			));
 
+		} else {
 			$sth = $pdo->prepare("SELECT fc.id,
 					SUM(CASE WHEN unread THEN 1 ELSE 0 END) AS count,
 						SUM(CASE WHEN marked THEN 1 ELSE 0 END) AS count_marked,
@@ -85,7 +94,7 @@ class Counters {
 				FROM ttrss_feed_categories fc
 					LEFT JOIN ttrss_feeds f ON (f.cat_id = fc.id)
 					LEFT JOIN ttrss_user_entries ue ON (ue.feed_id = f.id)
-				WHERE fc.owner_uid = ? AND fc.id IN ($cat_ids_qmarks)
+				WHERE fc.owner_uid = :uid
 				GROUP BY fc.id
 			UNION
 				SELECT 0,
@@ -95,13 +104,9 @@ class Counters {
 				FROM ttrss_feeds f, ttrss_user_entries ue
 				WHERE f.cat_id IS NULL AND
 					ue.feed_id = f.id AND
-					ue.owner_uid = ?");
+					ue.owner_uid = :uid");
 
-			$sth->execute(array_merge(
-				[$_SESSION['uid']],
-				$cat_ids,
-				[$_SESSION['uid']]
-			));
+			$sth->execute(["uid" => $_SESSION['uid']]);
 		}
 
 		while ($line = $sth->fetch()) {
@@ -125,13 +130,18 @@ class Counters {
 		return $ret;
 	}
 
-	private static function get_feeds(array $feed_ids = []) {
+	private static function get_feeds(array $feed_ids = null) {
 
 		$ret = [];
 
 		$pdo = Db::pdo();
 
-		if (count($feed_ids) == 0) {
+		if (is_array($feed_ids)) {
+			if (count($feed_ids) == 0)
+				return [];
+
+			$feed_ids_qmarks = arr_qmarks($feed_ids);
+
 			$sth = $pdo->prepare("SELECT f.id,
 					f.title,
 					".SUBSTRING_FOR_DATE."(f.last_updated,1,19) AS last_updated,
@@ -139,13 +149,11 @@ class Counters {
 					SUM(CASE WHEN unread THEN 1 ELSE 0 END) AS count,
 					SUM(CASE WHEN marked THEN 1 ELSE 0 END) AS count_marked
 				FROM ttrss_feeds f, ttrss_user_entries ue
-				WHERE f.id = ue.feed_id AND ue.owner_uid = :uid
+				WHERE f.id = ue.feed_id AND ue.owner_uid = ? AND f.id IN ($feed_ids_qmarks)
 				GROUP BY f.id");
 
-			$sth->execute(["uid" => $_SESSION['uid']]);
+			$sth->execute(array_merge([$_SESSION['uid']], $feed_ids));
 		} else {
-			$feed_ids_qmarks = arr_qmarks($feed_ids);
-
 			$sth = $pdo->prepare("SELECT f.id,
 					f.title,
 					".SUBSTRING_FOR_DATE."(f.last_updated,1,19) AS last_updated,
@@ -153,10 +161,10 @@ class Counters {
 					SUM(CASE WHEN unread THEN 1 ELSE 0 END) AS count,
 					SUM(CASE WHEN marked THEN 1 ELSE 0 END) AS count_marked
 				FROM ttrss_feeds f, ttrss_user_entries ue
-				WHERE f.id = ue.feed_id AND ue.owner_uid = ? AND f.id IN ($feed_ids_qmarks)
+				WHERE f.id = ue.feed_id AND ue.owner_uid = :uid
 				GROUP BY f.id");
 
-			$sth->execute(array_merge([$_SESSION['uid']], $feed_ids));
+			$sth->execute(["uid" => $_SESSION['uid']]);
 		}
 
 		while ($line = $sth->fetch()) {
@@ -269,23 +277,42 @@ class Counters {
 		return $ret;
 	}
 
-	static function get_labels($descriptions = false) {
+	static function get_labels(array $label_ids = null) {
 
 		$ret = [];
 
 		$pdo = Db::pdo();
 
-		$sth = $pdo->prepare("SELECT id,
-       			caption,
-       			SUM(CASE WHEN u1.unread = true THEN 1 ELSE 0 END) AS count_unread,
-       			SUM(CASE WHEN u1.marked = true THEN 1 ELSE 0 END) AS count_marked,
-       			COUNT(u1.unread) AS total
-			FROM ttrss_labels2 LEFT JOIN ttrss_user_labels2 ON
-				(ttrss_labels2.id = label_id)
-					LEFT JOIN ttrss_user_entries AS u1 ON u1.ref_id = article_id AND u1.owner_uid = :uid
-						WHERE ttrss_labels2.owner_uid = :uid
-							GROUP BY ttrss_labels2.id, ttrss_labels2.caption");
-		$sth->execute([":uid" => $_SESSION['uid']]);
+		if (is_array($label_ids)) {
+			if (count($label_ids) == 0)
+				return [];
+
+			$label_ids_qmarks = arr_qmarks($label_ids);
+
+			$sth = $pdo->prepare("SELECT id,
+						caption,
+						SUM(CASE WHEN u1.unread = true THEN 1 ELSE 0 END) AS count_unread,
+						SUM(CASE WHEN u1.marked = true THEN 1 ELSE 0 END) AS count_marked,
+						COUNT(u1.unread) AS total
+				FROM ttrss_labels2 LEFT JOIN ttrss_user_labels2 ON
+					(ttrss_labels2.id = label_id)
+						LEFT JOIN ttrss_user_entries AS u1 ON u1.ref_id = article_id AND u1.owner_uid = ?
+							WHERE ttrss_labels2.owner_uid = ? AND ttrss_labels2.id IN ($label_ids_qmarks)
+								GROUP BY ttrss_labels2.id, ttrss_labels2.caption");
+			$sth->execute(array_merge([$_SESSION["uid"], $_SESSION["uid"]], $label_ids));
+		} else {
+			$sth = $pdo->prepare("SELECT id,
+						caption,
+						SUM(CASE WHEN u1.unread = true THEN 1 ELSE 0 END) AS count_unread,
+						SUM(CASE WHEN u1.marked = true THEN 1 ELSE 0 END) AS count_marked,
+						COUNT(u1.unread) AS total
+				FROM ttrss_labels2 LEFT JOIN ttrss_user_labels2 ON
+					(ttrss_labels2.id = label_id)
+						LEFT JOIN ttrss_user_entries AS u1 ON u1.ref_id = article_id AND u1.owner_uid = :uid
+							WHERE ttrss_labels2.owner_uid = :uid
+								GROUP BY ttrss_labels2.id, ttrss_labels2.caption");
+			$sth->execute([":uid" => $_SESSION['uid']]);
+		}
 
 		while ($line = $sth->fetch()) {
 
@@ -295,12 +322,10 @@ class Counters {
 				"id" => $id,
 				"counter" => (int) $line["count_unread"],
 				"auxcounter" => (int) $line["total"],
-				"markedcounter" => (int) $line["count_marked"]
+				"markedcounter" => (int) $line["count_marked"],
+				"description" => $line["caption"]
 			];
 
-			if ($descriptions)
-				$cv["description"] = $line["caption"];
-
 			array_push($ret, $cv);
 		}
 
-- 
cgit v1.2.3