From 3e99461a703b8cb8a0eb67b0580bfe1f216f0bac Mon Sep 17 00:00:00 2001 From: ok236449 Date: Wed, 26 Oct 2022 19:13:56 +0200 Subject: [PATCH] Fix admin overview error when node got deleted on pterodactyl --- app/Http/Controllers/Admin/OverViewController.php | 8 +++++++- resources/views/admin/overview/index.blade.php | 8 ++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/Admin/OverViewController.php b/app/Http/Controllers/Admin/OverViewController.php index 2d1784a1..20fe0c17 100644 --- a/app/Http/Controllers/Admin/OverViewController.php +++ b/app/Http/Controllers/Admin/OverViewController.php @@ -81,10 +81,15 @@ class OverViewController extends Controller - //Get node information + //Get node information and prepare collection + $pteroNodeIds = []; + foreach(Pterodactyl::getNodes() as $pteroNode){ + array_push($pteroNodeIds, $pteroNode['attributes']['id']); + } $nodes = collect(); foreach($DBnodes = Node::query()->get() as $DBnode){ //gets all node information and prepares the structure $nodeId = $DBnode['id']; + if(!in_array($nodeId, $pteroNodeIds)) continue; //Check if node exists on pterodactyl too, if not, skip $nodes->put($nodeId, collect()); $nodes[$nodeId]->name = $DBnode['name']; $pteroNode = Pterodactyl::getNode($nodeId); @@ -151,6 +156,7 @@ class OverViewController extends Controller 'counters' => $counters, 'nodes' => $nodes, 'syncLastUpdate' => $syncLastUpdate, + 'deletedNodesPresent'=> ($DBnodes->count() != count($pteroNodeIds))?true:false, 'perPageLimit' => ($counters['servers']->total != Server::query()->count())?true:false, 'tickets' => $tickets ]); diff --git a/resources/views/admin/overview/index.blade.php b/resources/views/admin/overview/index.blade.php index facf060a..6fca3730 100644 --- a/resources/views/admin/overview/index.blade.php +++ b/resources/views/admin/overview/index.blade.php @@ -111,6 +111,14 @@
+ @if ($deletedNodesPresent) +
+
{{ __('Warning!') }}
+

+ {{ __('Some nodes got deleted on pterodactyl only. Please click the sync button above.') }} +

+
+ @endif