diff --git a/app/Classes/Settings/System.php b/app/Classes/Settings/System.php index 7914269f..7925fccb 100644 --- a/app/Classes/Settings/System.php +++ b/app/Classes/Settings/System.php @@ -55,7 +55,7 @@ class System 'show-tos' => 'string', 'alert-enabled' => 'string', 'alter-type' => 'string', - 'alert-message' => 'string', + 'alert-message' => 'string|nullable', ]); $validator->after(function ($validator) use ($request) { diff --git a/app/Models/User.php b/app/Models/User.php index cd660da7..328b7c11 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -302,4 +302,5 @@ class User extends Authenticatable implements MustVerifyEmail -> logOnlyDirty() -> dontSubmitEmptyLogs(); } + } diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index bd0c710d..e9390b6e 100644 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -66,7 +66,7 @@ class AppServiceProvider extends ServiceProvider } if(config('theme.active') == null){ - Theme::set(config("SETTINGS::SYSTEM:THEME"), "default"); + Theme::set(config("SETTINGS::SYSTEM:THEME","default"), "default"); } // Set Mail Config diff --git a/public/install/functions.php b/public/install/functions.php index 8788f127..7eed0735 100644 --- a/public/install/functions.php +++ b/public/install/functions.php @@ -3,15 +3,15 @@ $required_extentions = ['openssl', 'gd', 'mysql', 'PDO', 'mbstring', 'tokenizer', 'bcmath', 'xml', 'curl', 'zip', 'intl']; $requirements = [ - 'minPhp' => '7.4', - 'maxPhp' => '8.1', // This version is not supported + 'minPhp' => '8.1', + 'maxPhp' => '8.1.9', // This version is not supported 'mysql' => '5.7.22', ]; function checkPhpVersion() { global $requirements; - if (version_compare(phpversion(), $requirements['minPhp'], '>=') && version_compare(phpversion(), $requirements['maxPhp'], '<')) { + if (version_compare(phpversion(), $requirements['minPhp'], '>=') && version_compare(phpversion(), $requirements['maxPhp'], '<=')) { return 'OK'; } diff --git a/public/install/index.php b/public/install/index.php index d834a8d9..b002282b 100644 --- a/public/install/index.php +++ b/public/install/index.php @@ -65,6 +65,7 @@ if (! isset($_GET['step'])) {
php version: (minimum required )
+mysql version: (minimum required )
diff --git a/themes/default/views/admin/settings/tabs/system.blade.php b/themes/default/views/admin/settings/tabs/system.blade.php index ad851564..646b5c43 100644 --- a/themes/default/views/admin/settings/tabs/system.blade.php +++ b/themes/default/views/admin/settings/tabs/system.blade.php @@ -22,7 +22,7 @@ ') }}" class="fas fa-info-circle"> @@ -35,7 +35,7 @@ ') }}" class="fas fa-info-circle"> @@ -48,7 +48,7 @@ ') }}" class="fas fa-info-circle"> @@ -336,6 +336,11 @@ class="form-control @error('alert-message') is-invalid @enderror"> {{ config('SETTINGS::SYSTEM:ALERT_MESSAGE', '') }} + @error('alert-message') +