Browse Source

sync servers button - deleted on ptero + names

ok236449 2 years ago
parent
commit
c7ec586157

+ 38 - 0
app/Http/Controllers/Admin/ServerController.php

@@ -123,6 +123,44 @@ class ServerController extends Controller
         return redirect()->back()->with('success', __('Server has been updated!'));
         return redirect()->back()->with('success', __('Server has been updated!'));
     }
     }
 
 
+    public function syncServers()
+    {
+        $pteroServers = Pterodactyl::getServers();
+        $CPServers = Server::get();
+
+        $CPIDArray = [];
+        $renameCount = 0;
+        foreach($CPServers as $CPServer)//go thru all CP servers and make array with IDs as keys. All values are false.
+        {
+            if($CPServer->pterodactyl_id) $CPIDArray[$CPServer->pterodactyl_id] = false;
+        }
+
+        foreach($pteroServers as $server)//go thru all ptero servers, if server exists, change value to true in array.
+        {
+            if(isset($CPIDArray[$server['attributes']['id']])){
+                $CPIDArray[$server['attributes']['id']]=true;
+
+                if(isset($server['attributes']['name'])){//failsafe
+                    //Check if a server got renamed
+                    $savedServer = Server::query()->where('pterodactyl_id', $server['attributes']['id'])->first();
+                    if($savedServer->name != $server['attributes']['name']){
+                        $savedServer->name = $server['attributes']['name'];
+                        $savedServer->save();
+                        $renameCount++;
+                    }
+                }
+            }
+        }
+        $filteredArray = array_filter($CPIDArray, function($v, $k) { return $v == false; }, ARRAY_FILTER_USE_BOTH); //Array of servers, that dont exist on ptero (value == false)
+        $deleteCount = 0;
+        foreach($filteredArray as $key => $CPID)//delete servers that dont exist on ptero anymore
+        {
+            if(!Pterodactyl::getServerAttributes($key, true)) $deleteCount++;
+        }
+
+        return redirect()->back()->with('success', __('Servers synced successfully' . (($renameCount)?(',\n' . __('renamed') . ' ' . $renameCount . ' ' . __('servers')):'') . ((count($filteredArray))?(',\n' . __('deleted') . ' ' . $deleteCount . '/' . count($filteredArray) . ' ' . __('old servers')):''))) . '.';
+    }
+
     /**
     /**
      * @return JsonResponse|mixed
      * @return JsonResponse|mixed
      * @throws Exception
      * @throws Exception

+ 5 - 3
resources/views/admin/overview/index.blade.php

@@ -207,11 +207,13 @@
                             @if ($perPageLimit)
                             @if ($perPageLimit)
                                 <div class="alert alert-danger m-2">
                                 <div class="alert alert-danger m-2">
                                     <h5><i class="icon fas fa-exclamation-circle"></i>{{ __('Error!') }}</h5>
                                     <h5><i class="icon fas fa-exclamation-circle"></i>{{ __('Error!') }}</h5>
-                                    <p class="">
+                                    <p class="mb-2">
                                         {{ __('You reached the Pterodactyl perPage limit. Please make sure to set it higher than your server count.') }}<br>
                                         {{ __('You reached the Pterodactyl perPage limit. Please make sure to set it higher than your server count.') }}<br>
-                                        {{ __('You can do that in settings.') }}<br>
-                                        {{ __('Note') }}: {{ __('If this error persists even after changing the limit, it might mean a server was deleted on Pterodactyl, but not on ControlPanel.') }}
+                                        {{ __('You can do that in settings.') }}<br><br>
+                                        {{ __('Note') }}: {{ __('If this error persists even after changing the limit, it might mean a server was deleted on Pterodactyl, but not on ControlPanel. Try clicking the button below.') }}
                                     </p>
                                     </p>
+                                    <a href="{{route('admin.servers.sync')}}" class="btn btn-primary btn-md"><i
+                                        class="fas fa-sync mr-2"></i>{{__('Sync servers')}}</a>
                                 </div>
                                 </div>
                             @endif
                             @endif
                             <table class="table">
                             <table class="table">

+ 7 - 1
resources/views/admin/servers/index.blade.php

@@ -25,7 +25,13 @@
 
 
             <div class="card">
             <div class="card">
                 <div class="card-header">
                 <div class="card-header">
-                    <h5 class="card-title"><i class="fas fa-server mr-2"></i>{{__('Servers')}}</h5>
+                    <div class="d-flex justify-content-between">
+                        <div class="card-title ">
+                            <span><i class="fas fa-server mr-2"></i>{{__('Servers')}}</span>
+                        </div>
+                        <a href="{{route('admin.servers.sync')}}" class="btn btn-primary btn-sm"><i
+                                class="fas fa-sync mr-2"></i>{{__('Sync')}}</a>
+                    </div>
                 </div>
                 </div>
                 <div class="card-body table-responsive">
                 <div class="card-body table-responsive">
 
 

+ 1 - 0
routes/web.php

@@ -128,6 +128,7 @@ Route::middleware(['auth', 'checkSuspended'])->group(function () {
         #servers
         #servers
         Route::get('servers/datatable', [AdminServerController::class, 'datatable'])->name('servers.datatable');
         Route::get('servers/datatable', [AdminServerController::class, 'datatable'])->name('servers.datatable');
         Route::post('servers/togglesuspend/{server}', [AdminServerController::class, 'toggleSuspended'])->name('servers.togglesuspend');
         Route::post('servers/togglesuspend/{server}', [AdminServerController::class, 'toggleSuspended'])->name('servers.togglesuspend');
+        Route::get('servers/sync', [AdminServerController::class, 'syncServers'])->name('servers.sync');
         Route::resource('servers', AdminServerController::class);
         Route::resource('servers', AdminServerController::class);
 
 
         #products
         #products