ソースを参照

[FIX] Favicon preview, locale setting fix, 500 error on server creation, installer issue(#903)

Dennis 1 年間 前
コミット
f9a102509b

+ 1 - 1
app/Settings/LocaleSettings.php

@@ -24,7 +24,7 @@ class LocaleSettings extends Settings
     public static function getValidations()
     public static function getValidations()
     {
     {
         return [
         return [
-            'available' => 'nullable|array',
+            'available' => 'array|required',
             'clients_can_change' => 'nullable|string',
             'clients_can_change' => 'nullable|string',
             'datatables' => 'nullable|string',
             'datatables' => 'nullable|string',
             'default' => 'required|in:' . implode(',', config('app.available_locales')),
             'default' => 'required|in:' . implode(',', config('app.available_locales')),

+ 1 - 1
public/install/forms.php

@@ -141,7 +141,7 @@ if (isset($_POST['checkSMTP'])) {
     ];
     ];
 
 
     foreach ($values as $key => $value) {
     foreach ($values as $key => $value) {
-        $query = 'UPDATE `' . getenv('DB_DATABASE') . "`.`settings` SET `payload` = '$value' WHERE `name` = '$key' AND `group` = mail";
+        $query = 'UPDATE `' . getenv('DB_DATABASE') . "`.`settings` SET `payload` = '$value' WHERE `name` = '$key' AND `group` = 'mail'";
         $db->query($query);
         $db->query($query);
     }
     }
 
 

BIN
storage/app/public/logo.png


+ 3 - 0
themes/default/views/admin/settings/index.blade.php

@@ -120,6 +120,9 @@
                                         <div class="row">
                                         <div class="row">
                                             <div class="card ml-5" style="width: 18rem;">
                                             <div class="card ml-5" style="width: 18rem;">
                                                 <span class="h3 text-center">{{ __('FavIcon') }} </span>
                                                 <span class="h3 text-center">{{ __('FavIcon') }} </span>
+                                              <img src="{{ Storage::disk('public')->exists('favicon.ico') ? asset('storage/favicon.ico') : asset('images/controlpanel_logo.png') }}"
+                                                   style="width:5vw;display: block; margin-left: auto;margin-right: auto"
+                                                   class="card-img-top" alt="...">
                                                 <div class="card-body">
                                                 <div class="card-body">
 
 
                                                 </div>
                                                 </div>

+ 2 - 2
themes/default/views/layouts/app.blade.php

@@ -7,14 +7,14 @@
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta content="{{ $website_settings->seo_title }}" property="og:title">
     <meta content="{{ $website_settings->seo_title }}" property="og:title">
     <meta content="{{ $website_settings->seo_description }}" property="og:description">
     <meta content="{{ $website_settings->seo_description }}" property="og:description">
-    <meta content='{{ \Illuminate\Support\Facades\Storage::disk('public')->exists('logo.png') ? asset('storage/logo.png') : asset('images/controlpanel_logo.png') }}' property="og:image">
+    <meta content='{{ \Illuminate\Support\Facades\Storage::disk('public')->exists('logo.png') ? asset('/logo.png') : asset('images/controlpanel_logo.png') }}' property="og:image">
 
 
     <!-- CSRF Token -->
     <!-- CSRF Token -->
     <meta name="csrf-token" content="{{ csrf_token() }}">
     <meta name="csrf-token" content="{{ csrf_token() }}">
 
 
     <title>{{ config('app.name', 'Laravel') }}</title>
     <title>{{ config('app.name', 'Laravel') }}</title>
     <link rel="icon"
     <link rel="icon"
-        href="{{ \Illuminate\Support\Facades\Storage::disk('public')->exists('favicon.ico') ? \Illuminate\Support\Facades\Storage::disk('public')->url('favicon.ico') : asset('favicon.ico') }}"
+        href="{{ \Illuminate\Support\Facades\Storage::disk('public')->exists('favicon.ico') ? asset('storage/favicon.ico') : asset('favicon.ico') }}"
         type="image/x-icon">
         type="image/x-icon">
 
 
     <script src="{{ asset('js/app.js') }}" defer></script>
     <script src="{{ asset('js/app.js') }}" defer></script>

+ 1 - 1
themes/default/views/servers/create.blade.php

@@ -38,7 +38,7 @@
                         @if (!$server_creation_enabled)
                         @if (!$server_creation_enabled)
                             <div class="alert alert-warning p-2 m-2">
                             <div class="alert alert-warning p-2 m-2">
                                 {{ __('The creation of new servers has been disabled for regular users, enable it again') }}
                                 {{ __('The creation of new servers has been disabled for regular users, enable it again') }}
-                                <a href="{{ route('admin.settings.system') }}">{{ __('here') }}</a>.
+                                <a href="{{ route('admin.settings.index', "#Server") }}">{{ __('here') }}</a>.
                             </div>
                             </div>
                         @endif
                         @endif
                         @if ($productCount === 0 || $nodeCount === 0 || count($nests) === 0 || count($eggs) === 0)
                         @if ($productCount === 0 || $nodeCount === 0 || count($nests) === 0 || count($eggs) === 0)