diff --git a/src/opnsense/mvc/app/controllers/OPNsense/Base/ApiControllerBase.php b/src/opnsense/mvc/app/controllers/OPNsense/Base/ApiControllerBase.php index 0821cb1ff..83b2af854 100644 --- a/src/opnsense/mvc/app/controllers/OPNsense/Base/ApiControllerBase.php +++ b/src/opnsense/mvc/app/controllers/OPNsense/Base/ApiControllerBase.php @@ -268,7 +268,7 @@ class ApiControllerBase extends ControllerRoot // not authenticated $this->response->setStatusCode(403, "Forbidden"); $this->response->setContentType('application/json', 'UTF-8'); - $this->response->setJsonContent(['status' => 403,'message' => 'Forbidden']); + $this->response->setContent(['status' => 403,'message' => 'Forbidden']); $this->response->send(); return false; } else { @@ -279,7 +279,7 @@ class ApiControllerBase extends ControllerRoot if ($dispatchError != null) { $this->response->setStatusCode(400, "Bad Request"); $this->response->setContentType('application/json', 'UTF-8'); - $this->response->setJsonContent(['status' => 400, 'message' => $dispatchError]); + $this->response->setContent(['status' => 400, 'message' => $dispatchError]); $this->response->send(); return false; } @@ -301,7 +301,7 @@ class ApiControllerBase extends ControllerRoot // not authenticated $this->response->setStatusCode(401, "Unauthorized"); $this->response->setContentType('application/json', 'UTF-8'); - $this->response->setJsonContent(['status' => 401, 'message' => 'Authentication Failed']); + $this->response->setContent(['status' => 401, 'message' => 'Authentication Failed']); $this->response->send(); return false; } else { diff --git a/src/opnsense/mvc/app/library/OPNsense/Mvc/Response.php b/src/opnsense/mvc/app/library/OPNsense/Mvc/Response.php index b003b25b5..8e3c3d194 100644 --- a/src/opnsense/mvc/app/library/OPNsense/Mvc/Response.php +++ b/src/opnsense/mvc/app/library/OPNsense/Mvc/Response.php @@ -107,7 +107,11 @@ class Response fpassthru($this->content); @fclose($this->content); } elseif (!empty($this->content)) { - echo $this->content; + if (is_array($this->content)) { + echo json_encode($this->content); + } else { + echo $this->content; + } } $this->sent = true;