From aec6690c9e8be3f8a1a55e3d841fcd31828e8cb1 Mon Sep 17 00:00:00 2001 From: NH Gooi Date: Wed, 19 Mar 2025 22:18:22 +0100 Subject: [PATCH] Controller::API() returns null on error, so we can return 404 instead of 500. --- app/Http/Controllers/Controller.php | 5 +++-- app/Http/Controllers/RadioController.php | 5 ++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php index 1d4a55ac..63463528 100644 --- a/app/Http/Controllers/Controller.php +++ b/app/Http/Controllers/Controller.php @@ -120,8 +120,9 @@ class Controller extends BaseController . 'X-User-Agent: ' . request()->server('HTTP_USER_AGENT') . "\r\n" ] ]; - - return json_decode(file_get_contents($this->API_URL . $url, false, stream_context_create($arrContextOptions))); +//\dump($http_response_header); + $result = @file_get_contents($this->API_URL . $url, false, stream_context_create($arrContextOptions)); + return $result ? json_decode($result) : null; } protected function checkAPI($url) diff --git a/app/Http/Controllers/RadioController.php b/app/Http/Controllers/RadioController.php index b08ecf5c..5df80817 100644 --- a/app/Http/Controllers/RadioController.php +++ b/app/Http/Controllers/RadioController.php @@ -49,7 +49,10 @@ class RadioController extends Controller public function program($id) { - $apiResult = $this->API('programma/details/' . (int)$id); + $apiResult = $this->API('programma/details/' . (int)$id); + if($apiResult == null) { + return abort(404); + } return view('radioprogram', ['program' => new \Model\Program($apiResult)]); }