API: add order_id to getCategories; add feed_title to getHeadlines; bump api level to 3
This commit is contained in:
parent
5b7bd238ee
commit
b11e9943d8
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
class API extends Handler {
|
class API extends Handler {
|
||||||
|
|
||||||
const API_LEVEL = 2;
|
const API_LEVEL = 3;
|
||||||
|
|
||||||
const STATUS_OK = 0;
|
const STATUS_OK = 0;
|
||||||
const STATUS_ERR = 1;
|
const STATUS_ERR = 1;
|
||||||
|
@ -126,7 +126,7 @@ class API extends Handler {
|
||||||
// TODO do not return empty categories, return Uncategorized and standard virtual cats
|
// TODO do not return empty categories, return Uncategorized and standard virtual cats
|
||||||
|
|
||||||
$result = db_query($this->link, "SELECT
|
$result = db_query($this->link, "SELECT
|
||||||
id, title FROM ttrss_feed_categories
|
id, title, order_id FROM ttrss_feed_categories
|
||||||
WHERE owner_uid = " .
|
WHERE owner_uid = " .
|
||||||
$_SESSION["uid"]);
|
$_SESSION["uid"]);
|
||||||
|
|
||||||
|
@ -138,7 +138,9 @@ class API extends Handler {
|
||||||
if ($unread || !$unread_only) {
|
if ($unread || !$unread_only) {
|
||||||
array_push($cats, array("id" => $line["id"],
|
array_push($cats, array("id" => $line["id"],
|
||||||
"title" => $line["title"],
|
"title" => $line["title"],
|
||||||
"unread" => $unread));
|
"unread" => $unread,
|
||||||
|
"order_id" => (int) $line["order_id"],
|
||||||
|
));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -4510,6 +4510,8 @@
|
||||||
|
|
||||||
$headline_row["labels"] = $labels;
|
$headline_row["labels"] = $labels;
|
||||||
|
|
||||||
|
$headline_row["feed_title"] = $line["feed_title"];
|
||||||
|
|
||||||
array_push($headlines, $headline_row);
|
array_push($headlines, $headline_row);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue