summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
authorAndrew Dolgov <[email protected]>2011-09-01 16:46:50 +0400
committerAndrew Dolgov <[email protected]>2011-09-01 16:46:50 +0400
commitbb674f94936e8930d9ac6fa1bcc38c064e67529e (patch)
tree9a7d7f9167a9ed6c1b4f758bd557365e27de67f4 /modules
parent6a0906d1e6b3cae5fbf01b1e51acbfa8c03c72de (diff)
rework digest mode
Diffstat (limited to 'modules')
-rw-r--r--modules/backend-rpc.php16
1 files changed, 12 insertions, 4 deletions
diff --git a/modules/backend-rpc.php b/modules/backend-rpc.php
index 6c0abf715..6eea33df9 100644
--- a/modules/backend-rpc.php
+++ b/modules/backend-rpc.php
@@ -604,14 +604,22 @@
if ($subop == "digest-get-contents") {
$article_id = db_escape_string($_REQUEST['article_id']);
- $result = db_query($link, "SELECT content
+ $result = db_query($link, "SELECT content,title,link,marked,published
FROM ttrss_entries, ttrss_user_entries
WHERE id = '$article_id' AND ref_id = id AND owner_uid = ".$_SESSION['uid']);
$content = sanitize_rss($link, db_fetch_result($result, 0, "content"));
+ $title = strip_tags(db_fetch_result($result, 0, "title"));
+ $article_url = htmlspecialchars(db_fetch_result($result, 0, "link"));
+ $marked = sql_bool_to_bool(db_fetch_result($result, 0, "marked"));
+ $published = sql_bool_to_bool(db_fetch_result($result, 0, "published"));
+
print json_encode(array("article" =>
- array("id" => $id, "content" => $content)));
+ array("id" => $article_id, "url" => $article_url,
+ "tags" => get_article_tags($link, $article_id),
+ "marked" => $marked, "published" => $published,
+ "title" => $title, "content" => $content)));
return;
}
@@ -627,7 +635,7 @@
$reply['seq'] = $seq;
- $headlines = api_get_headlines($link, $feed_id, 10, $offset,
+ $headlines = api_get_headlines($link, $feed_id, 30, $offset,
'', ($feed_id == -4), true, false, "unread", "updated DESC");
//function api_get_headlines($link, $feed_id, $limit, $offset,
@@ -642,7 +650,7 @@
}
if ($subop == "digest-init") {
- $tmp_feeds = api_get_feeds($link, -3, true, false, 0);
+ $tmp_feeds = api_get_feeds($link, -4, true, false, 0);
$feeds = array();