X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=errors.php;h=f7333fd1af0098c4fba6bf1128e30fbfa9ad1990;hb=7270dab2e9847538d937add03040ed71f2fd73ac;hp=967bb4e33aea29353559897290b62448119488d6;hpb=8dc062e5274e6dd23972f2f1470ec8447c90ccfc;p=tt-rss.git

diff --git a/errors.php b/errors.php
index 967bb4e3..f7333fd1 100644
--- a/errors.php
+++ b/errors.php
@@ -1,28 +1,50 @@
 <?php
-	$ERRORS[0] = _("Unknown error");
+	set_include_path(dirname(__FILE__) ."/include" . PATH_SEPARATOR .
+		get_include_path());
 
-	$ERRORS[1] = _("This program requires XmlHttpRequest " .
+	require_once "functions.php";
+
+	$ERRORS[0] = "";
+
+	$ERRORS[1] = __("This program requires XmlHttpRequest " .
 			"to function properly. Your browser doesn't seem to support it.");
 
-	$ERRORS[2] = _("This program requires cookies " .
+	$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='db-updater.php'&gt;Please update&lt;/a&gt;.");
+
+	$ERRORS[6] = __("Request not authorized.");
+
+	$ERRORS[7] = __("No operation to perform.");
+
+	$ERRORS[8] = __("Could not display feed: query failed. Please check label match syntax or local configuration.");
+
+	$ERRORS[8] = __("Denied. Your access level is insufficient to access this page.");
+
+	$ERRORS[9] = __("Configuration check failed");
 
-	$ERRORS[4] = _("Frontend sanity check failed.");
+	$ERRORS[10] = __("Your version of MySQL is not currently supported. Please see official site for more information.");
 
-	$ERRORS[5] = _("Incorrect database schema version. <a href='update.php'>Please update</a>.");
+	$ERRORS[11] = "[This error is not returned by server]";
 
-	$ERRORS[6] = _("Request not authorized.");
+	$ERRORS[12] = __("SQL escaping test failed, check your database and PHP configuration");
 
-	$ERRORS[7] = _("No operation to perform.");
+	if ($_REQUEST['mode'] == 'js') {
+		header("Content-Type: text/javascript; charset=UTF-8");
 
-	$ERRORS[8] = _("Could not display feed: query failed. Please check label match syntax or local configuration.");
+		print "var ERRORS = [];\n";
 
-	$ERRORS[8] = _("Denied. Your access level is insufficient to access this page.");
+		foreach ($ERRORS as $id => $error) {
 
-	$ERRORS[9] = _("Configuration check failed");
+			$error = preg_replace("/\n/", "", $error);
+			$error = preg_replace("/\"/", "\\\"", $error);
 
-	$ERRORS[10] = _("Your version of MySQL is not currently supported. Please see 
-		official site for more information.");
+			print "ERRORS[$id] = \"$error\";\n";
+		}
+	}
 ?>