From b69cbcfe65f62e0f4a62732b4113ed5e615ab963 Mon Sep 17 00:00:00 2001
From: 1day2die <ownerdennis8@gmail.com>
Date: Wed, 11 Jan 2023 16:44:44 +0100
Subject: [PATCH] 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'])) {
 
     <p class="<?php echo checkPhpVersion() === 'OK' ? 'ok' : 'notok'; ?>"> php
         version: <?php echo phpversion(); ?> (minimum required <?php echo $requirements['minPhp']; ?>)</p>
+
     <p class="<?php echo getMySQLVersion() === 'OK' ? 'ok' : 'notok'; ?>"> mysql
         version: <?php echo getMySQLVersion(); ?> (minimum required <?php echo $requirements['mysql']; ?>)</p>
 
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 --}}
         <div class="fixed-bottom ">
             <div class="container text-center">
-                @if (config('SETTINGS::SYSTEM:SHOW_IMPRINT'))
+                @if (config('SETTINGS::SYSTEM:SHOW_IMPRINT' == "true"))
                     <a href="{{ route('imprint') }}"><strong>{{ __('Imprint') }}</strong></a> |
                 @endif
-                @if (config('SETTINGS::SYSTEM:SHOW_PRIVACY'))
+                @if (config('SETTINGS::SYSTEM:SHOW_PRIVACY' == "true"))
                     <a href="{{ route('privacy') }}"><strong>{{ __('Privacy') }}</strong></a>
                 @endif
-                @if (config('SETTINGS::SYSTEM:SHOW_TOS'))
-                    | <a href="{{ route('tos') }}"><strong>{{ __('Terms of Service') }}</strong></a>
+                @if (config('SETTINGS::SYSTEM:SHOW_TOS' == "true"))
+                    | <a target="_blank" href="{{ route('tos') }}"><strong>{{ __('Terms of Service') }}</strong></a>
                 @endif
             </div>
         </div>
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 --}}
         <div class="fixed-bottom ">
             <div class="container text-center">
-                @if (config('SETTINGS::SYSTEM:SHOW_IMPRINT'))
+                @if (config('SETTINGS::SYSTEM:SHOW_IMPRINT' == "true"))
                     <a href="{{ route('imprint') }}"><strong>{{ __('Imprint') }}</strong></a> |
                 @endif
-                @if (config('SETTINGS::SYSTEM:SHOW_PRIVACY'))
+                @if (config('SETTINGS::SYSTEM:SHOW_PRIVACY' == "true"))
                     <a href="{{ route('privacy') }}"><strong>{{ __('Privacy') }}</strong></a>
                 @endif
+                @if (config('SETTINGS::SYSTEM:SHOW_TOS' == "true"))
+                    | <a target="_blank" href="{{ route('tos') }}"><strong>{{ __('Terms of Service') }}</strong></a>
+                @endif
             </div>
         </div>
     </body>
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 @@
         <!-- /.login-box -->
 
         {{-- imprint and privacy policy --}}
-        <div class="fixed-bottom">
+        <div class="fixed-bottom ">
             <div class="container text-center">
-                @if (config('SETTINGS::SYSTEM:SHOW_IMPRINT'))
+                @if (config('SETTINGS::SYSTEM:SHOW_IMPRINT' == "true"))
                     <a href="{{ route('imprint') }}"><strong>{{ __('Imprint') }}</strong></a> |
                 @endif
-                @if (config('SETTINGS::SYSTEM:SHOW_PRIVACY'))
+                @if (config('SETTINGS::SYSTEM:SHOW_PRIVACY' == "true"))
                     <a href="{{ route('privacy') }}"><strong>{{ __('Privacy') }}</strong></a>
                 @endif
+                @if (config('SETTINGS::SYSTEM:SHOW_TOS' == "true"))
+                    | <a target="_blank" href="{{ route('tos') }}"><strong>{{ __('Terms of Service') }}</strong></a>
+                @endif
             </div>
         </div>
     </body>
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 --}}
     <div class="fixed-bottom ">
         <div class="container text-center">
-            @if (config('SETTINGS::SYSTEM:SHOW_IMPRINT'))
-                <a target="_blank" href="{{ route('imprint') }}"><strong>{{ __('Imprint') }}</strong></a> |
+            @if (config('SETTINGS::SYSTEM:SHOW_IMPRINT' == "true"))
+                <a href="{{ route('imprint') }}"><strong>{{ __('Imprint') }}</strong></a> |
             @endif
-            @if (config('SETTINGS::SYSTEM:SHOW_PRIVACY'))
-                <a target="_blank" href="{{ route('privacy') }}"><strong>{{ __('Privacy') }}</strong></a>
+            @if (config('SETTINGS::SYSTEM:SHOW_PRIVACY' == "true"))
+                <a href="{{ route('privacy') }}"><strong>{{ __('Privacy') }}</strong></a>
             @endif
-            @if (config('SETTINGS::SYSTEM:SHOW_TOS'))
+            @if (config('SETTINGS::SYSTEM:SHOW_TOS' == "true"))
                 | <a target="_blank" href="{{ route('tos') }}"><strong>{{ __('Terms of Service') }}</strong></a>
             @endif
         </div>
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 --}}
             <div class="float-right d-none d-sm-inline-block">
-                @if (config('SETTINGS::SYSTEM:SHOW_IMPRINT'))
+                @if (config('SETTINGS::SYSTEM:SHOW_IMPRINT' == "true"))
                     <a target="_blank" href="{{ route('imprint') }}"><strong>{{ __('Imprint') }}</strong></a> |
                 @endif
-                @if (config('SETTINGS::SYSTEM:SHOW_PRIVACY'))
+                @if (config('SETTINGS::SYSTEM:SHOW_PRIVACY' == "true"))
                     <a target="_blank" href="{{ route('privacy') }}"><strong>{{ __('Privacy') }}</strong></a>
                 @endif
-                    @if (config('SETTINGS::SYSTEM:SHOW_TOS'))
+                    @if (config('SETTINGS::SYSTEM:SHOW_TOS' == "true"))
                        | <a target="_blank" href="{{ route('tos') }}"><strong>{{ __('Terms of Service') }}</strong></a>
                     @endif
             </div>