}
if ($subop == "publ") {
- $pub = $_GET["pub"];
- $id = db_escape_string($_GET["id"]);
+ $pub = $_REQUEST["pub"];
+ $id = db_escape_string($_REQUEST["id"]);
+ $note = trim(strip_tags(db_escape_string($_REQUEST["note"])));
if ($pub == "1") {
$pub = "true";
$pub = "false";
}
+ if ($note != 'undefined') {
+ $note_qpart = "note = '$note',";
+ }
+
// FIXME this needs collision testing
- $result = db_query($link, "UPDATE ttrss_user_entries SET published = $pub
+ $result = db_query($link, "UPDATE ttrss_user_entries SET
+ $note_qpart
+ published = $pub
WHERE ref_id = '$id' AND owner_uid = " . $_SESSION["uid"]);
- print "<rpc-reply><counters>";
+
+ print "<rpc-reply>";
+
+ print "<counters>";
getGlobalCounters($link);
getLabelCounters($link);
if (get_pref($link, 'ENABLE_FEED_CATS')) {
getCategoryCounters($link);
}
- print "</counters></rpc-reply>";
+ print "</counters>";
+
+ if ($note != 'undefined') {
+ $note_size = strlen($note);
+ print "<note id=\"$id\" size=\"$note_size\">";
+ print "<![CDATA[" . format_article_note($id, $note) . "]]>";
+ print "</note>";
+ }
+
+ print "</rpc-reply>";
return;
}
/* GET["cmode"] = 0 - mark as read, 1 - as unread, 2 - toggle */
if ($subop == "catchupSelected") {
- $ids = split(",", db_escape_string($_GET["ids"]));
- $cmode = sprintf("%d", $_GET["cmode"]);
+ $ids = split(",", db_escape_string($_REQUEST["ids"]));
+ $cmode = sprintf("%d", $_REQUEST["cmode"]);
catchupArticlesById($link, $ids, $cmode);
$ids = split(",", db_escape_string($_REQUEST["ids"]));
$label_id = db_escape_string($_REQUEST["lid"]);
- $label = label_find_caption($link, $label_id, $_SESSION["uid"]);
+ $label = db_escape_string(label_find_caption($link, $label_id,
+ $_SESSION["uid"]));
print "<rpc-reply>";
print "<info-for-headlines>";
$ids = split(",", db_escape_string($_REQUEST["ids"]));
$label_id = db_escape_string($_REQUEST["lid"]);
- $label = label_find_caption($link, $label_id, $_SESSION["uid"]);
+ $label = db_escape_string(label_find_caption($link, $label_id,
+ $_SESSION["uid"]));
print "<rpc-reply>";
if ($subop == "download") {
$stage = (int) $_REQUEST["stage"];
- $cidt = db_escape_string($_REQUEST["cidt"]);
- $cidb = db_escape_string($_REQUEST["cidb"]);
+ $cidt = (int)db_escape_string($_REQUEST["cidt"]);
+ $cidb = (int)db_escape_string($_REQUEST["cidb"]);
$sync = db_escape_string($_REQUEST["sync"]);
//$amount = (int) $_REQUEST["amount"];
//$unread_only = db_escape_string($_REQUEST["unread_only"]);
//if (!$amount) $amount = 50;
- $amount = 100;
+ $amount = 2000;
$unread_only = true;
print "<rpc-reply>";
$id = (int) $e[0];
$unread = bool_to_sql_bool((bool) $e[1]);
- $marked = bool_to_sql_bool((bool) $e[2]);
+ $marked = (bool)$e[2];
- /* Marked status is not synchronized yet */
+ if ($marked) {
+ $marked = bool_to_sql_bool($marked);
+ $marked_qpart = "marked = $marked,";
+ }
$query = "UPDATE ttrss_user_entries SET
+ $marked_qpart
unread = $unread,
last_read = '$last_online'
WHERE ref_id = '$id' AND
$result = db_query($link, $query);
-// if (db_affected_rows($result) > 0) {
- print "<sync-ok id=\"$id\"/>";
-// }
+ print "<sync-ok id=\"$id\"/>";
}
}
/* Maybe we need to further update local DB for this client */
- $query = "SELECT ref_id,unread FROM ttrss_user_entries
+ $query = "SELECT ref_id,unread,marked FROM ttrss_user_entries
WHERE last_read >= '$last_online' AND
- owner_uid = ".$_SESSION["uid"];
+ owner_uid = ".$_SESSION["uid"] . " LIMIT 1000";
$result = db_query($link, $query);
while ($line = db_fetch_assoc($result)) {
- print "<sync-ok id=\"".$line["ref_id"]."\"/>";
+ $unread = (int) sql_bool_to_bool($line["unread"]);
+ $marked = (int) sql_bool_to_bool($line["marked"]);
+
+ print "<sync-ok unread=\"$unread\" marked=\"$marked\"
+ id=\"".$line["ref_id"]."\"/>";
}
}
print "<feeds>";
$result = db_query($link, "SELECT id, title, cat_id FROM
- ttrss_feeds WHERE owner_uid = ".$_SESSION["uid"]);
+ ttrss_feeds WHERE hidden = false AND owner_uid = ".$_SESSION["uid"]);
while ($line = db_fetch_assoc($result)) {
ttrss_feed_categories WHERE owner_uid = ".$_SESSION["uid"]);
print "<category id=\"0\" collapsed=\"".
- (int)$_COOKIE["ttrss_vf_uclps"]."\"><![CDATA[";
+ (int)get_pref($link, "_COLLAPSED_UNCAT")."\"><![CDATA[";
print __("Uncategorized");
print "]]></category>";
print "<category id=\"-1\" collapsed=\"".
- (int)$_COOKIE["ttrss_vf_vclps"]."\"><![CDATA[";
+ (int)get_pref($link, "_COLLAPSED_SPECIAL")."\"><![CDATA[";
print __("Special");
print "]]></category>";
print "<category id=\"-2\" collapsed=\"".
- (int)$_COOKIE["ttrss_vf_lclps"]."\"><![CDATA[";
+ (int)get_pref($link, "_COLLAPSED_LABELS")."\"><![CDATA[";
print __("Labels");
print "]]></category>";
if ($stage > 0) {
print "<articles>";
- $limit = 50;
+ $limit = 200;
$skip = $limit*($stage-1);
print "<limit value=\"$limit\"/>";
}
if ($cidt && $cidb) {
- $cid_qpart = "(id > $cidt OR id < $cidb) AND ";
+ $cid_qpart = "(ttrss_entries.id > $cidt OR ttrss_entries.id < $cidb) AND ";
}
if (DB_TYPE == "pgsql") {
}
$result = db_query($link,
- "SELECT DISTINCT id,title,guid,link,comments,
- feed_id,content,updated,unread,marked FROM
- ttrss_user_entries,ttrss_entries
- WHERE $unread_qpart $cid_qpart $date_qpart
- ref_id = id AND owner_uid = ".$_SESSION["uid"]."
+ "SELECT DISTINCT ttrss_entries.id,ttrss_entries.title,
+ guid,link,comments,
+ feed_id,content,updated,unread,marked FROM
+ ttrss_user_entries,ttrss_entries,ttrss_feeds
+ WHERE $unread_qpart $cid_qpart $date_qpart
+ hidden = false AND
+ ttrss_feeds.id = feed_id AND
+ ref_id = ttrss_entries.id AND
+ ttrss_user_entries.owner_uid = ".$_SESSION["uid"]."
ORDER BY updated DESC LIMIT $limit OFFSET $skip");
if (function_exists('json_encode')) {