summaryrefslogtreecommitdiff
path: root/api
diff options
context:
space:
mode:
authorAndrew Dolgov <[email protected]>2010-11-05 18:03:26 +0300
committerAndrew Dolgov <[email protected]>2010-11-05 18:04:07 +0300
commit9798b2b4c659ba7f626c5cdad68453def0f01fc2 (patch)
treedff8c68ce4c4f359c3b4bb81c7a7ed425aa5ca96 /api
parent8945282432f0d1ec8b43ae8779852bb1a039f5f4 (diff)
api: rewrite getCounters to use getAllCounters()
Diffstat (limited to 'api')
-rw-r--r--api/index.php68
1 files changed, 3 insertions, 65 deletions
diff --git a/api/index.php b/api/index.php
index 0dae178e4..8e6b61110 100644
--- a/api/index.php
+++ b/api/index.php
@@ -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":