valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

api: rewrite getCounters to use getAllCounters()

This commit is contained in:
Andrew Dolgov 2010-11-05 18:03:26 +03:00
parent 8945282432
commit 9798b2b4c6
2 changed files with 4 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
api/index.php
View File

@ -104,73 +104,11 @@
/* Method added for ttrss-reader for Android */
case "getCounters":
$counters = array();
$result = db_query($link, "SELECT
id FROM ttrss_feed_categories
WHERE owner_uid = " .
$_SESSION["uid"]);
$cats = array();
/* flct (flc is the default) FIXME: document */
$output_mode = db_escape_string($_REQUEST["output_mode"]);
while ($line = db_fetch_assoc($result)) {
array_push($cats, $line["id"]);
}
array_push($cats, "0");
array_push($cats, "-1");
array_push($cats, "-2");
array_push($cats, "-3");
array_push($cats, "-4");
foreach ($cats as $cat) {
$cat_part = "cat_id = '$cat'";
if ($cat == 0) {
$cat_part = "cat_id IS null";
}
$result = db_query($link, "SELECT
id FROM ttrss_feeds WHERE ".
$cat_part." AND owner_uid = " . $_SESSION["uid"]);
$feeds = array();
while ($line = db_fetch_assoc($result)) {
$unread = getFeedArticles($link, $line["id"], false, true, $_SESSION["uid"]);
if ($unread) {
$row = array(
"feed_id" => (int)$line["id"],
"unread" => (int)$unread
);
array_push($feeds, $row);
}
}
$is_cat = true;
if ($cat < 0) {
$is_cat = false;
}
$unread_cat = getFeedArticles($link, $cat, $is_cat, true, $_SESSION["uid"]);
if ($feeds) {
$count = array(
"cat_id" => $cat,
"unread" => $unread_cat,
"feeds" => $feeds
);
} else {
$count = array(
"cat_id" => $cat,
"unread" => $unread_cat
);
}
array_push($counters, $count);
}
print json_encode($counters);
print json_encode(getAllCounters($link, $output_mode));
break;
case "getFeeds":

2
functions.php
View File

@ -2480,7 +2480,7 @@
/* Special case: NULL category doesn't actually exist in the DB */
$cv = array("id" => 0, "cat" => true,
$cv = array("id" => 0, "kind" => "cat",
"counter" => ccache_find($link, 0, $_SESSION["uid"], true));
array_push($ret_arr, $cv);