From fdd6ddf61baface50dbdc6120d5a27ab3a190c1a Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Fri, 18 Jan 2019 14:05:52 -0800
Subject: [PATCH] Fixed favicon upload

[ch309]
---
 app/Http/Controllers/SettingsController.php | 28 ++++++++++++++-------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/app/Http/Controllers/SettingsController.php b/app/Http/Controllers/SettingsController.php
index 5e9e1c28ae..45399b5397 100755
--- a/app/Http/Controllers/SettingsController.php
+++ b/app/Http/Controllers/SettingsController.php
@@ -440,8 +440,8 @@ class SettingsController extends Controller
 
             // If they are uploading an image, validate it and upload it
         } elseif ($request->hasFile('email_logo')) {
-            $email_image         = $request->file('email_logo');
-            $email_ext           = $image->getClientOriginalExtension();
+            $email_image         = $email_upload = $request->file('email_logo');
+            $email_ext           = $email_image->getClientOriginalExtension();
             $setting->email_logo = $email_file_name = 'email_logo.' . $email_ext;
 
             if ('svg' != $email_image->getClientOriginalExtension()) {
@@ -460,6 +460,7 @@ class SettingsController extends Controller
             }
         }
 
+
         // If the user wants to clear the favicon...
         if ('1' == $request->input('clear_favicon')) {
             Storage::disk('public')->delete($setting->clear_favicon);
@@ -467,19 +468,28 @@ class SettingsController extends Controller
 
             // If they are uploading an image, validate it and upload it
         } elseif ($request->hasFile('favicon')) {
-            $favicon_image         = $request->file('favicon');
-            $favicon_ext           = $favicon_image->getClientOriginalExtension();
-            $setting->favicon       = $favicon_file_name = 'favicon.' . $favicon_ext;
 
-            if ('svg' != $favicon_image->getClientOriginalExtension()) {
-                $favicon_upload = Image::make($favicon_image->getRealPath())->resize(null, 16, function($constraint) {
+            $favicon_image         = $favicon_upload = $request->file('favicon');
+            $favicon_ext           = $favicon_image->getClientOriginalExtension();
+            $setting->favicon      = $favicon_file_name = 'favicon-uploaded.' . $favicon_ext;
+
+            if (('ico' != $favicon_image->getClientOriginalExtension()) && ('svg' != $favicon_image->getClientOriginalExtension())) {
+                $favicon_upload = Image::make($favicon_image->getRealPath())->resize(null, 36, function($constraint) {
                     $constraint->aspectRatio();
                     $constraint->upsize();
                 });
+
+                // This requires a string instead of an object, so we use ($string)
+                Storage::disk('public')->put($favicon_file_name, (string) $favicon_upload->encode());
+            } else {
+                Storage::disk('public')->put($favicon_file_name, file_get_contents($request->file('favicon')));
             }
 
-            // This requires a string instead of an object, so we use ($string)
-            Storage::disk('public')->put($favicon_file_name, (string) $favicon_upload->encode());
+
+
+
+
+
 
             // Remove Current image if exists
             if (($setting->favicon) && (file_exists($favicon_file_name))) {