pref/feeds: start user category ordering from 1

[tt-rss.git] / classes / api.php

diff --git a/classes/api.php b/classes/api.php
index 31dd3c086a3fba5baed841db8e2cda13af201df7..00e58ee502b1d31c502680b57ce748cd129e1743 100644 (file)
--- a/classes/api.php
+++ b/classes/api.php
@@ -107,7 +107,7 @@ class API extends Handler {
 
        /* Method added for ttrss-reader for Android */
        function getCounters() {
-               $this->wrap(self::STATUS_OK, getAllCounters());
+               $this->wrap(self::STATUS_OK, Counters::getAllCounters());
        }
 
        function getFeeds() {
@@ -301,17 +301,6 @@ class API extends Handler {
                                }
                        }
 
-                       if ($num_updated > 0 && $field == "published") {
-                               if (PUBSUBHUBBUB_HUB) {
-                                       $rss_link = get_self_url_prefix() .
-                                               "/public.php?op=rss&id=-2&key=" .
-                                               get_feed_access_key(-2, false);
-
-                                       $p = new pubsubhubbub\publisher\Publisher(PUBSUBHUBBUB_HUB);
-                                       $p->publish_update($rss_link);
-                               }
-                       }
-
                        $this->wrap(self::STATUS_OK, array("status" => "OK",
                                "updated" => $num_updated));
 
@@ -354,7 +343,7 @@ class API extends Handler {
                                                "guid" => $line["guid"],
                                                "title" => $line["title"],
                                                "link" => $line["link"],
-                                               "labels" => get_article_labels($line['id']),
+                                               "labels" => Article::get_article_labels($line['id']),
                                                "unread" => sql_bool_to_bool($line["unread"]),
                                                "marked" => sql_bool_to_bool($line["marked"]),
                                                "published" => sql_bool_to_bool($line["published"]),
@@ -412,12 +401,10 @@ class API extends Handler {
        }
 
        function updateFeed() {
-               require_once "include/rssfuncs.php";
-
                $feed_id = (int) $this->dbh->escape_string($_REQUEST["feed_id"]);
 
                if (!ini_get("open_basedir")) {
-                       update_rss_feed($feed_id);
+                       RSSUtils::update_rss_feed($feed_id);
                }
 
                $this->wrap(self::STATUS_OK, array("status" => "OK"));
@@ -450,7 +437,7 @@ class API extends Handler {
                        WHERE owner_uid = '".$_SESSION['uid']."' ORDER BY caption");
 
                if ($article_id)
-                       $article_labels = get_article_labels($article_id);
+                       $article_labels = Article::get_article_labels($article_id);
                else
                        $article_labels = array();
 
@@ -458,14 +445,14 @@ class API extends Handler {
 
                        $checked = false;
                        foreach ($article_labels as $al) {
-                               if (feed_to_label_id($al[0]) == $line['id']) {
+                               if (Labels::feed_to_label_id($al[0]) == $line['id']) {
                                        $checked = true;
                                        break;
                                }
                        }
 
                        array_push($rv, array(
-                               "id" => (int)label_to_feed_id($line['id']),
+                               "id" => (int)Labels::label_to_feed_id($line['id']),
                                "caption" => $line['caption'],
                                "fg_color" => $line['fg_color'],
                                "bg_color" => $line['bg_color'],
@@ -481,8 +468,8 @@ class API extends Handler {
                $label_id = (int) $this->dbh->escape_string($_REQUEST['label_id']);
                $assign = (bool) ($this->dbh->escape_string($_REQUEST['assign']) == "true");
 
-               $label = $this->dbh->escape_string(label_find_caption(
-                       feed_to_label_id($label_id), $_SESSION["uid"]));
+               $label = $this->dbh->escape_string(Labels::find_caption(
+                       Labels::feed_to_label_id($label_id), $_SESSION["uid"]));
 
                $num_updated = 0;
 
@@ -491,9 +478,9 @@ class API extends Handler {
                        foreach ($article_ids as $id) {
 
                                if ($assign)
-                                       label_add_article($id, $label, $_SESSION["uid"]);
+                                       Labels::add_article($id, $label, $_SESSION["uid"]);
                                else
-                                       label_remove_article($id, $label, $_SESSION["uid"]);
+                                       Labels::remove_article($id, $label, $_SESSION["uid"]);
 
                                ++$num_updated;
 
@@ -537,7 +524,7 @@ class API extends Handler {
                        /* Labels */
 
                        if ($cat_id == -4 || $cat_id == -2) {
-                               $counters = getLabelCounters(true);
+                               $counters = Counters::getLabelCounters(true);
 
                                foreach (array_values($counters) as $cv) {
 
@@ -582,7 +569,7 @@ class API extends Handler {
 
                        if ($include_nested && $cat_id) {
                                $result = db_query("SELECT
-                                       id, title FROM ttrss_feed_categories
+                                       id, title, order_id FROM ttrss_feed_categories
                                        WHERE parent_cat = '$cat_id' AND owner_uid = " . $_SESSION["uid"] .
                                " ORDER BY id, title");
 
@@ -596,6 +583,7 @@ class API extends Handler {
                                                                "title" => $line["title"],
                                                                "unread" => $unread,
                                                                "is_cat" => true,
+                                "order_id" => (int) $line["order_id"]
                                                        );
                                                array_push($feeds, $row);
                                        }
@@ -678,8 +666,7 @@ class API extends Handler {
                                        $cache_images = sql_bool_to_bool(db_fetch_result($result, 0, "cache_images"));
 
                                        if (!$cache_images && time() - $last_updated > 120) {
-                                               include "rssfuncs.php";
-                                               update_rss_feed($feed_id, true);
+                                               RSSUtils::update_rss_feed($feed_id, true);
                                        } else {
                                                db_query("UPDATE ttrss_feeds SET last_updated = '1970-01-01', last_update_started = '1970-01-01'
                                                        WHERE id = '$feed_id'");
@@ -740,10 +727,7 @@ class API extends Handler {
                                                }
                                        }
 
-                                       if (!is_array($labels)) $labels = get_article_labels($line["id"]);
-
-                                       //if (!$tags) $tags = get_article_tags($line["id"]);
-                                       //if (!$labels) $labels = get_article_labels($line["id"]);
+                                       if (!is_array($labels)) $labels = Article::get_article_labels($line["id"]);
 
                                        $headline_row = array(
                                                "id" => (int)$line["id"],