valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rpc/addfeed: use JSON

This commit is contained in:
Andrew Dolgov 2010-11-29 16:02:16 +03:00
parent ddcbbea2de
commit e9175d13d7
2 changed files with 10 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
functions.js
View File

@ -866,14 +866,9 @@ function quickAddFeed() {
onComplete: function(transport) {
try {
if (!transport.responseXML) {
console.log(transport.responseText);
alert(__("Server error while trying to subscribe to specified feed."));
return;
}
var reply = JSON.parse(transport.responseText);
var result = transport.responseXML.getElementsByTagName('result')[0];
var rc = parseInt(result.getAttribute('code'));
var rc = parseInt(reply['result']);
notify('');
@ -899,16 +894,11 @@ function quickAddFeed() {
parameters: 'op=rpc&subop=extractfeedurls&url=' + param_escape(feed_url),
onComplete: function(transport, dialog, feed_url) {
if (!transport.responseXML) {
console.log(transport.responseText);
alert(__("Server error while trying to query feed URLs."));
return;
}
notify('');
var result = transport.responseXML.getElementsByTagName('urls')[0];
var feeds = JSON.parse(result.firstChild.nodeValue);
var reply = JSON.parse(transport.responseText);
var feeds = reply['urls'];
console.log(transport.responseText);

17
modules/backend-rpc.php
View File

@ -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;
}