rpc/addfeed: use JSON

[tt-rss.git] / modules / backend-rpc.php

diff --git a/modules/backend-rpc.php b/modules/backend-rpc.php
index bf475e633ea8aa0316d0d0725b22d1f3dd949109..54c66df33b0b3b7506b0c9900ed9cba22bf1d9dc 100644 (file)
--- a/modules/backend-rpc.php
+++ b/modules/backend-rpc.php
@@ -88,8 +88,6 @@
                if ($subop == "remarchive") {
                        $ids = split(",", db_escape_string($_REQUEST["ids"]));
 
-                       print "<rpc-reply>";
-
                        foreach ($ids as $id) {
                                $result = db_query($link, "DELETE FROM ttrss_archived_feeds WHERE
                                        (SELECT COUNT(*) FROM ttrss_user_entries 
@@ -97,17 +95,13 @@
                                                id = '$id' AND owner_uid = ".$_SESSION["uid"]);
 
                                $rc = db_affected_rows($link, $result);
-
-                               print "<feed id='$id' rc='$rc'/>";
-
                        }
 
-                       print "</rpc-reply>";
-
                        return;
                }
 
                if ($subop == "addfeed") {
+                       header("Content-Type: text/plain");
 
                        $feed = db_escape_string($_REQUEST['feed']);
                        $cat = db_escape_string($_REQUEST['cat']);
@@ -116,21 +110,18 @@
 
                        $rc = subscribe_to_feed($link, $feed, $cat, $login, $pass);
 
-                       print "<rpc-reply>";
-                       print "<result code='$rc'/>";
-                       print "</rpc-reply>";
+                       print json_encode(array("result" => $rc));
 
                        return;
 
                }
 
                if ($subop == "extractfeedurls") {
-                       print "<rpc-reply>";
+                       header("Content-Type: text/plain");
 
                        $urls = get_feeds_from_html($_REQUEST['url']);
-                       print "<urls><![CDATA[" . json_encode($urls) . "]]></urls>";
 
-                       print "</rpc-reply>";
+                       print json_encode(array("urls" => $urls));
                        return;
                }