public/tt-rss
1
0
Fork 0
mirror of https://git.tt-rss.org/git/tt-rss.git synced 2025-12-16 01:35:56 +00:00
Code Issues Releases Wiki Activity

digest: use pure JSON

Browse Source
This commit is contained in:
Andrew Dolgov
2010-11-25 14:21:20 +03:00
parent 74d12bab83
commit 126cb7657f
2 changed files with 25 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
modules/backend-rpc.php
View File

@@ -695,15 +695,18 @@
}
if ($subop == "digest-update") {
header("Content-Type: text/plain");
$feed_id = db_escape_string($_REQUEST['feed_id']);
$offset = db_escape_string($_REQUEST['offset']);
$seq = db_escape_string($_REQUEST['seq']);
if (!$feed_id) $feed_id = -4;
if (!$offset) $offset = 0;
print "<rpc-reply>";
print "<seq>$seq</seq>";
$reply = array();
$reply['seq'] = $seq;
$headlines = api_get_headlines($link, $feed_id, 10, $offset,
'', ($feed_id == -4), true, false, "unread", "updated DESC");
@@ -711,18 +714,17 @@
//function api_get_headlines($link, $feed_id, $limit, $offset,
// $filter, $is_cat, $show_excerpt, $show_content, $view_mode) {
print "<headlines-title><![CDATA[" . getFeedTitle($link, $feed_id) .
"]]></headlines-title>";
$reply['headlines'] = array();
$reply['headlines']['title'] = getFeedTitle($link, $feed_id);
$reply['headlines']['content'] = $headlines;
print "<headlines><![CDATA[" . json_encode($headlines) . "]]></headlines>";
print "</rpc-reply>";
print json_encode($reply);
return;
}
if ($subop == "digest-init") {
print "<rpc-reply>";
header("Content-Type: text/plain");
$tmp_feeds = api_get_feeds($link, -3, true, false, 0);
$feeds = array();
@@ -731,9 +733,8 @@
if ($f['id'] > 0 || $f['id'] == -4) array_push($feeds, $f);
}
print "<feeds><![CDATA[" . json_encode($feeds) . "]]></feeds>";
print json_encode(array("feeds" => $feeds));
print "</rpc-reply>";
return;
}