From fe08299ec46eb8df2988c788ced2c019743bee6a Mon Sep 17 00:00:00 2001 From: wn_ Date: Sun, 5 Mar 2023 19:14:08 +0000 Subject: Replace special feed and category numbers with constants. --- classes/counters.php | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'classes/counters.php') diff --git a/classes/counters.php b/classes/counters.php index 48b7264dd..41bb1b9ae 100644 --- a/classes/counters.php +++ b/classes/counters.php @@ -60,8 +60,8 @@ class Counters { /* Labels category */ - $cv = array("id" => -2, "kind" => "cat", - "counter" => Feeds::_get_cat_unread(-2)); + $cv = array("id" => Feeds::CATEGORY_LABELS, "kind" => "cat", + "counter" => Feeds::_get_cat_unread(Feeds::CATEGORY_LABELS)); array_push($ret, $cv); @@ -244,28 +244,29 @@ class Counters { $ret = []; - for ($i = 0; $i >= -4; $i--) { + foreach ([Feeds::FEED_ARCHIVED, Feeds::FEED_STARRED, Feeds::FEED_PUBLISHED, + Feeds::FEED_FRESH, Feeds::FEED_ALL] as $feed_id) { - $count = Feeds::_get_counters($i, false, true); + $count = Feeds::_get_counters($feed_id, false, true); - if ($i == 0 || $i == -1 || $i == -2) - $auxctr = Feeds::_get_counters($i, false); + if (in_array($feed_id, [Feeds::FEED_ARCHIVED, Feeds::FEED_STARRED, Feeds::FEED_PUBLISHED])) + $auxctr = Feeds::_get_counters($feed_id, false); else $auxctr = 0; $cv = [ - "id" => $i, + "id" => $feed_id, "counter" => (int) $count, "auxcounter" => (int) $auxctr ]; - if ($i == -1) + if ($feed_id == Feeds::FEED_STARRED) $cv["markedcounter"] = $auxctr; array_push($ret, $cv); } - $feeds = PluginHost::getInstance()->get_feeds(-1); + $feeds = PluginHost::getInstance()->get_feeds(Feeds::CATEGORY_SPECIAL); if (is_array($feeds)) { foreach ($feeds as $feed) { -- cgit v1.2.3