prefs RPC optimizations

3 files changed, 32 insertions, 12 deletions

diff --git a/backend.php b/backend.php
index 4a1d52ce7..d6e45098b 100644
--- a/backend.php
+++ b/backend.php
@@ -207,19 +207,17 @@
 
 	}
 
-	if ($op == "pref-feeds") {
-	
-		$subop = $_GET["subop"];
+	if ($op == "pref-rpc") {
 
-		if ($subop == "edit") {
-			print "<p>[Edit feed placeholder]</p>";
-		}
+		$subop = $_GET["subop"];
 
 		if ($subop == "unread") {
 			$ids = split(",", $_GET["ids"]);
 			foreach ($ids as $id) {
 				pg_query("UPDATE ttrss_entries SET unread = true WHERE feed_id = '$id'");
 			}
+
+			print "Marked selected feeds as read.";
 		}
 
 		if ($subop == "read") {
@@ -227,6 +225,19 @@
 			foreach ($ids as $id) {
 				pg_query("UPDATE ttrss_entries SET unread = false WHERE feed_id = '$id'");
 			}
+
+			print "Marked selected feeds as unread.";
+
+		}
+
+	}
+
+	if ($op == "pref-feeds") {
+	
+		$subop = $_GET["subop"];
+
+		if ($subop == "edit") {
+			print "<p>[Edit feed placeholder]</p>";
 		}
 
 		if ($subop == "remove") {
diff --git a/prefs.js b/prefs.js
index 001d5b0a8..192e194fe 100644
--- a/prefs.js
+++ b/prefs.js
@@ -32,7 +32,14 @@ function feedlist_callback() {
 	}
 }
 
-function update_feeds() {
+function notify_callback() {
+	var container = document.getElementById('notify');
+	if (xmlhttp.readyState == 4) {
+		container.innerHTML=xmlhttp.responseText;
+	}
+}
+
+function updateFeedList() {
 
 	document.getElementById("feeds").innerHTML = "Loading feeds, please wait...";
 
@@ -111,9 +118,9 @@ function readSelectedFeeds() {
 
 		notify("Marking selected feeds as read...");
 
-		xmlhttp.open("GET", "backend.php?op=pref-feeds&subop=unread&ids="+
+		xmlhttp.open("GET", "backend.php?op=pref-rpc&subop=unread&ids="+
 			param_escape(sel_rows.toString()), true);
-		xmlhttp.onreadystatechange=feedlist_callback;
+		xmlhttp.onreadystatechange=notify_callback;
 		xmlhttp.send(null);
 
 	} else {
@@ -131,9 +138,9 @@ function unreadSelectedFeeds() {
 
 		notify("Marking selected feeds as unread...");
 
-		xmlhttp.open("GET", "backend.php?op=pref-feeds&subop=unread&ids="+
+		xmlhttp.open("GET", "backend.php?op=pref-rpc&subop=unread&ids="+
 			param_escape(sel_rows.toString()), true);
-		xmlhttp.onreadystatechange=feedlist_callback;
+		xmlhttp.onreadystatechange=notify_callback;
 		xmlhttp.send(null);
 
 	} else {
@@ -166,7 +173,7 @@ function removeSelectedFeeds() {
 
 function init() {
 	
-	update_feeds();
+	updateFeedList();
 
 	notify("");
 
diff --git a/prefs.php b/prefs.php
index 79ffcf111..1d3755a60 100644
--- a/prefs.php
+++ b/prefs.php
@@ -42,6 +42,8 @@
 				href="javascript:readSelectedFeeds()">Mark as read</a>&nbsp;
 			<a class="button" 
 				href="javascript:unreadSelectedFeeds()">Mark as unread</a>&nbsp;
+			<a class="button" 
+				href="javascript:updateFeedList()">Refresh</a>&nbsp;
 
 		<hr>