MrUnknownDE/panel
1
0
Fork 0
mirror of https://github.com/MrUnknownDE/panel.git synced 2026-04-18 22:33:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

Begin implementation of new daemon authentication scheme

Browse Source
This commit is contained in:
Dane Everitt
2017-09-23 20:45:25 -05:00
parent 8722571037
commit 906a699ee2
23 changed files with 796 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/Exceptions/Handler.php
View File

@@ -66,11 +66,16 @@ class Handler extends ExceptionHandler
$displayError = 'An unhandled exception was encountered with this request.';
}
$response = response()->json([
'error' => $displayError,
'http_code' => (! $this->isHttpException($exception)) ?: $exception->getStatusCode(),
'trace' => (! config('app.debug')) ? null : class_basename($exception) . ' in ' . $exception->getFile() . ' on line ' . $exception->getLine(),
], ($this->isHttpException($exception)) ? $exception->getStatusCode() : 500, [], JSON_UNESCAPED_SLASHES);
$response = response()->json(
[
'error' => $displayError,
'http_code' => (! $this->isHttpException($exception)) ?: $exception->getStatusCode(),
'trace' => (! config('app.debug')) ? null : $exception->getTrace(),
],
$this->isHttpException($exception) ? $exception->getStatusCode() : 500,
$this->isHttpException($exception) ? $exception->getHeaders() : [],
JSON_UNESCAPED_SLASHES
);
parent::report($exception);
} elseif ($exception instanceof DisplayException) {