diff --git a/app/Http/Controllers/Admin/ServerController.php b/app/Http/Controllers/Admin/ServerController.php index 5ebc29bc..a34b097b 100644 --- a/app/Http/Controllers/Admin/ServerController.php +++ b/app/Http/Controllers/Admin/ServerController.php @@ -123,6 +123,44 @@ class ServerController extends Controller 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 * @throws Exception diff --git a/resources/views/admin/overview/index.blade.php b/resources/views/admin/overview/index.blade.php index 957c72e1..facf060a 100644 --- a/resources/views/admin/overview/index.blade.php +++ b/resources/views/admin/overview/index.blade.php @@ -207,11 +207,13 @@ @if ($perPageLimit)
{{ __('Error!') }}
-

+

{{ __('You reached the Pterodactyl perPage limit. Please make sure to set it higher than your server count.') }}
- {{ __('You can do that in settings.') }}
- {{ __('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.') }}

+ {{ __('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.') }}

+ {{__('Sync servers')}}
@endif diff --git a/resources/views/admin/servers/index.blade.php b/resources/views/admin/servers/index.blade.php index adc3a84c..916eedd3 100644 --- a/resources/views/admin/servers/index.blade.php +++ b/resources/views/admin/servers/index.blade.php @@ -25,7 +25,13 @@
-
{{__('Servers')}}
+
+
+ {{__('Servers')}} +
+ {{__('Sync')}} +
diff --git a/routes/web.php b/routes/web.php index 433220f9..f7c0e49c 100644 --- a/routes/web.php +++ b/routes/web.php @@ -128,6 +128,7 @@ Route::middleware(['auth', 'checkSuspended'])->group(function () { #servers Route::get('servers/datatable', [AdminServerController::class, 'datatable'])->name('servers.datatable'); 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); #products