From 75c510323be9682951412510d82f97d838dcb3bf Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Sun, 14 Nov 2010 21:50:13 +0300
Subject: remove google gears

---
 modules/backend-rpc.php | 214 ------------------------------------------------
 modules/pref-prefs.php  |   3 +-
 2 files changed, 2 insertions(+), 215 deletions(-)

(limited to 'modules')

diff --git a/modules/backend-rpc.php b/modules/backend-rpc.php
index 23706ea3d..286831804 100644
--- a/modules/backend-rpc.php
+++ b/modules/backend-rpc.php
@@ -713,220 +713,6 @@
 			return;
 		} 
 
-		if ($subop == "download") {
-			$stage = (int) $_REQUEST["stage"];
-			$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 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>";
-
-				$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\" 
-						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 = 10;
-				$skip = $limit*($stage-1);
-
-				print "<limit value=\"$limit\"/>";
-
-				if ($amount > 0) $amount -= $skip;
-
-				if ($amount > 0) {
-
-					$limit = min($limit, $amount);
-
-					if ($unread_only) {
-						$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 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[";
-	
-							$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"]);
-
-//							too slow :(							
-//							$line["tags"] = format_tags_string(
-//								get_article_tags($link, $line["id"]), $line["id"]);
-	
-							print json_encode($line);
-							print "]]></article>";
-						}	
-					}
-
-				}
-
-				print "</articles>";
-
-			}
-
-			print "</rpc-reply>";
-
-			return;
-		}
-
 		if ($subop == "digest-get-contents") {
 			$article_id = db_escape_string($_REQUEST['article_id']);
 
diff --git a/modules/pref-prefs.php b/modules/pref-prefs.php
index e291e5c11..004227939 100644
--- a/modules/pref-prefs.php
+++ b/modules/pref-prefs.php
@@ -14,7 +14,8 @@
 		$subop = $_REQUEST["subop"];
 
 		$prefs_blacklist = array("HIDE_FEEDLIST", "SYNC_COUNTERS", "ENABLE_LABELS",
-			"ENABLE_SEARCH_TOOLBAR", "HIDE_READ_FEEDS", "ENABLE_FEED_ICONS");
+			"ENABLE_SEARCH_TOOLBAR", "HIDE_READ_FEEDS", "ENABLE_FEED_ICONS", 
+			"ENABLE_OFFLINE_READING");
 
 		$profile_blacklist = array("ALLOW_DUPLICATE_POSTS", "PURGE_OLD_DAYS", 
 			"PURGE_UNREAD_ARTICLES", "DIGEST_ENABLE", "DIGEST_CATCHUP", 
-- 
cgit v1.2.3