From 028384584b030e3eb83e9dbdfecfec00d2957bf8 Mon Sep 17 00:00:00 2001
From: Dominik Pfennig <dominik@suma-ev.de>
Date: Tue, 26 Jul 2016 09:11:57 +0200
Subject: [PATCH] Wenn der PictureProxy ein Bild nicht abrufen kann, wirft er
keinen Error mehr
---
app/Http/Controllers/Pictureproxy.php | 25 +++++++++++++++----------
1 file changed, 15 insertions(+), 10 deletions(-)
diff --git a/app/Http/Controllers/Pictureproxy.php b/app/Http/Controllers/Pictureproxy.php
index efcea2918..45312e78e 100644
--- a/app/Http/Controllers/Pictureproxy.php
+++ b/app/Http/Controllers/Pictureproxy.php
@@ -17,19 +17,24 @@ class Pictureproxy extends Controller
function get(Request $request) {
if( $request->has('url') )
{
- $file = file_get_contents($request->input('url'));
- $responseCode = explode(" ", $http_response_header[0])[1];
- $contentType = "";
- foreach($http_response_header as $header)
- {
- if( strpos($header, "Content-Type:") === 0)
+ try{
+ $file = file_get_contents($request->input('url'));
+ $responseCode = explode(" ", $http_response_header[0])[1];
+ $contentType = "";
+ foreach($http_response_header as $header)
{
- $tmp = explode(": ", $header);
- $contentType = $tmp[1];
+ if( strpos($header, "Content-Type:") === 0)
+ {
+ $tmp = explode(": ", $header);
+ $contentType = $tmp[1];
+ }
}
+ $response = Response::make($file, $responseCode);
+ $response->header('Content-Type', $contentType);
+ }catch(\ErrorException $e)
+ {
+ $response = Response::make("", 404);
}
- $response = Response::make($file, $responseCode);
- $response->header('Content-Type', $contentType);
return $response;
}
}
--
GitLab