From 81662b8e17ae5478d25a86ae4fd321c7644a590c Mon Sep 17 00:00:00 2001 From: 1day2die Date: Wed, 4 Jan 2023 11:51:35 +0100 Subject: [PATCH] TOS on register site --- .../Controllers/Auth/RegisterController.php | 3 + resources/views/auth/register.blade.php | 299 +++++++++--------- 2 files changed, 157 insertions(+), 145 deletions(-) diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php index 5a805987..f08f6274 100644 --- a/app/Http/Controllers/Auth/RegisterController.php +++ b/app/Http/Controllers/Auth/RegisterController.php @@ -67,6 +67,9 @@ class RegisterController extends Controller if (config('SETTINGS::RECAPTCHA:ENABLED') == 'true') { $validationRules['g-recaptcha-response'] = ['required', 'recaptcha']; } + if (config('SETTINGS::SYSTEM:SHOW_TOS') == 'true') { + $validationRules['terms'] = ['required']; + } if (config('SETTINGS::SYSTEM:REGISTER_IP_CHECK', 'true') == 'true') { diff --git a/resources/views/auth/register.blade.php b/resources/views/auth/register.blade.php index 49193aee..02ee833c 100644 --- a/resources/views/auth/register.blade.php +++ b/resources/views/auth/register.blade.php @@ -3,184 +3,193 @@ @section('content') -
-
-
- {{ config('app.name', 'Laravel') }} -
-
- @if (!config('SETTINGS::SYSTEM:CREATION_OF_NEW_USERS')) -
-
{{ __('Warning!') }}
- {{ __('The system administrator has blocked the registration of new users') }} -
-
- {{ __('Back') }} -
- @else - +
+
+
+ {{ config('app.name', 'Laravel') }} +
+
+ @if (!config('SETTINGS::SYSTEM:CREATION_OF_NEW_USERS')) +
+
{{ __('Warning!') }}
+ {{ __('The system administrator has blocked the registration of new users') }} +
+
+ {{ __('Back') }} +
+ @else + -
+ - @error('ip') - + @error('ip') + {{ $message }} - @enderror + @enderror - @error('registered') - + @error('registered') + {{ $message }} - @enderror - @if ($errors->has('ptero_registration_error')) - @foreach ($errors->get('ptero_registration_error') as $err) - + @enderror + @if ($errors->has('ptero_registration_error')) + @foreach ($errors->get('ptero_registration_error') as $err) + {{ $err }} - @endforeach - @endif + @endforeach + @endif - @csrf -
-
- -
-
- -
+ @csrf +
+
+ +
+
+
- @error('name') - +
+ @error('name') + {{ $message }} - @enderror -
+ @enderror +
-
-
- -
-
- -
-
-
- @error('email') - - {{ $message }} - - @enderror -
- -
-
- -
-
- -
-
-
- @error('password') - - {{ $message }} - - @enderror -
- +
- + +
+
+ +
+
+
+ @error('email') + + {{ $message }} + + @enderror +
+ +
+
+
- @if (config('SETTINGS::REFERRAL::ENABLED') == 'true') -
- -
-
- -
+ @error('password') + + {{ $message }} + + @enderror +
+ +
+ +
+
+ +
+
+
+ @if (config('SETTINGS::REFERRAL::ENABLED') == 'true') +
+ +
+
+
- @endif - @if (config('SETTINGS::RECAPTCHA:ENABLED') == 'true') -
- {!! htmlFormSnippet() !!} - @error('g-recaptcha-response') - +
+ @endif + @if (config('SETTINGS::RECAPTCHA:ENABLED') == 'true') +
+ {!! htmlFormSnippet() !!} + @error('g-recaptcha-response') + {{ $message }} - @enderror -
- @endif - -
-
- - {{--
--}} - {{-- --}} - {{-- --}} - {{--
--}} -
- -
- -
- + @enderror
- + @endif - {{-- --}} +
+
+ @if (config('SETTINGS::SYSTEM:SHOW_TOS')) - {{ __('I already have a membership') }} -
- -
-
- +
+ + +
+ @error('terms') + + {{ $message }} + + @enderror - {{-- imprint and privacy policy --}} -
-
- @if (config('SETTINGS::SYSTEM:SHOW_IMPRINT')) - {{ __('Imprint') }} | - @endif - @if (config('SETTINGS::SYSTEM:SHOW_PRIVACY')) - {{ __('Privacy') }} - @endif - @if (config('SETTINGS::SYSTEM:SHOW_TOS')) - | {{ __('Terms of Service') }} - @endif + @endif +
+
+ +
+ +
+
+ + + {{-- --}} + + {{ __('I already have a membership') }}
+ +
+
+ + + {{-- imprint and privacy policy --}} +
+
+ @if (config('SETTINGS::SYSTEM:SHOW_IMPRINT')) + {{ __('Imprint') }} | + @endif + @if (config('SETTINGS::SYSTEM:SHOW_PRIVACY')) + {{ __('Privacy') }} + @endif + @if (config('SETTINGS::SYSTEM:SHOW_TOS')) + | {{ __('Terms of Service') }} + @endif +
+
@endif @endsection