From 4f9aca8f3ca4ec2e2f0bd72aa6a18a7c1af13f73 Mon Sep 17 00:00:00 2001 From: Andy Miller Date: Thu, 3 Sep 2020 22:31:19 -0600 Subject: [PATCH] Cleaner error messages --- classes/admincontroller.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/classes/admincontroller.php b/classes/admincontroller.php index 95295ac5..45758e37 100644 --- a/classes/admincontroller.php +++ b/classes/admincontroller.php @@ -1100,7 +1100,11 @@ class AdminController extends AdminBaseController try { $result = Gpm::install($package, ['theme' => $type === 'theme']); } catch (\Exception $e) { - $this->admin->json_response = ['status' => 'error', 'message' => $e->getMessage()]; + $msg = $e->getMessage(); + $msg = Utils::contains($msg, '401 Unauthorized') ? "ERROR: Authorization failed for this resource" : $msg; + $msg = Utils::contains($msg, '404 Not Found') ? "ERROR: Resource not found" : $msg; + + $this->admin->json_response = ['status' => 'error', 'message' => $msg]; return false; }