From 8d2e3c2528e67f8650c122f014364a34bf690d2a Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Tue, 23 Feb 2021 22:26:07 +0300
Subject: drop errors.php and simplify error handling

---
 classes/handler/public.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'classes/handler/public.php')

diff --git a/classes/handler/public.php b/classes/handler/public.php
index 79dff37b5..42be6f713 100755
--- a/classes/handler/public.php
+++ b/classes/handler/public.php
@@ -240,7 +240,7 @@ class Handler_Public extends Handler {
 
 		} else {
 			header("Content-Type: text/plain; charset=utf-8");
-			print json_encode(array("error" => array("message" => "Unknown format")));
+			print "Unknown format: $format.";
 		}
 	}
 
@@ -290,7 +290,7 @@ class Handler_Public extends Handler {
 			header("Location: index.php");
 		} else {
 			header("Content-Type: text/json");
-			print error_json(6);
+			print Errors::to_json(Errors::E_UNAUTHORIZED);
 		}
 	}
 
@@ -408,7 +408,7 @@ class Handler_Public extends Handler {
 
 	function index() {
 		header("Content-Type: text/plain");
-		print error_json(13);
+		print Errors::to_json(Errors::E_UNKNOWN_METHOD);
 	}
 
 	function forgotpass() {
@@ -659,7 +659,7 @@ class Handler_Public extends Handler {
 			<div class="content">
 
 			<?php
-				@$op = clean($_REQUEST["subop"]);
+				@$op = clean($_REQUEST["subop"] ?? "");
 				$updater = new DbUpdater(Db::pdo(), Config::get(Config::DB_TYPE), SCHEMA_VERSION);
 
 				if ($op == "performupdate") {
@@ -802,17 +802,17 @@ class Handler_Public extends Handler {
 				} else {
 					user_error("PluginHandler[PUBLIC]: Requested private method '$method' of plugin '$plugin_name'.", E_USER_WARNING);
 					header("Content-Type: text/json");
-					print error_json(6);
+					print Errors::to_json(Errors::E_UNAUTHORIZED);
 				}
 			} else {
 				user_error("PluginHandler[PUBLIC]: Requested unknown method '$method' of plugin '$plugin_name'.", E_USER_WARNING);
 				header("Content-Type: text/json");
-				print error_json(13);
+				print Errors::to_json(Errors::E_UNKNOWN_METHOD);
 			}
 		} else {
 			user_error("PluginHandler[PUBLIC]: Requested method '$method' of unknown plugin '$plugin_name'.", E_USER_WARNING);
 			header("Content-Type: text/json");
-			print error_json(14);
+			print Errors::to_json(Errors::E_UNKNOWN_PLUGIN);
 		}
 	}
 
-- 
cgit v1.2.3