From 5bcfd40a34ad16d1ec56bbe5ec9c7369d0656153 Mon Sep 17 00:00:00 2001 From: 1day2die Date: Wed, 11 Jan 2023 15:31:46 +0100 Subject: [PATCH 1/5] fix default theme --- app/Providers/AppServiceProvider.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From 094393e7fb513477125a474ea2ec9827431627bb Mon Sep 17 00:00:00 2001 From: 1day2die Date: Wed, 11 Jan 2023 15:48:22 +0100 Subject: [PATCH 2/5] small fixes --- app/Classes/Settings/System.php | 2 +- themes/default/views/admin/settings/tabs/system.blade.php | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) 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/themes/default/views/admin/settings/tabs/system.blade.php b/themes/default/views/admin/settings/tabs/system.blade.php index ad851564..15c3fcb9 100644 --- a/themes/default/views/admin/settings/tabs/system.blade.php +++ b/themes/default/views/admin/settings/tabs/system.blade.php @@ -336,6 +336,11 @@ class="form-control @error('alert-message') is-invalid @enderror"> {{ config('SETTINGS::SYSTEM:ALERT_MESSAGE', '') }} + @error('alert-message') +
+ {{ $message }} +
+ @enderror From 8bff4f857baee5e34d97fb07dd59748194d980cd Mon Sep 17 00:00:00 2001 From: 1day2die Date: Wed, 11 Jan 2023 16:22:19 +0100 Subject: [PATCH 3/5] fixes --- app/Models/User.php | 1 + themes/default/views/admin/settings/tabs/system.blade.php | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) 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/themes/default/views/admin/settings/tabs/system.blade.php b/themes/default/views/admin/settings/tabs/system.blade.php index 15c3fcb9..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"> From b69cbcfe65f62e0f4a62732b4113ed5e615ab963 Mon Sep 17 00:00:00 2001 From: 1day2die Date: Wed, 11 Jan 2023 16:44:44 +0100 Subject: [PATCH 4/5] upgrade installer, fix TOS showing --- public/install/functions.php | 6 +++--- public/install/index.php | 1 + themes/default/views/auth/login.blade.php | 8 ++++---- themes/default/views/auth/passwords/email.blade.php | 7 +++++-- themes/default/views/auth/passwords/reset.blade.php | 9 ++++++--- themes/default/views/auth/register.blade.php | 10 +++++----- themes/default/views/layouts/main.blade.php | 6 +++--- 7 files changed, 27 insertions(+), 20 deletions(-) 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/auth/login.blade.php b/themes/default/views/auth/login.blade.php index 06438326..d1b4f70f 100644 --- a/themes/default/views/auth/login.blade.php +++ b/themes/default/views/auth/login.blade.php @@ -125,14 +125,14 @@ {{-- imprint and privacy policy --}}
- @if (config('SETTINGS::SYSTEM:SHOW_IMPRINT')) + @if (config('SETTINGS::SYSTEM:SHOW_IMPRINT' == "true")) {{ __('Imprint') }} | @endif - @if (config('SETTINGS::SYSTEM:SHOW_PRIVACY')) + @if (config('SETTINGS::SYSTEM:SHOW_PRIVACY' == "true")) {{ __('Privacy') }} @endif - @if (config('SETTINGS::SYSTEM:SHOW_TOS')) - | {{ __('Terms of Service') }} + @if (config('SETTINGS::SYSTEM:SHOW_TOS' == "true")) + | {{ __('Terms of Service') }} @endif
diff --git a/themes/default/views/auth/passwords/email.blade.php b/themes/default/views/auth/passwords/email.blade.php index 916ed0c5..f049f60d 100644 --- a/themes/default/views/auth/passwords/email.blade.php +++ b/themes/default/views/auth/passwords/email.blade.php @@ -70,12 +70,15 @@ {{-- imprint and privacy policy --}}
- @if (config('SETTINGS::SYSTEM:SHOW_IMPRINT')) + @if (config('SETTINGS::SYSTEM:SHOW_IMPRINT' == "true")) {{ __('Imprint') }} | @endif - @if (config('SETTINGS::SYSTEM:SHOW_PRIVACY')) + @if (config('SETTINGS::SYSTEM:SHOW_PRIVACY' == "true")) {{ __('Privacy') }} @endif + @if (config('SETTINGS::SYSTEM:SHOW_TOS' == "true")) + | {{ __('Terms of Service') }} + @endif
diff --git a/themes/default/views/auth/passwords/reset.blade.php b/themes/default/views/auth/passwords/reset.blade.php index 458b169d..a5caf610 100644 --- a/themes/default/views/auth/passwords/reset.blade.php +++ b/themes/default/views/auth/passwords/reset.blade.php @@ -79,14 +79,17 @@ {{-- imprint and privacy policy --}} -
+
- @if (config('SETTINGS::SYSTEM:SHOW_IMPRINT')) + @if (config('SETTINGS::SYSTEM:SHOW_IMPRINT' == "true")) {{ __('Imprint') }} | @endif - @if (config('SETTINGS::SYSTEM:SHOW_PRIVACY')) + @if (config('SETTINGS::SYSTEM:SHOW_PRIVACY' == "true")) {{ __('Privacy') }} @endif + @if (config('SETTINGS::SYSTEM:SHOW_TOS' == "true")) + | {{ __('Terms of Service') }} + @endif
diff --git a/themes/default/views/auth/register.blade.php b/themes/default/views/auth/register.blade.php index 02ee833c..4bdf0027 100644 --- a/themes/default/views/auth/register.blade.php +++ b/themes/default/views/auth/register.blade.php @@ -179,13 +179,13 @@ {{-- imprint and privacy policy --}}
- @if (config('SETTINGS::SYSTEM:SHOW_IMPRINT')) - {{ __('Imprint') }} | + @if (config('SETTINGS::SYSTEM:SHOW_IMPRINT' == "true")) + {{ __('Imprint') }} | @endif - @if (config('SETTINGS::SYSTEM:SHOW_PRIVACY')) - {{ __('Privacy') }} + @if (config('SETTINGS::SYSTEM:SHOW_PRIVACY' == "true")) + {{ __('Privacy') }} @endif - @if (config('SETTINGS::SYSTEM:SHOW_TOS')) + @if (config('SETTINGS::SYSTEM:SHOW_TOS' == "true")) | {{ __('Terms of Service') }} @endif
diff --git a/themes/default/views/layouts/main.blade.php b/themes/default/views/layouts/main.blade.php index e759fb21..fea8624a 100644 --- a/themes/default/views/layouts/main.blade.php +++ b/themes/default/views/layouts/main.blade.php @@ -428,13 +428,13 @@ {{-- Show imprint and privacy link --}}
- @if (config('SETTINGS::SYSTEM:SHOW_IMPRINT')) + @if (config('SETTINGS::SYSTEM:SHOW_IMPRINT' == "true")) {{ __('Imprint') }} | @endif - @if (config('SETTINGS::SYSTEM:SHOW_PRIVACY')) + @if (config('SETTINGS::SYSTEM:SHOW_PRIVACY' == "true")) {{ __('Privacy') }} @endif - @if (config('SETTINGS::SYSTEM:SHOW_TOS')) + @if (config('SETTINGS::SYSTEM:SHOW_TOS' == "true")) | {{ __('Terms of Service') }} @endif
From c2d50c3b330b92e159fe08ea7cca8243741a7aef Mon Sep 17 00:00:00 2001 From: 1day2die Date: Wed, 11 Jan 2023 16:51:18 +0100 Subject: [PATCH 5/5] fix imprint --- themes/default/views/auth/login.blade.php | 6 +++--- themes/default/views/auth/passwords/email.blade.php | 6 +++--- themes/default/views/auth/passwords/reset.blade.php | 6 +++--- themes/default/views/auth/register.blade.php | 6 +++--- themes/default/views/layouts/main.blade.php | 10 +++++----- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/themes/default/views/auth/login.blade.php b/themes/default/views/auth/login.blade.php index d1b4f70f..d0f45635 100644 --- a/themes/default/views/auth/login.blade.php +++ b/themes/default/views/auth/login.blade.php @@ -125,13 +125,13 @@ {{-- imprint and privacy policy --}}
- @if (config('SETTINGS::SYSTEM:SHOW_IMPRINT' == "true")) + @if (config('SETTINGS::SYSTEM:SHOW_IMPRINT') == "true") {{ __('Imprint') }} | @endif - @if (config('SETTINGS::SYSTEM:SHOW_PRIVACY' == "true")) + @if (config('SETTINGS::SYSTEM:SHOW_PRIVACY') == "true") {{ __('Privacy') }} @endif - @if (config('SETTINGS::SYSTEM:SHOW_TOS' == "true")) + @if (config('SETTINGS::SYSTEM:SHOW_TOS') == "true") | {{ __('Terms of Service') }} @endif
diff --git a/themes/default/views/auth/passwords/email.blade.php b/themes/default/views/auth/passwords/email.blade.php index f049f60d..909d1e14 100644 --- a/themes/default/views/auth/passwords/email.blade.php +++ b/themes/default/views/auth/passwords/email.blade.php @@ -70,13 +70,13 @@ {{-- imprint and privacy policy --}}
- @if (config('SETTINGS::SYSTEM:SHOW_IMPRINT' == "true")) + @if (config('SETTINGS::SYSTEM:SHOW_IMPRINT') == "true") {{ __('Imprint') }} | @endif - @if (config('SETTINGS::SYSTEM:SHOW_PRIVACY' == "true")) + @if (config('SETTINGS::SYSTEM:SHOW_PRIVACY') == "true") {{ __('Privacy') }} @endif - @if (config('SETTINGS::SYSTEM:SHOW_TOS' == "true")) + @if (config('SETTINGS::SYSTEM:SHOW_TOS') == "true") | {{ __('Terms of Service') }} @endif
diff --git a/themes/default/views/auth/passwords/reset.blade.php b/themes/default/views/auth/passwords/reset.blade.php index a5caf610..1e56b845 100644 --- a/themes/default/views/auth/passwords/reset.blade.php +++ b/themes/default/views/auth/passwords/reset.blade.php @@ -81,13 +81,13 @@ {{-- imprint and privacy policy --}}
- @if (config('SETTINGS::SYSTEM:SHOW_IMPRINT' == "true")) + @if (config('SETTINGS::SYSTEM:SHOW_IMPRINT') == "true") {{ __('Imprint') }} | @endif - @if (config('SETTINGS::SYSTEM:SHOW_PRIVACY' == "true")) + @if (config('SETTINGS::SYSTEM:SHOW_PRIVACY') == "true") {{ __('Privacy') }} @endif - @if (config('SETTINGS::SYSTEM:SHOW_TOS' == "true")) + @if (config('SETTINGS::SYSTEM:SHOW_TOS') == "true") | {{ __('Terms of Service') }} @endif
diff --git a/themes/default/views/auth/register.blade.php b/themes/default/views/auth/register.blade.php index 4bdf0027..783508c8 100644 --- a/themes/default/views/auth/register.blade.php +++ b/themes/default/views/auth/register.blade.php @@ -179,13 +179,13 @@ {{-- imprint and privacy policy --}}
- @if (config('SETTINGS::SYSTEM:SHOW_IMPRINT' == "true")) + @if (config('SETTINGS::SYSTEM:SHOW_IMPRINT') == "true") {{ __('Imprint') }} | @endif - @if (config('SETTINGS::SYSTEM:SHOW_PRIVACY' == "true")) + @if (config('SETTINGS::SYSTEM:SHOW_PRIVACY') == "true") {{ __('Privacy') }} @endif - @if (config('SETTINGS::SYSTEM:SHOW_TOS' == "true")) + @if (config('SETTINGS::SYSTEM:SHOW_TOS') == "true") | {{ __('Terms of Service') }} @endif
diff --git a/themes/default/views/layouts/main.blade.php b/themes/default/views/layouts/main.blade.php index fea8624a..cebb722e 100644 --- a/themes/default/views/layouts/main.blade.php +++ b/themes/default/views/layouts/main.blade.php @@ -428,15 +428,15 @@ {{-- Show imprint and privacy link --}}
- @if (config('SETTINGS::SYSTEM:SHOW_IMPRINT' == "true")) + @if (config('SETTINGS::SYSTEM:SHOW_IMPRINT') == "true") {{ __('Imprint') }} | @endif - @if (config('SETTINGS::SYSTEM:SHOW_PRIVACY' == "true")) + @if (config('SETTINGS::SYSTEM:SHOW_PRIVACY') == "true") {{ __('Privacy') }} @endif - @if (config('SETTINGS::SYSTEM:SHOW_TOS' == "true")) - | {{ __('Terms of Service') }} - @endif + @if (config('SETTINGS::SYSTEM:SHOW_TOS') == "true") + | {{ __('Terms of Service') }} + @endif