rpc mark/pub return proper counters, rework all_counters_callback

3 files changed, 18 insertions, 4 deletions

diff --git a/functions.js b/functions.js
index 041311dfa..a33302063 100644
--- a/functions.js
+++ b/functions.js
@@ -782,11 +782,11 @@ function parse_counters_reply(xmlhttp, scheduled_call) {
 		return fatalError(error_code, error_msg);
 	}
 
-	var counters = reply.firstChild;
+	var counters = reply.getElementsByTagName("counters")[0];
 	
 	parse_counters(counters, scheduled_call);
 
-	var runtime_info = counters.nextSibling;
+	var runtime_info = reply.getElementsByTagName("runtime-info")[0];
 
 	parse_runtime_info(runtime_info);
 
diff --git a/modules/backend-rpc.php b/modules/backend-rpc.php
index 3303b25f9..3a30543dd 100644
--- a/modules/backend-rpc.php
+++ b/modules/backend-rpc.php
@@ -68,7 +68,13 @@
 			$result = db_query($link, "UPDATE ttrss_user_entries SET marked = $mark
 				WHERE ref_id = '$id' AND owner_uid = " . $_SESSION["uid"]);
 
-			print "<rpc-reply><mark>$id</mark></rpc-reply>";
+			print "<rpc-reply><counters>";
+			getGlobalCounters($link);
+			getLabelCounters($link);
+			if (get_pref($link, 'ENABLE_FEED_CATS')) {
+				getCategoryCounters($link);
+			}
+			print "</counters></rpc-reply>";
 
 		}
 
@@ -87,7 +93,13 @@
 			$result = db_query($link, "UPDATE ttrss_user_entries SET published = $pub
 				WHERE ref_id = '$id' AND owner_uid = " . $_SESSION["uid"]);
 
-			print "<rpc-reply><pub>$id</pub></rpc-reply>";
+			print "<rpc-reply><counters>";
+			getGlobalCounters($link);
+			getLabelCounters($link);
+			if (get_pref($link, 'ENABLE_FEED_CATS')) {
+				getCategoryCounters($link);
+			}
+			print "</counters></rpc-reply>";
 
 		}
 
diff --git a/viewfeed.js b/viewfeed.js
index a9a413acb..b1fbdd800 100644
--- a/viewfeed.js
+++ b/viewfeed.js
@@ -440,6 +440,8 @@ function toggleMark(id) {
 	
 		//new Ajax.Request(query); */
 
+		debug(query);
+
 		xmlhttp_rpc.open("GET", query, true);
 		xmlhttp_rpc.onreadystatechange=all_counters_callback;
 		xmlhttp_rpc.send(null);