X-Git-Url: https://git.wh0rd.org/?p=tt-rss.git;a=blobdiff_plain;f=backend.php;h=b2eba083eefb88231300a1349eee150609adbc03;hp=c69d6d98baa277778f08e1f7472c491e2b151636;hb=e2b8c9273e09091c235959c25d8e4d8122aa6ca8;hpb=1ffe3391f902c4baa984982f19e61a0e45de21ff

diff --git a/backend.php b/backend.php
index c69d6d98..b2eba083 100644
--- a/backend.php
+++ b/backend.php
@@ -63,7 +63,7 @@
 	if ($_SESSION["uid"]) {
 		if (!validate_session()) {
 			header("Content-Type: text/json");
-			print json_encode(array("error" => array("code" => 6)));
+			print error_json(6);
 			return;
 		}
 		load_user_plugins( $_SESSION["uid"]);
@@ -81,21 +81,21 @@
 	$update_intervals = array(
 		0   => __("Default interval"),
 		-1  => __("Disable updates"),
-		15  => __("Each 15 minutes"),
-		30  => __("Each 30 minutes"),
+		15  => __("15 minutes"),
+		30  => __("30 minutes"),
 		60  => __("Hourly"),
-		240 => __("Each 4 hours"),
-		720 => __("Each 12 hours"),
+		240 => __("4 hours"),
+		720 => __("12 hours"),
 		1440 => __("Daily"),
 		10080 => __("Weekly"));
 
 	$update_intervals_nodefault = array(
 		-1  => __("Disable updates"),
-		15  => __("Each 15 minutes"),
-		30  => __("Each 30 minutes"),
+		15  => __("15 minutes"),
+		30  => __("30 minutes"),
 		60  => __("Hourly"),
-		240 => __("Each 4 hours"),
-		720 => __("Each 12 hours"),
+		240 => __("4 hours"),
+		720 => __("12 hours"),
 		1440 => __("Daily"),
 		10080 => __("Weekly"));
 
@@ -104,13 +104,6 @@
 		5 => __("Power User"),
 		10 => __("Administrator"));
 
-	#$error = sanity_check();
-
-	#if ($error['code'] != 0 && $op != "logout") {
-	#	print json_encode(array("error" => $error));
-	#	return;
-	#}
-
 	$op = str_replace("-", "_", $op);
 
 	$override = PluginHost::getInstance()->lookup_handler($op, $method);
@@ -120,7 +113,7 @@
 		if ($override) {
 			$handler = $override;
 		} else {
-			$handler = new $op(Db::get(), $_REQUEST);
+			$handler = new $op($_REQUEST);
 		}
 
 		if ($handler && implements_interface($handler, 'IHandler')) {
@@ -137,18 +130,18 @@
 					return;
 				} else {
 					header("Content-Type: text/json");
-					print json_encode(array("error" => array("code" => 6)));
+					print error_json(6);
 					return;
 				}
 			} else {
 				header("Content-Type: text/json");
-				print json_encode(array("error" => array("code" => 6)));
+				print error_json(6);
 				return;
 			}
 		}
 	}
 
 	header("Content-Type: text/json");
-	print json_encode(array("error" => array("code" => 7)));
+	print error_json(13);
 
 ?>