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 1fc84884ef6543d35b2036d02b073f8c07f9a133..00e58ee502b1d31c502680b57ce748cd129e1743 100644 (file)
--- a/classes/api.php
+++ b/classes/api.php
@@ -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));
 
@@ -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"));
@@ -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'");