From 32c360f03274c0de5f6600981d30e6704ea8d0ac Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Mon, 5 Feb 2024 18:23:52 +0000
Subject: [PATCH] Re-added UI for load_remote

Signed-off-by: snipe <snipe@snipe.net>
---
 app/Http/Controllers/SettingsController.php   |  1 +
 .../lang/en-US/admin/settings/general.php     |  6 ++---
 resources/views/settings/general.blade.php    | 22 ++++++++++++++++++-
 3 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/app/Http/Controllers/SettingsController.php b/app/Http/Controllers/SettingsController.php
index 873d764a25..b83e015070 100755
--- a/app/Http/Controllers/SettingsController.php
+++ b/app/Http/Controllers/SettingsController.php
@@ -356,6 +356,7 @@ 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');
 
diff --git a/resources/lang/en-US/admin/settings/general.php b/resources/lang/en-US/admin/settings/general.php
index 0c572e0676..361b5a2567 100644
--- a/resources/lang/en-US/admin/settings/general.php
+++ b/resources/lang/en-US/admin/settings/general.php
@@ -67,7 +67,7 @@ return [
     'footer_text'               => 'Additional Footer Text ',
     'footer_text_help'          => 'This text will appear in the right-side footer. Links are allowed using <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>. Line breaks, headers, images, etc may result in unpredictable results.',
     'general_settings'			=> 'General Settings',
-    'general_settings_keywords' => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula,  tos, dashboard, privacy',
+    'general_settings_keywords' => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
     'general_settings_help'     => 'Default EULA and more',
     'generate_backup'			=> 'Generate Backup',
     'google_workspaces'         => 'Google Workspaces',
@@ -122,8 +122,8 @@ return [
     'ldap_test'                 => 'Test LDAP',
     'ldap_test_sync'            => 'Test LDAP Synchronization',
     'license'                   => 'Software License',
-    'load_remote_text'          => 'Remote Scripts',
-    'load_remote_help_text'		=> 'This Snipe-IT install can load scripts from the outside world.',
+    'load_remote'               => 'Load Remote Scripts',
+    'load_remote_help_text'		=> 'This Snipe-IT install can load scripts from the outside world. This will disable gravatar loading if unchecked.',
     'login'                     => 'Login Attempts',
     'login_attempt'             => 'Login Attempt',
     'login_ip'                  => 'IP Address',
diff --git a/resources/views/settings/general.blade.php b/resources/views/settings/general.blade.php
index 49620d2e0b..8e352248bd 100644
--- a/resources/views/settings/general.blade.php
+++ b/resources/views/settings/general.blade.php
@@ -128,6 +128,25 @@
                            </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">
                            <div class="col-md-3">
@@ -137,8 +156,9 @@
                                <label class="form-control">
                                    {{ Form::checkbox('unique_serial', '1', Request::old('unique_serial', $setting->unique_serial),array('class' => 'minimal')) }}
                                    {{ trans('general.yes') }}
+                                   {!! $errors->first('unique_serial', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
                                </label>
-                               {!! $errors->first('unique_serial', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
+
                                <p class="help-block">
                                {{ trans('admin/settings/general.unique_serial_help_text') }}
                                </p>