better fatal error handling by frontend (remove error.php)

1 files changed, 25 insertions, 4 deletions

diff --git a/tt-rss.js b/tt-rss.js
index 06f9fadc0..6ad0adff7 100644
--- a/tt-rss.js
+++ b/tt-rss.js
@@ -124,7 +124,7 @@ function refetch_callback() {
 			var error_code = reply.getAttribute("error-code");
 		
 			if (error_code && error_code != 0) {
-				return fatalError(error_code);
+				return fatalError(error_code, reply.getAttribute("error-msg"));
 			}
 	
 			var f_document = window.frames["feeds-frame"].document;
@@ -153,21 +153,21 @@ function backend_sanity_check_callback() {
 		try {
 		
 			if (!xmlhttp.responseXML) {
-				fatalError(3, "D001: " + xmlhttp.responseText);
+				fatalError(3, "[D001, Reply is not XML]: " + xmlhttp.responseText);
 				return;
 			}
 	
 			var reply = xmlhttp.responseXML.firstChild;
 	
 			if (!reply) {
-				fatalError(3, "D002: " + xmlhttp.responseText);
+				fatalError(3, "[D002, Invalid RPC reply]: " + xmlhttp.responseText);
 				return;
 			}
 	
 			var error_code = reply.getAttribute("error-code");
 		
 			if (error_code && error_code != 0) {
-				return fatalError(error_code);
+				return fatalError(error_code, reply.getAttribute("error-msg"));
 			}
 	
 			debug("sanity check ok");
@@ -697,3 +697,24 @@ function debug(msg) {
 		c.innerHTML = "<li>[" + ts + "] " + msg + "</li>" + c.innerHTML;
 	}
 }
+
+function fatalError(code, message) {
+/*	if (!params) {
+		window.location = "error.php?c=" + param_escape(code);
+	} else {
+		window.location = "error.php?c=" + param_escape(code) + 
+			"&p=" + param_escape(params);
+	} */
+
+	try {	
+		var fe = document.getElementById("fatal_error");
+		var fc = document.getElementById("fatal_error_msg");
+
+		fc.innerHTML = "Code " + code + ": " + message;
+
+		fe.style.display = "block";
+
+	} catch (e) {
+		exception_error("fatalError", e);
+	}
+}