rpc/digest-get-contents: use JSON
This commit is contained in:
parent
4a16bda3d0
commit
0fe841efb9
2 changed files with 10 additions and 13 deletions
|
@ -134,9 +134,12 @@ function zoom(elem, article_id) {
|
|||
onComplete: function(transport) {
|
||||
fatal_error_check(transport);
|
||||
|
||||
if (transport.responseXML) {
|
||||
var article = transport.responseXML.getElementsByTagName('article')[0];
|
||||
elem.innerHTML = article.firstChild.nodeValue;
|
||||
var reply = JSON.parse(transport.responseText);
|
||||
|
||||
if (reply) {
|
||||
var article = reply['article'];
|
||||
|
||||
elem.innerHTML = article.content;
|
||||
|
||||
new Effect.BlindDown(elem, {duration : 0.5});
|
||||
|
||||
|
|
|
@ -608,24 +608,18 @@
|
|||
}
|
||||
|
||||
if ($subop == "digest-get-contents") {
|
||||
header("Content-Type: text/plain");
|
||||
|
||||
$article_id = db_escape_string($_REQUEST['article_id']);
|
||||
|
||||
$result = db_query($link, "SELECT content
|
||||
FROM ttrss_entries, ttrss_user_entries
|
||||
WHERE id = '$article_id' AND ref_id = id AND owner_uid = ".$_SESSION['uid']);
|
||||
|
||||
print "<rpc-reply>";
|
||||
|
||||
print "<article id=\"$article_id\"><![CDATA[";
|
||||
|
||||
$content = sanitize_rss($link, db_fetch_result($result, 0, "content"));
|
||||
|
||||
print $content;
|
||||
|
||||
print "]]></article>";
|
||||
|
||||
print "</rpc-reply>";
|
||||
|
||||
print json_encode(array("article" =>
|
||||
array("id" => $id, "content" => $content)));
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue