Some smaller fixes (#880)

app/Http/Controllers/Admin/OverViewController.php

@@ -37,7 +37,9 @@ class OverViewController extends Controller
         //Get counters
         $counters = collect();
         //Set basic variables in the collection
-        $counters->put('users', User::query()->count());
+        $counters->put('users', collect());
+        $counters['users']->active = User::where("suspended", 0)->count();
+        $counters['users']->total = User::query()->count();
         $counters->put('credits', number_format(User::query()->whereHas("roles", function($q){ $q->where("id", "!=", "1"); })->sum('credits'), 2, '.', ''));
         $counters->put('payments', Payment::query()->count());
         $counters->put('eggs', Egg::query()->count());

app/Http/Controllers/Admin/VoucherController.php

@@ -245,10 +245,10 @@ class VoucherController extends Controller
             })
             ->editColumn('expires_at', function (Voucher $voucher) {
                 if (! $voucher->expires_at) {
-                    return '';
+                    return __("Never");
                 }
 
-                return $voucher->expires_at ? $voucher->expires_at->diffForHumans() : '';
+                return $voucher->expires_at ? $voucher->expires_at->diffForHumans() : __("Never");
             })
             ->editColumn('code', function (Voucher $voucher) {
                 return "<code>{$voucher->code}</code>";

public/install/functions.php

@@ -19,7 +19,7 @@ $required_extensions = ['openssl', 'gd', 'mysql', 'PDO', 'mbstring', 'tokenizer'
 
 $requirements = [
     'minPhp' => '8.1',
-    'maxPhp' => '8.2', // This version is not supported
+    'maxPhp' => '8.3', // This version is not supported
     'mysql' => '5.7.22',
 ];
 

themes/default/views/admin/overview/index.blade.php

@@ -58,7 +58,12 @@
                         <span class="info-box-icon bg-info elevation-1"><i class="fas fa-server"></i></span>
 
                         <div class="info-box-content">
-                            <span class="info-box-text">{{__('Servers')}}</span>
+                            <span class="info-box-text">{{__('Servers')}}
+                          <i class="fas fa-info-circle mr-4" data-toggle="popover"
+                             data-trigger="hover" data-placement="top"
+                             data-html="true"
+                             data-content="{{ __("This shows the total active servers and the total servers. Total active servers are all servers which are not suspended") }}"></i>
+                            </span>
                             <span class="info-box-number">{{$counters['servers']->active}}/{{$counters['servers']->total}}</span>
                         </div>
                         <!-- /.info-box-content -->
@@ -71,8 +76,13 @@
                         <span class="info-box-icon bg-primary elevation-1"><i class="fas fa-users"></i></span>
 
                         <div class="info-box-content">
-                            <span class="info-box-text">{{__('Users')}}</span>
-                            <span class="info-box-number">{{$counters['users']}}</span>
+                            <span class="info-box-text">{{__('Users')}}
+                              <i class="fas fa-info-circle mr-4" data-toggle="popover"
+                                  data-trigger="hover" data-placement="top"
+                                  data-html="true"
+                                  data-content="{{ __("This shows the total active Users and the total Users. Total active Users are all Users which are not suspended") }}"></i>
+                              </span>
+                          <span class="info-box-number">{{$counters['users']->active}}/{{$counters['users']->total}}</span>
                         </div>
                         <!-- /.info-box-content -->
                     </div>

themes/default/views/admin/products/index.blade.php

@@ -51,10 +51,10 @@
                             <th>{{__('Disk')}}</th>
                             <th>{{__('Databases')}}</th>
                             <th>{{__('Backups')}}</th>
+                            <th>{{__('OOM Killer')}}</th>
                             <th>{{__('Nodes')}}</th>
                             <th>{{__('Eggs')}}</th>
                             <th>{{__('Min Credits')}}</th>
-                            <th>{{__('OOM Killer')}}</th>
                             <th>{{__('Servers')}}</th>
                             <th>{{__('Created at')}}</th>
                             <th>{{ __('Actions') }}</th>
@@ -101,10 +101,10 @@
                     {data: "disk"},
                     {data: "databases"},
                     {data: "backups"},
+                    {data: "oom_killer"},
                     {data: "nodes", sortable: false},
                     {data: "eggs", sortable: false},
                     {data: "minimum_credits"},
-                    {data: "oom_killer"},
                     {data: "servers", sortable: false},
                     {data: "created_at"},
                     {data: "actions", sortable: false}

themes/default/views/admin/users/show.blade.php

@@ -100,7 +100,7 @@
                                     <label>{{ __('Email') }}</label>
                                 </div>
                                 <div class="col-lg-8">
-                                    <span style="max-width: 250px;" class="d-inline-block text-truncate">
+                                    <span style="max-width: 400px;" class="d-inline-block text-truncate">
                                         {{ $user->email }}
                                     </span>
                                 </div>

themes/default/views/auth/login.blade.php

@@ -32,7 +32,7 @@
                         <div class="form-group">
                             <div class="input-group mb-3">
                                 <input type="text" name="email"
-                                    class="form-control @error('email') is-invalid @enderror"
+                                    class="form-control @error('email') is-invalid @enderror @error('name') is-invalid @enderror"
                                     placeholder="{{ __('Email or Username') }}">
                                 <div class="input-group-append">
                                     <div class="input-group-text">
@@ -41,11 +41,11 @@
                                 </div>
 
                             </div>
-                            @error('email')
+                          @if ($errors->get("email") || $errors->get("name"))
                                 <span class="text-danger" role="alert">
-                                    <small><strong>{{ $message }}</strong></small>
+                                    <small><strong>{{ $errors->first('email') ? $errors->first('email') : $errors->first('name') }}</strong></small>
                                 </span>
-                            @enderror
+                            @endif
                         </div>
 
                         <div class="form-group">

themes/default/views/home.blade.php

@@ -251,14 +251,14 @@
                                     <table class="table">
                                         <thead>
                                             <tr>
-                                                @if(in_array($referral_settings->mode, ["Commission","Both"]))<th>{{ __('Reward per registered user') }}</th> @endif
-                                                @if(in_array($referral_settings->mode, ["Sign-Up","Both"]))<th>{{ __('New user payment commision') }}</th> @endif
+                                                @if(in_array($referral_settings->mode, ["comission","both"]))<th>{{ __('Reward per registered user') }}</th> @endif
+                                                @if(in_array($referral_settings->mode, ["sign-up","both"]))<th>{{ __('New user payment commision') }}</th> @endif
                                             </tr>
                                         </thead>
                                         <tbody>
                                             <tr>
-                                                @if(in_array($referral_settings->mode, ["Commission","Both"]))<td>{{ $referral_settings->reward }} {{ $general_settings->credits_display_name }}</td> @endif
-                                                @if(in_array($referral_settings->mode, ["Sign-Up","Both"]))<td>{{ $referral_settings->percentage }}%</td> @endif
+                                                @if(in_array($referral_settings->mode, ["comission","both"]))<td>{{ $referral_settings->reward }} {{ $general_settings->credits_display_name }}</td> @endif
+                                                @if(in_array($referral_settings->mode, ["sign-up","both"]))<td>{{ $referral_settings->percentage }}%</td> @endif
                                             </tr>
                                         </tbody>
                                     </table>