From e372527d1398f67d8d9c939852cd81f1ee6f3d06 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Thu, 4 Jul 2024 13:22:36 +0100
Subject: [PATCH 01/15] Added default_avatar to settings

Signed-off-by: snipe <snipe@snipe.net>
---
 app/Http/Controllers/SettingsController.php   | 33 ++++++++++---------
 .../partials/forms/edit/uploadLogo.blade.php  | 17 +++++-----
 resources/views/settings/branding.blade.php   | 13 +++++++-
 3 files changed, 38 insertions(+), 25 deletions(-)

diff --git a/app/Http/Controllers/SettingsController.php b/app/Http/Controllers/SettingsController.php
index a3c3cab8f7..77da651038 100755
--- a/app/Http/Controllers/SettingsController.php
+++ b/app/Http/Controllers/SettingsController.php
@@ -393,10 +393,11 @@ class SettingsController extends Controller
      *
      * @since [v1.0]
      *
-     * @return View
+     * @return \Illuminate\Contracts\View\View | \Illuminate\Http\RedirectResponse
      */
     public function postBranding(ImageUploadRequest $request)
     {
+        // Something has gone horribly wrong - no settings record exists!
         if (is_null($setting = Setting::getSettings())) {
             return redirect()->to('admin')->with('error', trans('admin/settings/message.update.error'));
         }
@@ -407,51 +408,53 @@ class SettingsController extends Controller
         $setting->version_footer = $request->input('version_footer');
         $setting->footer_text = $request->input('footer_text');
         $setting->skin = $request->input('skin');
-        $setting->allow_user_skin = $request->input('allow_user_skin');
+        $setting->allow_user_skin = $request->input('allow_user_skin', '0');
         $setting->show_url_in_emails = $request->input('show_url_in_emails', '0');
         $setting->logo_print_assets = $request->input('logo_print_assets', '0');
 
-        // Only allow the site name and CSS to be changed if lock_passwords is false
+        // Only allow the site name, images, and CSS to be changed if lock_passwords is false
         // Because public demos make people act like dicks
 
-        if (! config('app.lock_passwords')) {
-            $request->validate(['site_name' => 'required']);
+        if (!config('app.lock_passwords')) {
             $setting->site_name = $request->input('site_name');
             $setting->custom_css = $request->input('custom_css');
-            $setting = $request->handleImages($setting, 600, 'logo', '', 'logo');
 
+            // Logo upload
+            $setting = $request->handleImages($setting, 600, 'logo', '', 'logo');
             if ('1' == $request->input('clear_logo')) {
                 Storage::disk('public')->delete($setting->logo);
                 $setting->logo = null;
                 $setting->brand = 1;
             }
 
-
+            // Email logo upload
             $setting = $request->handleImages($setting, 600, 'email_logo', '', 'email_logo');
-
-
             if ('1' == $request->input('clear_email_logo')) {
                 Storage::disk('public')->delete($setting->email_logo);
                 $setting->email_logo = null;
                 // If they are uploading an image, validate it and upload it
             }
 
-
+             // Label logo upload
             $setting = $request->handleImages($setting, 600, 'label_logo', '', 'label_logo');
-
             if ('1' == $request->input('clear_label_logo')) {
                 Storage::disk('public')->delete($setting->label_logo);
                 $setting->label_logo = null;
             }
 
-
-            $setting = $request->handleImages($setting, 600, 'favicon', '', 'favicon');
-
-            // If the user wants to clear the favicon...
+            // Favicon upload
+            $setting = $request->handleImages($setting, 100, 'favicon', '', 'favicon');
             if ('1' == $request->input('clear_favicon')) {
                 Storage::disk('public')->delete($setting->favicon);
                 $setting->favicon = null;
             }
+
+            // Default avatar upload
+            $setting = $request->handleImages($setting, 500, 'default_avatar', 'avatars', 'default_avatar');
+            if ($request->input('clear_default_avatar') == '1') {
+                Storage::disk('public')->delete('avatars/'.$setting->default_avatar);
+                $setting->default_avatar = null;
+            }
         }
 
         if ($setting->save()) {
diff --git a/resources/views/partials/forms/edit/uploadLogo.blade.php b/resources/views/partials/forms/edit/uploadLogo.blade.php
index 85034ff5f3..b7c9cf49ae 100644
--- a/resources/views/partials/forms/edit/uploadLogo.blade.php
+++ b/resources/views/partials/forms/edit/uploadLogo.blade.php
@@ -9,7 +9,7 @@
     <div class="col-md-9">
         <label class="btn btn-default{{ (config('app.lock_passwords')) ? ' disabled' : '' }}">
             {{ trans('button.select_file')  }}
-            <input type="file" name="{{ $logoVariable }}" class="js-uploadFile" id="{{ $logoId }}" accept="{{ (isset($allowedTypes) ? $allowedTypes : "image/gif,image/jpeg,image/webp,image/png,image/svg,image/svg+xml") }}" data-maxsize="{{ $maxSize ?? Helper::file_upload_max_size() }}"
+            <input type="file" name="{{ $logoVariable }}" class="js-uploadFile" id="{{ $logoId }}" accept="{{  $allowedTypes ?? "image/gif,image/jpeg,image/webp,image/png,image/svg,image/svg+xml" }}" data-maxsize="{{ $maxSize ?? Helper::file_upload_max_size() }}"
                    style="display:none; max-width: 90%"{{ (config('app.lock_passwords')) ? ' disabled' : '' }}>
         </label>
 
@@ -28,13 +28,12 @@
     </div>
 
     <div class="col-md-9 col-md-offset-3">
-
-            @if (($setting->$logoVariable!='') && (Storage::disk('public')->exists(e($snipeSettings->$logoVariable))))
-            <div class="pull-left" style="padding-right: 20px;">
-                <a href="{{ Storage::disk('public')->url(e($snipeSettings->$logoVariable)) }}"{!! ($logoVariable!='favicon') ? ' data-toggle="lightbox"' : '' !!}>
-                    <img id="{{ $logoId }}-imagePreview" style="height: 80px; padding-bottom: 5px;" alt="" src="{{ Storage::disk('public')->url(e($snipeSettings->$logoVariable)) }}">
-                </a>
-            </div>
+            @if (($setting->$logoVariable!='') && (Storage::disk('public')->exists(($logoPath ?? ''). $snipeSettings->$logoVariable)))
+                <div class="pull-left" style="padding-right: 20px;">
+                    <a href="{{ Storage::disk('public')->url(e(($logoPath ?? '').$snipeSettings->$logoVariable)) }}"{!! ($logoVariable!='favicon') ? ' data-toggle="lightbox"' : '' !!}>
+                        <img id="{{ $logoId }}-imagePreview" style="height: 80px; padding-bottom: 5px;" alt="" src="{{ Storage::disk('public')->url(e(($logoPath ?? ''). $snipeSettings->$logoVariable)) }}">
+                    </a>
+                </div>
             @endif
 
             <div id="{{ $logoId }}-previewContainer" style="display: none;">
@@ -44,7 +43,7 @@
 
 
     </div>
-    @if (($setting->$logoVariable!='') && (Storage::disk('public')->exists(e($snipeSettings->$logoVariable))))
+    @if (($setting->$logoVariable!='') && (Storage::disk('public')->exists(($logoPath ?? '').$snipeSettings->$logoVariable)))
 
     <div class="col-md-9 col-md-offset-3">
         <label id="{{ $logoId }}-deleteCheckbox" for="{{ $logoClearVariable }}" style="font-weight: normal" class="form-control">
diff --git a/resources/views/settings/branding.blade.php b/resources/views/settings/branding.blade.php
index 150f887121..3bc2121811 100644
--- a/resources/views/settings/branding.blade.php
+++ b/resources/views/settings/branding.blade.php
@@ -109,7 +109,18 @@
                         "maxSize" => 20000
                     ])
 
-                    <!-- Include logo in print assets -->
+                    <!-- Default Avatar -->
+                    @include('partials/forms/edit/uploadLogo', [
+                        "logoVariable" => "default_avatar",
+                        "logoId" => "defaultAvatar",
+                        "logoLabel" => trans('admin/settings/general.default_avatar'),
+                        "logoClearVariable" => "clear_default_avatar",
+                        "logoPath" => "avatars/",
+                        "helpBlock" => trans('general.image_filetypes_help', ['size' => Helper::file_upload_max_size_readable()]),
+                    ])
+
+
+                        <!-- Include logo in print assets -->
                         <div class="form-group">
                             <div class="col-md-3">
                                 <strong>{{ trans('admin/settings/general.logo_print_assets') }}</strong>

From c57f1f9d7d2dcb118e7aea1f753cea77f7b544e6 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Thu, 4 Jul 2024 13:22:56 +0100
Subject: [PATCH 02/15] Use null coalescence

Signed-off-by: snipe <snipe@snipe.net>
---
 app/Http/Transformers/UsersTransformer.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Http/Transformers/UsersTransformer.php b/app/Http/Transformers/UsersTransformer.php
index 64752d0445..0b573b8388 100644
--- a/app/Http/Transformers/UsersTransformer.php
+++ b/app/Http/Transformers/UsersTransformer.php
@@ -24,7 +24,7 @@ class UsersTransformer
 
         $array = [
                 'id' => (int) $user->id,
-                'avatar' => e($user->present()->gravatar),
+                'avatar' => e($user->present()->gravatar) ?? null,
                 'name' => e($user->getFullNameAttribute()),
                 'first_name' => e($user->first_name),
                 'last_name' => e($user->last_name),

From 9527aac242c2ecde08feb25b5c5841ab9944d8ad Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Thu, 4 Jul 2024 13:23:17 +0100
Subject: [PATCH 03/15] Make site name required at the model

Signed-off-by: snipe <snipe@snipe.net>
---
 app/Models/Setting.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/Models/Setting.php b/app/Models/Setting.php
index 30600aea56..5a6b216167 100755
--- a/app/Models/Setting.php
+++ b/app/Models/Setting.php
@@ -49,6 +49,7 @@ class Setting extends Model
      * @var array
      */
     protected $rules = [
+          'site_name'                           => 'required',
           'brand'                               => 'required|min:1|numeric',
           'qr_text'                             => 'max:31|nullable',
           'alert_email'                         => 'email_array|nullable',

From 446bc81d3a1e122118b8c19f99c2832823446c86 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Thu, 4 Jul 2024 13:23:31 +0100
Subject: [PATCH 04/15] Updated presenter to use new avatar

Signed-off-by: snipe <snipe@snipe.net>
---
 app/Presenters/UserPresenter.php | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/app/Presenters/UserPresenter.php b/app/Presenters/UserPresenter.php
index d0f5c13fec..f60db150a1 100644
--- a/app/Presenters/UserPresenter.php
+++ b/app/Presenters/UserPresenter.php
@@ -432,6 +432,8 @@ class UserPresenter extends Presenter
      */
     public function gravatar()
     {
+
+        // User's specific avatar
         if ($this->avatar) {
 
             // Check if it's a google avatar or some external avatar
@@ -443,6 +445,8 @@ class UserPresenter extends Presenter
             return Storage::disk('public')->url('avatars/'.e($this->avatar));
         }
 
+
+        // Fall back to Gravatar if the settings allow loading remote scripts
         if (Setting::getSettings()->load_remote == '1') {
             if ($this->model->gravatar != '') {
 
@@ -456,8 +460,12 @@ class UserPresenter extends Presenter
             }
         }
 
-        // Set a fun, gender-neutral default icon
-        return config('app.url').'/img/default-sm.png';
+        // If there is a default avatar
+        if (Setting::getSettings()->default_avatar!= '') {
+            return Storage::disk('public')->url('avatars/'.e(Setting::getSettings()->default_avatar));
+        }
+
+        return false;
     }
 
     /**

From 278bf3da1345f6ec667f93cac1c3e10f5460ed05 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Thu, 4 Jul 2024 13:23:38 +0100
Subject: [PATCH 05/15] Updated language

Signed-off-by: snipe <snipe@snipe.net>
---
 resources/lang/en-US/admin/settings/general.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/resources/lang/en-US/admin/settings/general.php b/resources/lang/en-US/admin/settings/general.php
index 8074f5082e..dca13b9855 100644
--- a/resources/lang/en-US/admin/settings/general.php
+++ b/resources/lang/en-US/admin/settings/general.php
@@ -122,8 +122,8 @@ return [
     'ldap_test'                 => 'Test LDAP',
     'ldap_test_sync'            => 'Test LDAP Synchronization',
     'license'                   => 'Software License',
-    'load_remote'               => 'Use Gravatar',
-    'load_remote_help_text'		=> 'Uncheck this box if your install cannot load scripts from the outside internet. This will prevent Snipe-IT from trying load images from Gravatar.',
+    'load_remote'               => 'Load Remote Avatars',
+    'load_remote_help_text'		=> 'Uncheck this box if your install cannot load scripts from the outside internet. This will prevent Snipe-IT from trying load avatars from Gravatar or other outside sources.',
     'login'                     => 'Login Attempts',
     'login_attempt'             => 'Login Attempt',
     'login_ip'                  => 'IP Address',
@@ -375,5 +375,6 @@ return [
     'timezone' => 'Timezone',
     'profile_edit'          => 'Edit Profile',
     'profile_edit_help'          => 'Allow users to edit their own profiles.',
+    'default_avatar' => 'Upload default avatar',
 
 ];

From 44bcc157e5266223b52c26b402b350c19bac72db Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Thu, 4 Jul 2024 13:23:46 +0100
Subject: [PATCH 06/15] Updated icon

Signed-off-by: snipe <snipe@snipe.net>
---
 resources/views/layouts/default.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/layouts/default.blade.php b/resources/views/layouts/default.blade.php
index 5b23db7b80..74e9d5be6f 100644
--- a/resources/views/layouts/default.blade.php
+++ b/resources/views/layouts/default.blade.php
@@ -324,7 +324,7 @@ dir="{{ in_array(app()->getLocale(),['ar-SA','fa-IR', 'he-IL']) ? 'rtl' : 'ltr'
                                             <img src="{{ Auth::user()->present()->gravatar() }}" class="user-image"
                                                  alt="">
                                         @else
-                                            <i class="fas fa-users" aria-hidden="true"></i>
+                                            <i class="fas fa-user" aria-hidden="true"></i>
                                         @endif
 
                                         <span class="hidden-xs">{{ Auth::user()->getFullNameAttribute() }} <strong

From 947fb7af7a9f7931695adb3b80b81f17ade1f809 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Thu, 4 Jul 2024 13:24:03 +0100
Subject: [PATCH 07/15] Added tests

Signed-off-by: snipe <snipe@snipe.net>
---
 .../Feature/Settings/BrandingSettingsTest.php | 57 ++++++++++++++++++-
 1 file changed, 54 insertions(+), 3 deletions(-)

diff --git a/tests/Feature/Settings/BrandingSettingsTest.php b/tests/Feature/Settings/BrandingSettingsTest.php
index a27a5d1ef8..2ae3208096 100644
--- a/tests/Feature/Settings/BrandingSettingsTest.php
+++ b/tests/Feature/Settings/BrandingSettingsTest.php
@@ -2,15 +2,66 @@
 
 namespace Tests\Feature\Settings;
 
-use App\Models\User;
 use Tests\TestCase;
+use Illuminate\Http\UploadedFile;
+use Illuminate\Support\Facades\Storage;
+use App\Models\User;
+
 
 class BrandingSettingsTest extends TestCase
 {
     public function testSiteNameIsRequired()
     {
-        $this->actingAs(User::factory()->superuser()->create())
+        $response = $this->actingAs(User::factory()->superuser()->create())
+            ->from(route('settings.branding.index'))
             ->post(route('settings.branding.save', ['site_name' => '']))
-            ->assertInvalid('site_name');
+            ->assertSessionHasErrors(['site_name'])
+            ->assertInvalid(['site_name'])
+            ->assertStatus(302)
+            ->assertRedirect(route('settings.branding.index'));
+
+        $this->followRedirects($response)->assertSee(trans('general.error'));
     }
+
+    public function testSiteNameCanBeSaved()
+    {
+        $response = $this->actingAs(User::factory()->superuser()->create())
+            ->post(route('settings.branding.save', ['site_name' => 'MyAwesomeSite']))
+            ->assertStatus(302)
+            ->assertValid('site_name')
+            ->assertRedirect(route('settings.index'))
+            ->assertSessionHasNoErrors();
+
+        $this->followRedirects($response)->assertSee('Success');
+    }
+
+
+    public function testLogoCanBeUploaded()
+    {
+        Storage::fake('logo');
+
+        $this->actingAs(User::factory()->superuser()->create())
+            ->post(route('settings.branding.save',
+                ['logo' => UploadedFile::fake()->image('logo.jpg')]
+            ))
+            ->assertStatus(302);
+
+        Storage::disk('logo')->assertExists('logo.jpg');
+    }
+//
+//
+//    public function testLogoCanBeDeleted()
+//    {
+//        Storage::fake('logo');
+//        UploadedFile::fake()->image('logo.jpg');
+//        Storage::disk('logo')->assertExists('logo.jpg');
+//
+//        $this->actingAs(User::factory()->superuser()->create())
+//            ->post(route('settings.branding.save',
+//                ['clear_logo' => '1'
+//                ]));
+//
+//        Storage::disk('logo')->assertMissing('logo.jpg');
+//    }
+
 }

From 5e97ed1c7e897299a93690c3b0a73c7186b13231 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Thu, 4 Jul 2024 13:24:11 +0100
Subject: [PATCH 08/15] Added migration

Signed-off-by: snipe <snipe@snipe.net>
---
 ..._103729_add_default_avatar_to_settings.php | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 database/migrations/2024_07_04_103729_add_default_avatar_to_settings.php

diff --git a/database/migrations/2024_07_04_103729_add_default_avatar_to_settings.php b/database/migrations/2024_07_04_103729_add_default_avatar_to_settings.php
new file mode 100644
index 0000000000..423f45e9ee
--- /dev/null
+++ b/database/migrations/2024_07_04_103729_add_default_avatar_to_settings.php
@@ -0,0 +1,28 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('settings', function (Blueprint $table) {
+            $table->string('default_avatar')->after('favicon')->default('default.png')->nullable();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('settings', function (Blueprint $table) {
+            $table->dropColumn('default_avatar');
+        });
+    }
+};

From 9fe26ba814b0667cacd32fd722aff44df793ad33 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Thu, 4 Jul 2024 13:25:39 +0100
Subject: [PATCH 09/15] Reverted the validation - might have an impact on
 quickstart setup

Signed-off-by: snipe <snipe@snipe.net>
---
 app/Http/Controllers/SettingsController.php | 1 +
 app/Models/Setting.php                      | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Http/Controllers/SettingsController.php b/app/Http/Controllers/SettingsController.php
index 77da651038..985f642270 100755
--- a/app/Http/Controllers/SettingsController.php
+++ b/app/Http/Controllers/SettingsController.php
@@ -416,6 +416,7 @@ class SettingsController extends Controller
         // Because public demos make people act like dicks
 
         if (!config('app.lock_passwords')) {
+            $request->validate(['site_name' => 'required']);
             $setting->site_name = $request->input('site_name');
             $setting->custom_css = $request->input('custom_css');
 
diff --git a/app/Models/Setting.php b/app/Models/Setting.php
index 5a6b216167..30600aea56 100755
--- a/app/Models/Setting.php
+++ b/app/Models/Setting.php
@@ -49,7 +49,6 @@ class Setting extends Model
      * @var array
      */
     protected $rules = [
-          'site_name'                           => 'required',
           'brand'                               => 'required|min:1|numeric',
           'qr_text'                             => 'max:31|nullable',
           'alert_email'                         => 'email_array|nullable',

From 5b8f6910fb0118485e251eb1cec6de852c03a7b2 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Thu, 4 Jul 2024 16:33:08 +0100
Subject: [PATCH 10/15] Marked tests as incomplete :(

Signed-off-by: snipe <snipe@snipe.net>
---
 .../Feature/Settings/BrandingSettingsTest.php | 216 ++++++++++++++++--
 1 file changed, 196 insertions(+), 20 deletions(-)

diff --git a/tests/Feature/Settings/BrandingSettingsTest.php b/tests/Feature/Settings/BrandingSettingsTest.php
index 2ae3208096..7f887c213d 100644
--- a/tests/Feature/Settings/BrandingSettingsTest.php
+++ b/tests/Feature/Settings/BrandingSettingsTest.php
@@ -6,6 +6,7 @@ use Tests\TestCase;
 use Illuminate\Http\UploadedFile;
 use Illuminate\Support\Facades\Storage;
 use App\Models\User;
+use App\Models\Setting;
 
 
 class BrandingSettingsTest extends TestCase
@@ -26,7 +27,7 @@ class BrandingSettingsTest extends TestCase
     public function testSiteNameCanBeSaved()
     {
         $response = $this->actingAs(User::factory()->superuser()->create())
-            ->post(route('settings.branding.save', ['site_name' => 'MyAwesomeSite']))
+            ->post(route('settings.branding.save', ['site_name' => 'My Awesome Site']))
             ->assertStatus(302)
             ->assertValid('site_name')
             ->assertRedirect(route('settings.index'))
@@ -38,30 +39,205 @@ class BrandingSettingsTest extends TestCase
 
     public function testLogoCanBeUploaded()
     {
-        Storage::fake('logo');
+       $this->markTestIncomplete('This test fails because of how we handle image uploads in the ImageUploadRequest.');
+
+        Storage::fake('public');
+
+
+        $this->actingAs(User::factory()->superuser()->create())
+            ->post(
+                route('settings.branding.save',
+                    ['logo' => UploadedFile::fake()->image('logo.jpg')])
+            )->assertValid('logo')
+            ->assertStatus(302)
+            ->assertRedirect(route('settings.index'))
+            ->assertSessionHasNoErrors();
+
+
+        $setting = Setting::first();
+
+        $this->assertNotNull($setting->logo);
+        $this->assertDatabaseHas('settings', ['logo' => $setting->logo]);
+        Storage::disk('public')->assertExists($setting->logo);
+    }
+
+    public function testLogoCanBeDeleted()
+    {
+        $this->markTestIncomplete('This test fails because of how we handle image uploads in the ImageUploadRequest.');
+        Storage::fake('testdisk');
 
         $this->actingAs(User::factory()->superuser()->create())
             ->post(route('settings.branding.save',
                 ['logo' => UploadedFile::fake()->image('logo.jpg')]
-            ))
-            ->assertStatus(302);
+            ));
 
-        Storage::disk('logo')->assertExists('logo.jpg');
+        $setting = Setting::getSettings()->first();
+
+        $this->actingAs(User::factory()->superuser()->create())
+            ->post(route('settings.branding.save',['clear_logo' => '1']));
+
+        Storage::disk('testdisk')->assertMissing('logo.jpg');
+        $setting->refresh();
+        $this->assertNull($setting->logo);
     }
-//
-//
-//    public function testLogoCanBeDeleted()
-//    {
-//        Storage::fake('logo');
-//        UploadedFile::fake()->image('logo.jpg');
-//        Storage::disk('logo')->assertExists('logo.jpg');
-//
-//        $this->actingAs(User::factory()->superuser()->create())
-//            ->post(route('settings.branding.save',
-//                ['clear_logo' => '1'
-//                ]));
-//
-//        Storage::disk('logo')->assertMissing('logo.jpg');
-//    }
+
+    public function testEmailLogoCanBeUploaded()
+    {
+        $this->markTestIncomplete('This test fails because of how we handle image uploads in the ImageUploadRequest.');
+        Storage::fake('testdisk');
+
+        $this->actingAs(User::factory()->superuser()->create())
+            ->post(route('settings.branding.save',
+                ['email_logo' => UploadedFile::fake()->image('email-logo.jpg')]
+            ))
+            ->assertValid('email_logo')
+            ->assertStatus(302)
+            ->assertRedirect(route('settings.index'))
+            ->assertSessionHasNoErrors();
+
+        $setting = Setting::getSettings()->first();
+        \Log::error($setting->toArray());
+        Storage::disk('testdisk')->assertExists($setting->email_logo);
+    }
+
+    public function testEmailLogoCanBeDeleted()
+    {
+        $this->markTestIncomplete('This test fails because of how we handle image uploads in the ImageUploadRequest.');
+        Storage::fake('testdisk');
+
+        $this->actingAs(User::factory()->superuser()->create())
+            ->post(route('settings.branding.save',
+                ['email_logo' => UploadedFile::fake()->image('email-logo.jpg')]
+            ));
+
+        $setting = Setting::getSettings()->first();
+
+        $this->actingAs(User::factory()->superuser()->create())
+            ->post(route('settings.branding.save',['clear_email_logo' => '1']));
+
+        Storage::disk('testdisk')->assertMissing('email-logo.jpg');
+        $setting->refresh();
+        $this->assertNull($setting->email_logo);
+    }
+
+
+    public function testLabelLogoCanBeUploaded()
+    {
+        $this->markTestIncomplete('This test fails because of how we handle image uploads in the ImageUploadRequest.');
+
+        Storage::fake('testdisk');
+
+        $this->actingAs(User::factory()->superuser()->create())
+            ->post(route('settings.branding.save',
+                ['label_logo' => UploadedFile::fake()->image('label-logo.jpg')]
+            ))
+            ->assertValid('label_logo')
+            ->assertStatus(302)
+            ->assertRedirect(route('settings.index'))
+            ->assertSessionHasNoErrors();
+
+        $setting = Setting::getSettings()->first();
+        Storage::disk('testdisk')->assertExists($setting->label_logo);
+    }
+
+    public function testLabelLogoCanBeDeleted()
+    {
+        $this->markTestIncomplete('This test fails because of how we handle image uploads in the ImageUploadRequest.');
+        Storage::fake('testdisk');
+
+        $this->actingAs(User::factory()->superuser()->create())
+            ->post(route('settings.branding.save',
+                ['label_logo' => UploadedFile::fake()->image('label-logo.jpg')]
+            ));
+
+        $setting = Setting::getSettings()->first();
+
+        $this->actingAs(User::factory()->superuser()->create())
+            ->post(route('settings.branding.save',['clear_label_logo' => '1']));
+
+        Storage::disk('testdisk')->assertMissing('label-logo.jpg');
+        $setting->refresh();
+        $this->assertNull($setting->label_logo);
+    }
+
+    public function testDefaultAvatarCanBeUploaded()
+    {
+        $this->markTestIncomplete('This test fails because of how we handle image uploads in the ImageUploadRequest.');
+        $setting = Setting::getSettings()->first();
+
+        Storage::fake('testdisk');
+
+        $this->actingAs(User::factory()->superuser()->create())
+            ->post(route('settings.branding.save',
+                ['default_avatar' => UploadedFile::fake()->image('default-avatar.jpg')]
+            ))
+            ->assertValid('default_avatar')
+            ->assertStatus(302)
+            ->assertRedirect(route('settings.index'))
+            ->assertSessionHasNoErrors();
+
+        $setting->refresh();
+        Storage::disk('testdisk')->assertExists($setting->default_avatar);
+    }
+
+    public function testDefaultAvatarCanBeDeleted()
+    {
+        $this->markTestIncomplete('This test fails because of how we handle image uploads in the ImageUploadRequest.');
+        Storage::fake('testdisk');
+
+        $this->actingAs(User::factory()->superuser()->create())
+            ->post(route('settings.branding.save',
+                ['default_avatar' => UploadedFile::fake()->image('default-avatar.jpg')]
+            ));
+
+        $setting = Setting::getSettings()->first();
+
+        $this->actingAs(User::factory()->superuser()->create())
+            ->post(route('settings.branding.save',['clear_default_avatar' => '1']));
+
+        Storage::disk('testdisk')->assertMissing('default-avatar.jpg');
+        $setting->refresh();
+        $this->assertNull($setting->default_avatar);
+    }
+
+    public function testFaviconCanBeUploaded()
+    {
+        $this->markTestIncomplete('This fails mimetype validation on the mock');
+        Storage::fake('testdisk');
+
+        $this->actingAs(User::factory()->superuser()->create())
+            ->post(route('settings.branding.save',
+                ['favicon' => UploadedFile::fake()->image('favicon.svg')]
+            ))
+            ->assertValid('favicon')
+            ->assertStatus(302)
+            ->assertRedirect(route('settings.index'))
+            ->assertSessionHasNoErrors();
+
+        $setting = Setting::getSettings()->first();
+        Storage::disk('testdisk')->assertExists($setting->favicon);
+    }
+
+    public function testFaviconCanBeDeleted()
+    {
+        $this->markTestIncomplete('This fails mimetype validation on the mock');
+        Storage::fake('testdisk');
+
+        $this->actingAs(User::factory()->superuser()->create())
+            ->post(route('settings.branding.save',
+                ['favicon' => UploadedFile::fake()->image('favicon.ico')->mimeType('image/x-icon')]
+            ));
+
+        $setting = Setting::getSettings()->first();
+
+        $this->actingAs(User::factory()->superuser()->create())
+            ->post(route('settings.branding.save',['clear_favicon' => '1']));
+
+        Storage::disk('testdisk')->assertMissing('favicon.ico');
+        $setting->refresh();
+        $this->assertNull($setting->favicon);
+    }
+
+
 
 }

From 2f3be267b38ca61901cae2f4e69bfff153146730 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Thu, 4 Jul 2024 16:33:22 +0100
Subject: [PATCH 11/15] Added some logic around deleting images

Signed-off-by: snipe <snipe@snipe.net>
---
 app/Http/Controllers/SettingsController.php | 40 +++++++++++++++------
 1 file changed, 30 insertions(+), 10 deletions(-)

diff --git a/app/Http/Controllers/SettingsController.php b/app/Http/Controllers/SettingsController.php
index 985f642270..ada45c571c 100755
--- a/app/Http/Controllers/SettingsController.php
+++ b/app/Http/Controllers/SettingsController.php
@@ -416,44 +416,64 @@ class SettingsController extends Controller
         // Because public demos make people act like dicks
 
         if (!config('app.lock_passwords')) {
-            $request->validate(['site_name' => 'required']);
-            $setting->site_name = $request->input('site_name');
+
+            if ($request->has('site_name')) {
+                $request->validate(['site_name' => 'required']);
+            }
+
+            $setting->site_name = $request->input('site_name', 'Snipe-IT');
             $setting->custom_css = $request->input('custom_css');
 
             // Logo upload
             $setting = $request->handleImages($setting, 600, 'logo', '', 'logo');
-            if ('1' == $request->input('clear_logo')) {
-                Storage::disk('public')->delete($setting->logo);
+
+            if ($request->input('clear_logo') == '1') {
+
+                if (($setting->logo) && (Storage::exists($setting->logo))) {
+                    Storage::disk('public')->delete($setting->logo);
+                }
                 $setting->logo = null;
                 $setting->brand = 1;
             }
 
             // Email logo upload
             $setting = $request->handleImages($setting, 600, 'email_logo', '', 'email_logo');
-            if ('1' == $request->input('clear_email_logo')) {
-                Storage::disk('public')->delete($setting->email_logo);
+            if ($request->input('clear_email_logo') == '1') {
+
+                if (($setting->email_logo) && (Storage::exists($setting->email_logo))) {
+                    Storage::disk('public')->delete($setting->email_logo);
+                }
                 $setting->email_logo = null;
                 // If they are uploading an image, validate it and upload it
             }
 
              // Label logo upload
             $setting = $request->handleImages($setting, 600, 'label_logo', '', 'label_logo');
-            if ('1' == $request->input('clear_label_logo')) {
-                Storage::disk('public')->delete($setting->label_logo);
+            if ($request->input('clear_label_logo') == '1') {
+
+                if (($setting->label_logo) && (Storage::exists($setting->label_logo))) {
+                    Storage::disk('public')->delete($setting->label_logo);
+                }
                 $setting->label_logo = null;
             }
 
             // Favicon upload
             $setting = $request->handleImages($setting, 100, 'favicon', '', 'favicon');
             if ('1' == $request->input('clear_favicon')) {
-                Storage::disk('public')->delete($setting->favicon);
+
+                if (($setting->favicon) && (Storage::exists($setting->favicon))) {
+                    Storage::disk('public')->delete($setting->favicon);
+                }
                 $setting->favicon = null;
             }
 
             // Default avatar upload
             $setting = $request->handleImages($setting, 500, 'default_avatar', 'avatars', 'default_avatar');
             if ($request->input('clear_default_avatar') == '1') {
-                Storage::disk('public')->delete('avatars/'.$setting->default_avatar);
+
+                if (($setting->default_avatar) && (Storage::exists('avatars/'.$setting->default_avatar))) {
+                    Storage::disk('public')->delete('avatars/'.$setting->default_avatar);
+                }
                 $setting->default_avatar = null;
             }
         }

From 1ca3dc26eba55042374a77b3819e62b773124da7 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Thu, 4 Jul 2024 16:36:48 +0100
Subject: [PATCH 12/15] Removed extra debugging

Signed-off-by: snipe <snipe@snipe.net>
---
 app/Http/Requests/ImageUploadRequest.php | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/app/Http/Requests/ImageUploadRequest.php b/app/Http/Requests/ImageUploadRequest.php
index c75454d0f3..8b9aed499b 100644
--- a/app/Http/Requests/ImageUploadRequest.php
+++ b/app/Http/Requests/ImageUploadRequest.php
@@ -96,10 +96,7 @@ class ImageUploadRequest extends Request
 
                 $ext = $image->guessExtension();
                 $file_name = $type.'-'.$form_fieldname.'-'.$item->id.'-'.str_random(10).'.'.$ext;
-
-                Log::info('File name will be: '.$file_name);
-                Log::debug('File extension is: '.$ext);
-
+                
                 if (($image->getMimeType() == 'image/vnd.microsoft.icon') || ($image->getMimeType() == 'image/x-icon') || ($image->getMimeType() == 'image/avif') || ($image->getMimeType() == 'image/webp')) {
                     // If the file is an icon, webp or avif, we need to just move it since gd doesn't support resizing
                     // icons or avif, and webp support and needs to be compiled into gd for resizing to be available

From 00f7cb9dbbfd7301fdb89157846f7d68355b3e50 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Thu, 4 Jul 2024 16:46:12 +0100
Subject: [PATCH 13/15] Reverse the order for default gravatar

Signed-off-by: snipe <snipe@snipe.net>
---
 app/Presenters/UserPresenter.php | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/Presenters/UserPresenter.php b/app/Presenters/UserPresenter.php
index f60db150a1..ddd72ea2c8 100644
--- a/app/Presenters/UserPresenter.php
+++ b/app/Presenters/UserPresenter.php
@@ -445,7 +445,11 @@ class UserPresenter extends Presenter
             return Storage::disk('public')->url('avatars/'.e($this->avatar));
         }
 
-
+        // If there is a default avatar
+        if (Setting::getSettings()->default_avatar!= '') {
+            return Storage::disk('public')->url('avatars/'.e(Setting::getSettings()->default_avatar));
+        }
+        
         // Fall back to Gravatar if the settings allow loading remote scripts
         if (Setting::getSettings()->load_remote == '1') {
             if ($this->model->gravatar != '') {
@@ -460,10 +464,7 @@ class UserPresenter extends Presenter
             }
         }
 
-        // If there is a default avatar
-        if (Setting::getSettings()->default_avatar!= '') {
-            return Storage::disk('public')->url('avatars/'.e(Setting::getSettings()->default_avatar));
-        }
+
 
         return false;
     }

From 36ae16262662821eaedf8bd28cab904fbb290eec Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Thu, 4 Jul 2024 16:48:05 +0100
Subject: [PATCH 14/15] Changed my mind :)

Signed-off-by: snipe <snipe@snipe.net>
---
 app/Presenters/UserPresenter.php | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/app/Presenters/UserPresenter.php b/app/Presenters/UserPresenter.php
index ddd72ea2c8..f60db150a1 100644
--- a/app/Presenters/UserPresenter.php
+++ b/app/Presenters/UserPresenter.php
@@ -445,11 +445,7 @@ class UserPresenter extends Presenter
             return Storage::disk('public')->url('avatars/'.e($this->avatar));
         }
 
-        // If there is a default avatar
-        if (Setting::getSettings()->default_avatar!= '') {
-            return Storage::disk('public')->url('avatars/'.e(Setting::getSettings()->default_avatar));
-        }
-        
+
         // Fall back to Gravatar if the settings allow loading remote scripts
         if (Setting::getSettings()->load_remote == '1') {
             if ($this->model->gravatar != '') {
@@ -464,7 +460,10 @@ class UserPresenter extends Presenter
             }
         }
 
-
+        // If there is a default avatar
+        if (Setting::getSettings()->default_avatar!= '') {
+            return Storage::disk('public')->url('avatars/'.e(Setting::getSettings()->default_avatar));
+        }
 
         return false;
     }

From 3f20e299014b76ec9c1b14ecabecf80dfa4edc3b Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Thu, 4 Jul 2024 16:55:47 +0100
Subject: [PATCH 15/15] Moved gthe settings for remote loading to the branding
 section

Signed-off-by: snipe <snipe@snipe.net>
---
 app/Http/Controllers/SettingsController.php |  2 +-
 app/Presenters/UserPresenter.php            |  8 ++++----
 resources/views/settings/branding.blade.php | 19 +++++++++++++++++++
 resources/views/settings/general.blade.php  | 18 ------------------
 4 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/app/Http/Controllers/SettingsController.php b/app/Http/Controllers/SettingsController.php
index ada45c571c..7fefbf9090 100755
--- a/app/Http/Controllers/SettingsController.php
+++ b/app/Http/Controllers/SettingsController.php
@@ -348,7 +348,6 @@ class SettingsController extends Controller
         }
 
         $setting->default_eula_text = $request->input('default_eula_text');
-        $setting->load_remote = $request->input('load_remote', 0);
         $setting->thumbnail_max_h = $request->input('thumbnail_max_h');
         $setting->privacy_policy_link = $request->input('privacy_policy_link');
         $setting->depreciation_method = $request->input('depreciation_method');
@@ -411,6 +410,7 @@ class SettingsController extends Controller
         $setting->allow_user_skin = $request->input('allow_user_skin', '0');
         $setting->show_url_in_emails = $request->input('show_url_in_emails', '0');
         $setting->logo_print_assets = $request->input('logo_print_assets', '0');
+        $setting->load_remote = $request->input('load_remote', 0);
 
         // Only allow the site name, images, and CSS to be changed if lock_passwords is false
         // Because public demos make people act like dicks
diff --git a/app/Presenters/UserPresenter.php b/app/Presenters/UserPresenter.php
index f60db150a1..7c6d46573e 100644
--- a/app/Presenters/UserPresenter.php
+++ b/app/Presenters/UserPresenter.php
@@ -445,6 +445,10 @@ class UserPresenter extends Presenter
             return Storage::disk('public')->url('avatars/'.e($this->avatar));
         }
 
+        // If there is a default avatar
+        if (Setting::getSettings()->default_avatar!= '') {
+            return Storage::disk('public')->url('avatars/'.e(Setting::getSettings()->default_avatar));
+        }
 
         // Fall back to Gravatar if the settings allow loading remote scripts
         if (Setting::getSettings()->load_remote == '1') {
@@ -460,10 +464,6 @@ class UserPresenter extends Presenter
             }
         }
 
-        // If there is a default avatar
-        if (Setting::getSettings()->default_avatar!= '') {
-            return Storage::disk('public')->url('avatars/'.e(Setting::getSettings()->default_avatar));
-        }
 
         return false;
     }
diff --git a/resources/views/settings/branding.blade.php b/resources/views/settings/branding.blade.php
index 3bc2121811..59f6acad36 100644
--- a/resources/views/settings/branding.blade.php
+++ b/resources/views/settings/branding.blade.php
@@ -119,6 +119,25 @@
                         "helpBlock" => trans('general.image_filetypes_help', ['size' => Helper::file_upload_max_size_readable()]),
                     ])
 
+                        <!-- Load gravatar -->
+                        <div class="form-group {{ $errors->has('load_remote') ? 'error' : '' }}">
+                            <div class="col-md-3">
+                                <strong>{{ trans('admin/settings/general.load_remote') }}</strong>
+                            </div>
+                            <div class="col-md-9">
+                                <label class="form-control">
+                                    {{ Form::checkbox('load_remote', '1', old('load_remote', $setting->load_remote)) }}
+                                    {{ trans('general.yes') }}
+                                    {!! $errors->first('load_remote', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
+                                </label>
+
+                                <p class="help-block">
+                                    {{ trans('admin/settings/general.load_remote_help_text') }}
+                                </p>
+
+                            </div>
+                        </div>
+
 
                         <!-- Include logo in print assets -->
                         <div class="form-group">
diff --git a/resources/views/settings/general.blade.php b/resources/views/settings/general.blade.php
index 2943901b8c..91d3b1c56f 100644
--- a/resources/views/settings/general.blade.php
+++ b/resources/views/settings/general.blade.php
@@ -144,24 +144,6 @@
                            </div>
                        </div>
 
-                       <!-- Load gravatar -->
-                       <div class="form-group {{ $errors->has('load_remote') ? 'error' : '' }}">
-                           <div class="col-md-3">
-                               <strong>{{ trans('admin/settings/general.load_remote') }}</strong>
-                           </div>
-                           <div class="col-md-9">
-                               <label class="form-control">
-                                   {{ Form::checkbox('load_remote', '1', old('load_remote', $setting->load_remote)) }}
-                                   {{ trans('general.yes') }}
-                                   {!! $errors->first('load_remote', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
-                               </label>
-
-                               <p class="help-block">
-                                   {{ trans('admin/settings/general.load_remote_help_text') }}
-                               </p>
-
-                           </div>
-                       </div>
 
                        <!-- unique serial -->
                        <div class="form-group">