Merge pull request #14219 from snipe/fixes/resurface_load_remote

Fixed #14185 - Resurfaced `load_remote` in admin
snipe · Feb 5, 2024 · 4436674 · 4436674
2 parents 1a48043 + 3806cec
commit 4436674
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 5 deletions.
diff --git a/app/Http/Controllers/SettingsController.php b/app/Http/Controllers/SettingsController.php
@@ -356,6 +356,7 @@ public function postSettings(Request $request)
  }
 
  $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
@@ -67,7 +67,7 @@
  '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',
@@ -87,7 +87,6 @@
  'ldap_integration' => 'LDAP Integration',
  'ldap_settings' => 'LDAP Settings',
  'ldap_client_tls_cert_help' => 'Client-Side TLS Certificate and Key for LDAP connections are usually only useful in Google Workspace configurations with "Secure LDAP." Both are required.',
- 'ldap_client_tls_key' => 'LDAP Client-Side TLS key',
  'ldap_location' => 'LDAP Location',
 'ldap_location_help' => 'The Ldap Location field should be used if <strong>an OU is not being used in the Base Bind DN.</strong> Leave this blank if an OU search is being used.',
  'ldap_login_test_help' => 'Enter a valid LDAP username and password from the base DN you specified above to test whether your LDAP login is configured correctly. YOU MUST SAVE YOUR UPDATED LDAP SETTINGS FIRST.',
@@ -122,8 +121,8 @@
  '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'  => '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.',
  '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
@@ -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>