beenull/ctrlpanel
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

upgrade installer, fix TOS showing

Browse source
This commit is contained in:
1day2die 2023-01-11 16:44:44 +01:00
parent 8bff4f857b
commit b69cbcfe65
7 changed files with 27 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
public/install/functions.php
View file

@ -3,15 +3,15 @@
$required_extentions = ['openssl', 'gd', 'mysql', 'PDO', 'mbstring', 'tokenizer', 'bcmath', 'xml', 'curl', 'zip', 'intl']; $required_extentions = ['openssl', 'gd', 'mysql', 'PDO', 'mbstring', 'tokenizer', 'bcmath', 'xml', 'curl', 'zip', 'intl'];
$requirements = [ $requirements = [
'minPhp' => '7.4', 'minPhp' => '8.1',
'maxPhp' => '8.1', // This version is not supported 'maxPhp' => '8.1.9', // This version is not supported
'mysql' => '5.7.22', 'mysql' => '5.7.22',
]; ];
function checkPhpVersion() function checkPhpVersion()
{ {
global $requirements; 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'; return 'OK';
} }

1
public/install/index.php
View file

@ -65,6 +65,7 @@ if (! isset($_GET['step'])) {
<p class="<?php echo checkPhpVersion() === 'OK' ? 'ok' : 'notok'; ?>"> php <p class="<?php echo checkPhpVersion() === 'OK' ? 'ok' : 'notok'; ?>"> php
version: <?php echo phpversion(); ?> (minimum required <?php echo $requirements['minPhp']; ?>)</p> version: <?php echo phpversion(); ?> (minimum required <?php echo $requirements['minPhp']; ?>)</p>
<p class="<?php echo getMySQLVersion() === 'OK' ? 'ok' : 'notok'; ?>"> mysql <p class="<?php echo getMySQLVersion() === 'OK' ? 'ok' : 'notok'; ?>"> mysql
version: <?php echo getMySQLVersion(); ?> (minimum required <?php echo $requirements['mysql']; ?>)</p> version: <?php echo getMySQLVersion(); ?> (minimum required <?php echo $requirements['mysql']; ?>)</p>

8
themes/default/views/auth/login.blade.php
View file

@ -125,14 +125,14 @@
{{-- imprint and privacy policy --}} {{-- imprint and privacy policy --}}
<div class="fixed-bottom "> <div class="fixed-bottom ">
<div class="container text-center"> <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> | <a href="{{ route('imprint') }}"><strong>{{ __('Imprint') }}</strong></a> |
@endif @endif
@if (config('SETTINGS::SYSTEM:SHOW_PRIVACY')) @if (config('SETTINGS::SYSTEM:SHOW_PRIVACY' == "true"))
<a href="{{ route('privacy') }}"><strong>{{ __('Privacy') }}</strong></a> <a href="{{ route('privacy') }}"><strong>{{ __('Privacy') }}</strong></a>
@endif @endif
@if (config('SETTINGS::SYSTEM:SHOW_TOS')) @if (config('SETTINGS::SYSTEM:SHOW_TOS' == "true"))
| <a href="{{ route('tos') }}"><strong>{{ __('Terms of Service') }}</strong></a> | <a target="_blank" href="{{ route('tos') }}"><strong>{{ __('Terms of Service') }}</strong></a>
@endif @endif
</div> </div>
</div> </div>

7
themes/default/views/auth/passwords/email.blade.php
View file

@ -70,12 +70,15 @@
{{-- imprint and privacy policy --}} {{-- imprint and privacy policy --}}
<div class="fixed-bottom "> <div class="fixed-bottom ">
<div class="container text-center"> <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> | <a href="{{ route('imprint') }}"><strong>{{ __('Imprint') }}</strong></a> |
@endif @endif
@if (config('SETTINGS::SYSTEM:SHOW_PRIVACY')) @if (config('SETTINGS::SYSTEM:SHOW_PRIVACY' == "true"))
<a href="{{ route('privacy') }}"><strong>{{ __('Privacy') }}</strong></a> <a href="{{ route('privacy') }}"><strong>{{ __('Privacy') }}</strong></a>
@endif @endif
@if (config('SETTINGS::SYSTEM:SHOW_TOS' == "true"))
| <a target="_blank" href="{{ route('tos') }}"><strong>{{ __('Terms of Service') }}</strong></a>
@endif
</div> </div>
</div> </div>
</body> </body>

9
themes/default/views/auth/passwords/reset.blade.php
View file

@ -79,14 +79,17 @@
<!-- /.login-box --> <!-- /.login-box -->
{{-- imprint and privacy policy --}} {{-- imprint and privacy policy --}}
<div class="fixed-bottom"> <div class="fixed-bottom ">
<div class="container text-center"> <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> | <a href="{{ route('imprint') }}"><strong>{{ __('Imprint') }}</strong></a> |
@endif @endif
@if (config('SETTINGS::SYSTEM:SHOW_PRIVACY')) @if (config('SETTINGS::SYSTEM:SHOW_PRIVACY' == "true"))
<a href="{{ route('privacy') }}"><strong>{{ __('Privacy') }}</strong></a> <a href="{{ route('privacy') }}"><strong>{{ __('Privacy') }}</strong></a>
@endif @endif
@if (config('SETTINGS::SYSTEM:SHOW_TOS' == "true"))
| <a target="_blank" href="{{ route('tos') }}"><strong>{{ __('Terms of Service') }}</strong></a>
@endif
</div> </div>
</div> </div>
</body> </body>

10
themes/default/views/auth/register.blade.php
View file

@ -179,13 +179,13 @@
{{-- imprint and privacy policy --}} {{-- imprint and privacy policy --}}
<div class="fixed-bottom "> <div class="fixed-bottom ">
<div class="container text-center"> <div class="container text-center">
@if (config('SETTINGS::SYSTEM:SHOW_IMPRINT')) @if (config('SETTINGS::SYSTEM:SHOW_IMPRINT' == "true"))
<a target="_blank" href="{{ route('imprint') }}"><strong>{{ __('Imprint') }}</strong></a> | <a href="{{ route('imprint') }}"><strong>{{ __('Imprint') }}</strong></a> |
@endif @endif
@if (config('SETTINGS::SYSTEM:SHOW_PRIVACY')) @if (config('SETTINGS::SYSTEM:SHOW_PRIVACY' == "true"))
<a target="_blank" href="{{ route('privacy') }}"><strong>{{ __('Privacy') }}</strong></a> <a href="{{ route('privacy') }}"><strong>{{ __('Privacy') }}</strong></a>
@endif @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> | <a target="_blank" href="{{ route('tos') }}"><strong>{{ __('Terms of Service') }}</strong></a>
@endif @endif
</div> </div>

6
themes/default/views/layouts/main.blade.php
View file

@ -428,13 +428,13 @@
{{-- Show imprint and privacy link --}} {{-- Show imprint and privacy link --}}
<div class="float-right d-none d-sm-inline-block"> <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> | <a target="_blank" href="{{ route('imprint') }}"><strong>{{ __('Imprint') }}</strong></a> |
@endif @endif
@if (config('SETTINGS::SYSTEM:SHOW_PRIVACY')) @if (config('SETTINGS::SYSTEM:SHOW_PRIVACY' == "true"))
<a target="_blank" href="{{ route('privacy') }}"><strong>{{ __('Privacy') }}</strong></a> <a target="_blank" href="{{ route('privacy') }}"><strong>{{ __('Privacy') }}</strong></a>
@endif @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> | <a target="_blank" href="{{ route('tos') }}"><strong>{{ __('Terms of Service') }}</strong></a>
@endif @endif
</div> </div>