public/tt-rss
1
0
Fork 0
mirror of https://git.tt-rss.org/git/tt-rss.git synced 2025-12-13 15:15:56 +00:00
Code Issues Releases Wiki Activity

feeds: unify naming

Browse Source
This commit is contained in:
Andrew Dolgov
2021-02-15 15:43:07 +03:00
parent 6b006a18e7
commit 020f062a76
16 changed files with 134 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
classes/counters.php
View File

@@ -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;