X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=errors.php;h=f7333fd1af0098c4fba6bf1128e30fbfa9ad1990;hb=6383c9c53a280e50216fea88a9852fee46b41229;hp=9fb028ecac9024e710d02f084dc9797545c615ac;hpb=7a09510c022a6b28b5a90d97a438ddb81ac20314;p=tt-rss.git

diff --git a/errors.php b/errors.php
index 9fb028ec..f7333fd1 100644
--- a/errors.php
+++ b/errors.php
@@ -1,6 +1,10 @@
 <?php
+	set_include_path(dirname(__FILE__) ."/include" . PATH_SEPARATOR .
+		get_include_path());
 
-	$ERRORS[0] = __("Unknown error");
+	require_once "functions.php";
+
+	$ERRORS[0] = "";
 
 	$ERRORS[1] = __("This program requires XmlHttpRequest " .
 			"to function properly. Your browser doesn't seem to support it.");
@@ -8,11 +12,11 @@
 	$ERRORS[2] = __("This program requires cookies " .
 			"to function properly. Your browser doesn't seem to support them.");
 
-	$ERRORS[3] = __("Backend sanity check failed");
+	$ERRORS[3] = __("Backend sanity check failed.");
 
 	$ERRORS[4] = __("Frontend sanity check failed.");
 
-	$ERRORS[5] = __("Incorrect database schema version. &lt;a href='update.php'&gt;Please update&lt;/a&gt;.");
+	$ERRORS[5] = __("Incorrect database schema version. &lt;a href='db-updater.php'&gt;Please update&lt;/a&gt;.");
 
 	$ERRORS[6] = __("Request not authorized.");
 
@@ -24,9 +28,23 @@
 
 	$ERRORS[9] = __("Configuration check failed");
 
-	$ERRORS[10] = __("Your version of MySQL is not currently supported. Please see 
-		official site for more information.");
+	$ERRORS[10] = __("Your version of MySQL is not currently supported. Please see official site for more information.");
+
+	$ERRORS[11] = "[This error is not returned by server]";
+
+	$ERRORS[12] = __("SQL escaping test failed, check your database and PHP configuration");
+
+	if ($_REQUEST['mode'] == 'js') {
+		header("Content-Type: text/javascript; charset=UTF-8");
+
+		print "var ERRORS = [];\n";
+
+		foreach ($ERRORS as $id => $error) {
+
+			$error = preg_replace("/\n/", "", $error);
+			$error = preg_replace("/\"/", "\\\"", $error);
 
-	$ERRORS[11] = __("Sanity check request received twice. You could be running
-		Firebug or some other disrupting extension. Please turn it off.");
+			print "ERRORS[$id] = \"$error\";\n";
+		}
+	}
 ?>