X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=modules%2Fbackend-rpc.php;h=228d45a78eabbdecbb5ae41f54cd30042793f9cf;hb=6a7817c1ad684ea6eb0b02180e6d2040b3cb0a77;hp=64e7df2f0c26db36e41f5e32102f5842e4f194b6;hpb=36f787976fbbfff3cdc364810a483d68b40290b1;p=tt-rss.git

diff --git a/modules/backend-rpc.php b/modules/backend-rpc.php
index 64e7df2f..228d45a7 100644
--- a/modules/backend-rpc.php
+++ b/modules/backend-rpc.php
@@ -1,46 +1,154 @@
 <?php
 	function handle_rpc_request($link) {
 
-		$subop = $_GET["subop"];
+		$subop = $_REQUEST["subop"];
 
-		if ($subop == "setpref") {
-			if (WEB_DEMO_MODE) {
+		if ($subop == "setprofile") {
+			$id = db_escape_string($_REQUEST["id"]);
+
+			$_SESSION["profile"] = $id;
+			$_SESSION["prefs_cache"] = array();
+			return;
+		}
+
+		if ($subop == "remprofiles") {
+			$ids = split(",", db_escape_string(trim($_REQUEST["ids"])));
+
+			foreach ($ids as $id) {
+				if ($_SESSION["profile"] != $id) {
+					db_query($link, "DELETE FROM ttrss_settings_profiles WHERE id = '$id' AND
+						owner_uid = " . $_SESSION["uid"]);
+				}
+			}
+			return;
+		}
+
+		if ($subop == "addprofile") {
+			$title = db_escape_string(trim($_REQUEST["title"]));
+			if ($title) {
+				db_query($link, "BEGIN");
+
+				$result = db_query($link, "SELECT id FROM ttrss_settings_profiles
+					WHERE title = '$title' AND owner_uid = " . $_SESSION["uid"]);
+
+				if (db_num_rows($result) == 0) {
+
+					db_query($link, "INSERT INTO ttrss_settings_profiles (title, owner_uid)
+						VALUES ('$title', ".$_SESSION["uid"] .")");
+	
+					$result = db_query($link, "SELECT id FROM ttrss_settings_profiles WHERE
+						title = '$title'");
+	
+					if (db_num_rows($result) != 0) {
+						$profile_id = db_fetch_result($result, 0, "id");
+	
+						if ($profile_id) {
+							initialize_user_prefs($link, $_SESSION["uid"], $profile_id); 
+						}
+					}
+				}
+
+				db_query($link, "COMMIT");
+			}
+			return;
+		}
+
+		if ($subop == "saveprofile") {
+			$id = db_escape_string($_REQUEST["id"]);
+			$title = db_escape_string(trim($_REQUEST["value"]));
+
+			if ($id == 0) {
+				print __("Default profile");
 				return;
 			}
 
+			if ($title) {
+				db_query($link, "BEGIN");
+
+				$result = db_query($link, "SELECT id FROM ttrss_settings_profiles
+					WHERE title = '$title' AND owner_uid =" . $_SESSION["uid"]);
+
+				if (db_num_rows($result) == 0) {
+					db_query($link, "UPDATE ttrss_settings_profiles
+						SET title = '$title' WHERE id = '$id' AND
+						owner_uid = " . $_SESSION["uid"]);
+					print $title;
+				} else {
+					$result = db_query($link, "SELECT title FROM ttrss_settings_profiles
+						WHERE id = '$id' AND owner_uid =" . $_SESSION["uid"]);
+					print db_fetch_result($result, 0, "title");
+				}
+
+				db_query($link, "COMMIT");
+			}			
+			return;
+		}
+
+		if ($subop == "remarchive") {
+			$ids = split(",", db_escape_string($_REQUEST["ids"]));
+
 			print "<rpc-reply>";
 
-			$key = db_escape_string($_GET["key"]);
-			$value = db_escape_string($_GET["value"]);
+			foreach ($ids as $id) {
+				$result = db_query($link, "DELETE FROM ttrss_archived_feeds WHERE
+					(SELECT COUNT(*) FROM ttrss_user_entries 
+						WHERE orig_feed_id = '$id') = 0 AND
+						id = '$id' AND owner_uid = ".$_SESSION["uid"]);
 
-			set_pref($link, $key, $value);
+				$rc = db_affected_rows($link, $result);
 
-			print "<param-set key=\"$key\" value=\"$value\"/>";
+				print "<feed id='$id' rc='$rc'/>";
+
+			}
 
 			print "</rpc-reply>";
 
 			return;
 		}
 
-		if ($subop == "getLabelCounters") {
-			$aid = $_GET["aid"];		
+		if ($subop == "addfeed") {
+
+			$feed = db_escape_string($_REQUEST['feed']);
+			$cat = db_escape_string($_REQUEST['cat']);
+			$login = db_escape_string($_REQUEST['login']);
+			$pass = db_escape_string($_REQUEST['pass']);
+
+			$rc = subscribe_to_feed($link, $feed, $cat, $login, $pass);
+
 			print "<rpc-reply>";
-			print "<counters>";
-			getLabelCounters($link);
-			if ($aid) {
-				getFeedCounter($link, $aid);
-			}
-			print "</counters>";
+			print "<result code='$rc'/>";
 			print "</rpc-reply>";
 
 			return;
+
 		}
 
-		if ($subop == "getFeedCounters") {
+		if ($subop == "togglepref") {
 			print "<rpc-reply>";
-			print "<counters>";
-			getFeedCounters($link);
-			print "</counters>";
+
+			$key = db_escape_string($_REQUEST["key"]);
+
+			set_pref($link, $key, !get_pref($link, $key));
+
+			$value = get_pref($link, $key);
+
+			print "<param-set key=\"$key\" value=\"$value\"/>";
+
+			print "</rpc-reply>";
+
+			return;
+		}
+
+		if ($subop == "setpref") {
+			print "<rpc-reply>";
+
+			$key = db_escape_string($_REQUEST["key"]);
+			$value = db_escape_string($_REQUEST["value"]);
+
+			set_pref($link, $key, $value);
+
+			print "<param-set key=\"$key\" value=\"$value\"/>";
+
 			print "</rpc-reply>";
 
 			return;
@@ -48,12 +156,11 @@
 
 		if ($subop == "getAllCounters") {
 			print "<rpc-reply>";			
-			print "<counters>";
+			print "<counters><![CDATA[";
 
-			$omode = $_GET["omode"];
+			print json_encode(getAllCounters($link, $_REQUEST['omode']));
 
-			getAllCounters($link, $omode);
-			print "</counters>";
+			print "]]></counters>";
 			print_runtime_info($link);
 			print "</rpc-reply>";
 
@@ -61,8 +168,8 @@
 		}
 
 		if ($subop == "mark") {
-			$mark = $_GET["mark"];
-			$id = db_escape_string($_GET["id"]);
+			$mark = $_REQUEST["mark"];
+			$id = db_escape_string($_REQUEST["id"]);
 
 			if ($mark == "1") {
 				$mark = "true";
@@ -75,20 +182,59 @@
 			$result = db_query($link, "UPDATE ttrss_user_entries SET marked = $mark
 				WHERE ref_id = '$id' AND owner_uid = " . $_SESSION["uid"]);
 
-			print "<rpc-reply><counters>";
-			getGlobalCounters($link);
-			getLabelCounters($link);
-			if (get_pref($link, 'ENABLE_FEED_CATS')) {
-				getCategoryCounters($link);
+			print "<rpc-reply><counters><![CDATA[";
+			print json_encode(getAllCounters($link));
+			print "]]></counters></rpc-reply>";
+
+			return;
+		}
+
+		if ($subop == "delete") {
+			$ids = db_escape_string($_REQUEST["ids"]);
+
+			$result = db_query($link, "DELETE FROM ttrss_user_entries 				
+				WHERE ref_id IN ($ids) AND owner_uid = " . $_SESSION["uid"]);
+
+			print "<rpc-reply><counters><![CDATA[";
+			print json_encode(getAllCounters($link));
+			print "]]></counters></rpc-reply>";
+
+			return;
+		}
+
+		if ($subop == "unarchive") {
+			$ids = db_escape_string($_REQUEST["ids"]);
+
+			$result = db_query($link, "UPDATE ttrss_user_entries 
+				SET feed_id = orig_feed_id, orig_feed_id = NULL
+				WHERE ref_id IN ($ids) AND owner_uid = " . $_SESSION["uid"]);
+
+			print "<rpc-reply><counters><![CDATA[";
+			print json_encode(getAllCounters($link));
+			print "]]></counters></rpc-reply>";
+
+			return;
+		}
+
+		if ($subop == "archive") {
+			$ids = split(",", db_escape_string($_REQUEST["ids"]));
+
+			foreach ($ids as $id) {
+				archive_article($link, $id, $_SESSION["uid"]);
 			}
-			print "</counters></rpc-reply>";
+
+			print "<rpc-reply><counters><![CDATA[";
+			print json_encode(getAllCounters($link));
+			print "]]></counters></rpc-reply>";
 
 			return;
 		}
 
+
 		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";
@@ -96,38 +242,45 @@
 				$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>";
-			getGlobalCounters($link);
-			getLabelCounters($link);
-			if (get_pref($link, 'ENABLE_FEED_CATS')) {
-				getCategoryCounters($link);
+
+			print "<rpc-reply>";
+			
+			print "<counters><![CDATA[";
+			print json_encode(getAllCounters($link));
+			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 "</counters></rpc-reply>";
+
+			print "</rpc-reply>";
 
 			return;
 		}
 
 		if ($subop == "updateFeed") {
-			$feed_id = db_escape_string($_GET["feed"]);
+			$feed_id = db_escape_string($_REQUEST["feed"]);
 
-			$result = db_query($link, 
-				"SELECT feed_url FROM ttrss_feeds WHERE id = '$feed_id'
-					AND owner_uid = " . $_SESSION["uid"]);
-
-			if (db_num_rows($result) > 0) {			
-				$feed_url = db_fetch_result($result, 0, "feed_url");
-				update_rss_feed($link, $feed_url, $feed_id);
-			}
+			update_rss_feed($link, $feed_id);
 
 			print "<rpc-reply>";	
-			print "<counters>";
-			getFeedCounter($link, $feed_id);
-			print "</counters>";
+			print "<counters><![CDATA[";
+			print json_encode(getFeedCounters($link, $feed_id));
+			print "]]></counters>";
 			print "</rpc-reply>";
 			
 			return;
@@ -135,34 +288,19 @@
 
 		if ($subop == "forceUpdateAllFeeds" || $subop == "updateAllFeeds") {
 	
-			$global_unread_caller = sprintf("%d", $_GET["uctr"]);
+			$global_unread_caller = sprintf("%d", $_REQUEST["uctr"]);
 			$global_unread = getGlobalUnread($link);
 
 			print "<rpc-reply>";
 
-			print "<counters>";
+			print "<counters><![CDATA[";
 
 			if ($global_unread_caller != $global_unread) {
-
-	 			$omode = $_GET["omode"];
-	 
-	 			if (!$omode) $omode = "tflc";
-
-	 			if (strchr($omode, "l")) getLabelCounters($link);
-
-	 			if (strchr($omode, "c")) {			
-		 			if (get_pref($link, 'ENABLE_FEED_CATS')) {
-		 				getCategoryCounters($link);
-		 			}
-				}
-
-	 			if (strchr($omode, "f")) getFeedCounters($link);
-				if (strchr($omode, "t")) getTagCounters($link);
-
-				getGlobalCounters($link, $global_unread);
+				$omode = $_REQUEST["omode"];
+				print json_encode(getAllCounters($link, $omode));
 			}
  
-			print "</counters>";
+			print "]]></counters>";
 
 			print_runtime_info($link);
 
@@ -174,15 +312,16 @@
 		/* 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);
 
 			print "<rpc-reply>";
-			print "<counters>";
-			getAllCounters($link, $_GET["omode"]);
-			print "</counters>";
+			print "<counters><![CDATA[";
+			print json_encode(getAllCounters($link, $_REQUEST['omode']));
+			print "]]></counters>";
+
 			print_runtime_info($link);
 			print "</rpc-reply>";
 
@@ -191,15 +330,15 @@
 
 		if ($subop == "markSelected") {
 
-			$ids = split(",", db_escape_string($_GET["ids"]));
-			$cmode = sprintf("%d", $_GET["cmode"]);
+			$ids = split(",", db_escape_string($_REQUEST["ids"]));
+			$cmode = sprintf("%d", $_REQUEST["cmode"]);
 
 			markArticlesById($link, $ids, $cmode);
 
 			print "<rpc-reply>";
-			print "<counters>";
-			getAllCounters($link, $_GET["omode"]);
-			print "</counters>";
+			print "<counters><![CDATA[";
+			print json_encode(getAllCounters($link, $_REQUEST['omode']));
+			print "]]></counters>";
 			print_runtime_info($link);
 			print "</rpc-reply>";
 
@@ -208,15 +347,15 @@
 
 		if ($subop == "publishSelected") {
 
-			$ids = split(",", db_escape_string($_GET["ids"]));
-			$cmode = sprintf("%d", $_GET["cmode"]);
+			$ids = split(",", db_escape_string($_REQUEST["ids"]));
+			$cmode = sprintf("%d", $_REQUEST["cmode"]);
 
 			publishArticlesById($link, $ids, $cmode);
 
 			print "<rpc-reply>";
-			print "<counters>";
-			getAllCounters($link, $_GET["omode"]);
-			print "</counters>";
+			print "<counters><![CDATA[";
+			print json_encode(getAllCounters($link, $_REQUEST['omode']));
+			print "]]></counters>";
 			print_runtime_info($link);
 			print "</rpc-reply>";
 
@@ -231,7 +370,7 @@
 				print_runtime_info($link);
 
 				# assign client-passed params to session
-				$_SESSION["client.userAgent"] = $_GET["ua"];
+				$_SESSION["client.userAgent"] = $_REQUEST["ua"];
 
 			}
 			print "</rpc-reply>";
@@ -250,7 +389,7 @@
 
 		if ($subop == "getArticleLink") {
 
-			$id = db_escape_string($_GET["id"]);
+			$id = db_escape_string($_REQUEST["id"]);
 
 			$result = db_query($link, "SELECT link FROM ttrss_entries, ttrss_user_entries
 				WHERE id = '$id' AND id = ref_id AND owner_uid = '".$_SESSION['uid']."'");
@@ -267,9 +406,11 @@
 
 		if ($subop == "setArticleTags") {
 
-			$id = db_escape_string($_GET["id"]);
+			global $memcache;
+
+			$id = db_escape_string($_REQUEST["id"]);
 
-			$tags_str = db_escape_string($_GET["tags_str"]);
+			$tags_str = db_escape_string($_REQUEST["tags_str"]);
 
 			$tags = array_unique(trim_array(split(",", $tags_str)));
 
@@ -307,6 +448,11 @@
 
 			db_query($link, "COMMIT");
 
+			if ($memcache) {
+				$obj_id = md5("TAGS:".$_SESSION["uid"].":$id");
+				$memcache->delete($obj_id);
+			}
+
 			$tags_str = format_tags_string(get_article_tags($link, $id), $id);
 
 			print "<rpc-reply>
@@ -320,7 +466,7 @@
 
 			print "<rpc-reply>";
 
-			set_pref($link, "_PREFS_PUBLISH_KEY", generate_publish_key());
+			set_pref($link, "_PREFS_PUBLISH_KEY", generate_publish_key(), $_SESSION["uid"]);
 
 			$new_link = article_publish_url($link);		
 
@@ -331,6 +477,16 @@
 			return;
 		}
 
+		if ($subop == "regenOPMLKey") {
+
+			print "<rpc-reply>";
+			set_pref($link, " _PREFS_OPML_PUBLISH_KEY", generate_publish_key(), $_SESSION["uid"]);
+			$new_link = opml_publish_url($link);		
+			print "<link><![CDATA[$new_link]]></link>";
+			print "</rpc-reply>";
+			return;
+		}
+
 		if ($subop == "logout") {
 			logout_user();
 			print_error_xml(6);
@@ -356,8 +512,8 @@
 		}
 
 		if ($subop == "purge") {
-			$ids = split(",", db_escape_string($_GET["ids"]));
-			$days = sprintf("%d", $_GET["days"]);
+			$ids = split(",", db_escape_string($_REQUEST["ids"]));
+			$days = sprintf("%d", $_REQUEST["days"]);
 
 			print "<rpc-reply>";
 
@@ -431,7 +587,8 @@
 			$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>";
@@ -453,9 +610,9 @@
 
 			print "</info-for-headlines>";
 
-			print "<counters>";
-			getAllCounters($link, $omode);
-			print "</counters>";
+			print "<counters><![CDATA[";
+			print json_encode(getAllCounters($link, $_REQUEST['omode']));
+			print "]]></counters>";
 			print "</rpc-reply>";
 
 			return;
@@ -466,7 +623,8 @@
 			$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>";			
 
@@ -489,68 +647,237 @@
 
 			print "</info-for-headlines>";
 
-			print "<counters>";
-			getAllCounters($link, $omode);
-			print "</counters>";
+			print "<counters><![CDATA[";
+			print json_encode(getAllCounters($link, $_REQUEST['omode']));
+			print "]]></counters>";
 			print "</rpc-reply>";
 
 			return;
 		}
 
-		if ($subop == "feedBrowser") {
+		if ($subop == "updateFeedBrowser") {
 
 			$search = db_escape_string($_REQUEST["search"]);
 			$limit = db_escape_string($_REQUEST["limit"]);
+			$mode = db_escape_string($_REQUEST["mode"]);
 
 			print "<rpc-reply>";
 			print "<content>";
 			print "<![CDATA[";
-			$ctr = print_feed_browser($link, $search, $limit);
+			$ctr = print_feed_browser($link, $search, $limit, $mode);
 			print "]]>";
 			print "</content>";
 			print "<num-results value=\"$ctr\"/>";
+			print "<mode value=\"$mode\"/>";
 			print "</rpc-reply>";
 
 			return;
 		}
 
+
+		if ($subop == "massSubscribe") {
+
+			$ids = split(",", db_escape_string($_REQUEST["ids"]));
+			$mode = $_REQUEST["mode"];
+
+			$subscribed = array();
+
+			foreach ($ids as $id) {
+
+				if ($mode == 1) {
+					$result = db_query($link, "SELECT feed_url,title FROM ttrss_feeds
+						WHERE id = '$id'");
+				} else if ($mode == 2) {
+					$result = db_query($link, "SELECT * FROM ttrss_archived_feeds
+						WHERE id = '$id' AND owner_uid = " . $_SESSION["uid"]);
+					$orig_id = db_escape_string(db_fetch_result($result, 0, "id"));
+					$site_url = db_escape_string(db_fetch_result($result, 0, "site_url"));
+				}
+	
+				$feed_url = db_escape_string(db_fetch_result($result, 0, "feed_url"));
+				$title = db_escape_string(db_fetch_result($result, 0, "title"));
+	
+				$title_orig = db_fetch_result($result, 0, "title");
+	
+				$result = db_query($link, "SELECT id FROM ttrss_feeds WHERE
+						feed_url = '$feed_url' AND owner_uid = " . $_SESSION["uid"]);
+	
+				if (db_num_rows($result) == 0) {			
+					if ($mode == 1) {
+						$result = db_query($link,
+							"INSERT INTO ttrss_feeds (owner_uid,feed_url,title,cat_id) 
+							VALUES ('".$_SESSION["uid"]."', '$feed_url', '$title', NULL)");
+					} else if ($mode == 2) {
+						$result = db_query($link,
+							"INSERT INTO ttrss_feeds (id,owner_uid,feed_url,title,cat_id,site_url) 
+							VALUES ('$orig_id','".$_SESSION["uid"]."', '$feed_url', '$title', NULL, '$site_url')");
+					}
+					array_push($subscribed, $title_orig);
+				}
+			}
+
+			$num_feeds = count($subscribed);
+
+			print "<rpc-reply>";
+			print "<num-feeds value='$num_feeds'/>";
+			print "</rpc-reply>";
+
+			return;
+		} 
+
 		if ($subop == "download") {
 			$stage = (int) $_REQUEST["stage"];
-			$amount = (int) $_REQUEST["amount"];
-			$unread_only = db_escape_string($_REQUEST["unread_only"]);
+			$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;
 
-			if (!$amount) $amount = 50;
+			/* Amount is not used by the frontend offline.js anymore, it goes by
+			 * date_qpart below + cidb/cidt IDs */
+
+			$amount = 2000;
+			$unread_only = true;
 
 			print "<rpc-reply>";
 
+			$sync = split(";", $sync);
+
+			print "<sync>";
+
+			if (count($sync) > 0) {
+				if (strtotime($sync[0])) {
+					$last_online = db_escape_string($sync[0]);
+
+					print "<sync-point><![CDATA[$last_online]]></sync-point>";
+					
+					for ($i = 1; $i < count($sync); $i++) {
+						$e = split(",", $sync[$i]);
+
+						if (count($e) == 3) {
+
+							$id = (int) $e[0];
+							$unread = bool_to_sql_bool((bool) $e[1]);
+							$marked = (bool)$e[2];
+
+							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 
+								(last_read IS NULL OR last_read < '$last_online') AND
+								owner_uid = ".$_SESSION["uid"];
+
+							$result = db_query($link, $query);
+
+							print "<sync-ok id=\"$id\"/>";
+
+						}
+					}
+
+					/* Maybe we need to further update local DB for this client */
+
+					$query = "SELECT ref_id,unread,marked FROM ttrss_user_entries
+						WHERE last_read >= '$last_online' AND
+								owner_uid = ".$_SESSION["uid"] . " LIMIT 1000";
+
+					$result = db_query($link, $query);
+
+					while ($line = db_fetch_assoc($result)) {
+						$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 "</sync>";
+
 			if ($stage == 0) {
 				print "<feeds>";
 
-				$reply = array();
-
-				$result = db_query($link, "SELECT id, title FROM
+				$result = db_query($link, "SELECT id, title, cat_id FROM
 					ttrss_feeds WHERE owner_uid = ".$_SESSION["uid"]);
 
 				while ($line = db_fetch_assoc($result)) {
 
 					$has_icon = (int) feed_has_icon($line["id"]);
 
-					print "<feed has_icon=\"$has_icon\" id=\"".$line["id"]."\"><![CDATA[";
+					print "<feed has_icon=\"$has_icon\" 
+						cat_id=\"".(int)$line["cat_id"]."\" id=\"".$line["id"]."\"><![CDATA[";
 					print $line["title"];
 					print "]]></feed>";
 				}
 
 				print "</feeds>";
 
+				print "<feed-categories>";
+
+				$result = db_query($link, "SELECT id, title, collapsed FROM
+					ttrss_feed_categories WHERE owner_uid = ".$_SESSION["uid"]);
+
+					print "<category id=\"0\" collapsed=\"".
+						(int)get_pref($link, "_COLLAPSED_UNCAT")."\"><![CDATA[";
+					print __("Uncategorized");
+					print "]]></category>";
+
+					print "<category id=\"-1\" collapsed=\"".
+						(int)get_pref($link, "_COLLAPSED_SPECIAL")."\"><![CDATA[";
+					print __("Special");
+					print "]]></category>";
+
+					print "<category id=\"-2\" collapsed=\"".
+						(int)get_pref($link, "_COLLAPSED_LABELS")."\"><![CDATA[";
+					print __("Labels");
+					print "]]></category>";
+
+				while ($line = db_fetch_assoc($result)) {
+					print "<category 
+						id=\"".$line["id"]."\"
+						collapsed=\"".(int)sql_bool_to_bool($line["collapsed"])."\"><![CDATA[";
+					print $line["title"];
+					print "]]></category>";
+				}
+
+				print "</feed-categories>";
+
+				print "<labels>";
+
+				$result = db_query($link, "SELECT * FROM
+					ttrss_labels2 WHERE owner_uid = ".$_SESSION["uid"]);
+
+				while ($line = db_fetch_assoc($result)) {
+					print "<label
+						id=\"".$line["id"]."\"
+						fg_color=\"".$line["fg_color"]."\"
+						bg_color=\"".$line["bg_color"]."\"
+						><![CDATA[";
+					print $line["caption"];
+					print "]]></label>";
+				}
+
+
+				print "</labels>";
+
 			}
 
 			if ($stage > 0) {
-
 				print "<articles>";
 
-				$limit = 50;
+				$limit = 10;
 				$skip = $limit*($stage-1);
 
+				print "<limit value=\"$limit\"/>";
+
 				if ($amount > 0) $amount -= $skip;
 
 				if ($amount > 0) {
@@ -558,25 +885,47 @@
 					$limit = min($limit, $amount);
 
 					if ($unread_only) {
-						$unread_qpart = "unread = true AND ";
+						$unread_qpart = "(unread = true OR marked = true) AND ";
 					}
 
+					if ($cidt && $cidb) {
+						$cid_qpart =  "(ttrss_entries.id > $cidt OR ttrss_entries.id < $cidb) AND ";
+					}
+
+					if (DB_TYPE == "pgsql") {
+						$date_qpart = "updated >= NOW() - INTERVAL '1 week' AND";
+					} else {
+						$date_qpart = "updated >= DATE_SUB(NOW(), INTERVAL 1 WEEK) AND";
+					}			
+
 					$result = db_query($link,
-						"SELECT DISTINCT id,title,guid,link,
-								feed_id,content,updated,unread,marked FROM
-							ttrss_user_entries,ttrss_entries
-							WHERE $unread_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
+							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')) {
+
+						while ($line = db_fetch_assoc($result)) {
+							print "<article><![CDATA[";
 	
-					while ($line = db_fetch_assoc($result)) {
-						print "<article><![CDATA[";
+							$line["marked"] = (int)sql_bool_to_bool($line["marked"]);
+							$line["unread"] = (int)sql_bool_to_bool($line["unread"]);
 
-						$line["marked"] = (int)sql_bool_to_bool($line["marked"]);
-						$line["unread"] = (int)sql_bool_to_bool($line["unread"]);
+							$line["labels"] = get_article_labels($link, $line["id"]);
 
-						print json_encode($line);
-						print "]]></article>";
+//							too slow :(							
+//							$line["tags"] = format_tags_string(
+//								get_article_tags($link, $line["id"]), $line["id"]);
+	
+							print json_encode($line);
+							print "]]></article>";
+						}	
 					}
 
 				}
@@ -590,6 +939,84 @@
 			return;
 		}
 
+		if ($subop == "digest-get-contents") {
+			$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>";
+
+			return;
+		}
+
+		if ($subop == "digest-update") {
+			$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>";
+
+			$headlines = api_get_headlines($link, $feed_id, 10, $offset,
+				'', ($feed_id == -4), true, false, "unread", "updated DESC");
+
+			//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>";
+
+			print "<headlines><![CDATA[" . json_encode($headlines) . "]]></headlines>";
+
+			print "</rpc-reply>";
+			return;
+		}
+
+		if ($subop == "digest-init") {
+			print "<rpc-reply>";
+
+			$tmp_feeds = api_get_feeds($link, false, true, false, 0);
+			$feeds = array();
+
+			foreach ($tmp_feeds as $f) {
+				if ($f['id'] > 0 || $f['id'] == -4) array_push($feeds, $f);
+			}
+
+			print "<feeds><![CDATA[" . json_encode($feeds) . "]]></feeds>";
+
+			print "</rpc-reply>";
+			return;
+		}
+
+		if ($subop == "catchupFeed") {
+
+			$feed_id = db_escape_string($_REQUEST['feed_id']);
+			$is_cat = db_escape_string($_REQUEST['is_cat']);
+
+			print "<rpc-reply>";
+
+			catchup_feed($link, $feed_id, $is_cat);
+
+			print "</rpc-reply>";
+
+			return;
+		}
+
 		print "<rpc-reply><error>Unknown method: $subop</error></rpc-reply>";
 	}
 ?>