From ea464aa814d3dcccc029191a8a0cf604f64978d9 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Mon, 20 Mar 2017 16:02:59 +0200
Subject: [PATCH] Handle image upload exception

---
 app/Http/Controllers/AccountController.php | 39 ++++++++++++----------
 resources/lang/en/texts.php                |  3 ++
 2 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/app/Http/Controllers/AccountController.php b/app/Http/Controllers/AccountController.php
index c39b1cfb69..96f8d11e6e 100644
--- a/app/Http/Controllers/AccountController.php
+++ b/app/Http/Controllers/AccountController.php
@@ -37,6 +37,7 @@ use Request;
 use Response;
 use Session;
 use stdClass;
+use Exception;
 use URL;
 use Utils;
 
@@ -1053,28 +1054,32 @@ class AccountController extends BaseController
                 $size = filesize($filePath);
 
                 if ($size / 1000 > MAX_DOCUMENT_SIZE) {
-                    Session::flash('warning', 'File too large');
+                    Session::flash('warning', trans('texts.logo_warning_too_large'));
                 } else {
                     if ($documentType != 'gif') {
                         $account->logo = $account->account_key.'.'.$documentType;
 
-                        $imageSize = getimagesize($filePath);
-                        $account->logo_width = $imageSize[0];
-                        $account->logo_height = $imageSize[1];
-                        $account->logo_size = $size;
+                        try {
+                            $imageSize = getimagesize($filePath);
+                            $account->logo_width = $imageSize[0];
+                            $account->logo_height = $imageSize[1];
+                            $account->logo_size = $size;
 
-                        // make sure image isn't interlaced
-                        if (extension_loaded('fileinfo')) {
-                            $image = Image::make($path);
-                            $image->interlace(false);
-                            $imageStr = (string) $image->encode($documentType);
-                            $disk->put($account->logo, $imageStr);
+                            // make sure image isn't interlaced
+                            if (extension_loaded('fileinfo')) {
+                                $image = Image::make($path);
+                                $image->interlace(false);
+                                $imageStr = (string) $image->encode($documentType);
+                                $disk->put($account->logo, $imageStr);
 
-                            $account->logo_size = strlen($imageStr);
-                        } else {
-                            $stream = fopen($filePath, 'r');
-                            $disk->getDriver()->putStream($account->logo, $stream, ['mimetype' => $documentTypeData['mime']]);
-                            fclose($stream);
+                                $account->logo_size = strlen($imageStr);
+                            } else {
+                                $stream = fopen($filePath, 'r');
+                                $disk->getDriver()->putStream($account->logo, $stream, ['mimetype' => $documentTypeData['mime']]);
+                                fclose($stream);
+                            }
+                        } catch (Exception $exception) {
+                            Session::flash('warning', trans('texts.logo_warning_invalid'));
                         }
                     } else {
                         if (extension_loaded('fileinfo')) {
@@ -1092,7 +1097,7 @@ class AccountController extends BaseController
                             $account->logo_width = $image->width();
                             $account->logo_height = $image->height();
                         } else {
-                            Session::flash('warning', 'Warning: To support gifs the fileinfo PHP extension needs to be enabled.');
+                            Session::flash('warning', trans('texts.logo_warning_fileinfo'));
                         }
                     }
                 }
diff --git a/resources/lang/en/texts.php b/resources/lang/en/texts.php
index 29804b7db4..8efb410c2b 100644
--- a/resources/lang/en/texts.php
+++ b/resources/lang/en/texts.php
@@ -2422,6 +2422,9 @@ $LANG = array(
     'fees_surcharge_help' => 'Customize surcharge :link.',
     'label_and_taxes' => 'label and taxes',
     'billable' => 'Billable',
+    'logo_warning_too_large' => 'The image file is too large.',
+    'logo_warning_fileinfo' => 'Warning: To support gifs the fileinfo PHP extension needs to be enabled.',
+    'logo_warning_invalid' => 'There was a problem reading the image file, please try a different format.',
 
 );