From a443ae854f7de441bfa4f14d904035f88553a143 Mon Sep 17 00:00:00 2001
From: 1day2die
Date: Mon, 15 Aug 2022 16:14:18 +0200
Subject: [PATCH 01/25] Update ServerController.php
---
app/Http/Controllers/ServerController.php | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/app/Http/Controllers/ServerController.php b/app/Http/Controllers/ServerController.php
index f53f4756..8dabf0a0 100644
--- a/app/Http/Controllers/ServerController.php
+++ b/app/Http/Controllers/ServerController.php
@@ -268,7 +268,7 @@ class ServerController extends Controller
$serverAttributes = Pterodactyl::getServerAttributes($server->pterodactyl_id);
$serverRelationships = $serverAttributes['relationships'];
- // Get node resource allocation info
+ // Get node resource allocation info
$nodeId = $serverRelationships['node']['attributes']['id'];
$node = Node::where('id', $nodeId)->firstOrFail();
$nodeName = $node->name;
@@ -277,7 +277,7 @@ class ServerController extends Controller
$requireMemory = $newProduct->memory - $oldProduct->memory;
$requiredisk = $newProduct->disk - $oldProduct->disk;
$checkResponse = Pterodactyl::checkNodeResources($node, $requireMemory, $requiredisk);
- if ($checkResponse == False) return redirect()->route('servers.index')->with('error', __("The node '" . $nodeName . "' doesn't have the required memory or disk left to upgrade the server."));
+ if ($checkResponse == False) return redirect()->route('servers.index')->with('error', __("The node '" . $nodeName . "' doesn't have the required memory or disk left to upgrade the server.". $requiredisk. "disk, ".$requireMemory));
$priceupgrade = $newProduct->getHourlyPrice();
From 5dff5e56fdcad22ad65c2407fb8e48af3b7a168f Mon Sep 17 00:00:00 2001
From: 1day2die
Date: Mon, 15 Aug 2022 16:17:44 +0200
Subject: [PATCH 02/25] g
---
app/Classes/Pterodactyl.php | 3 +++
app/Http/Controllers/ServerController.php | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/app/Classes/Pterodactyl.php b/app/Classes/Pterodactyl.php
index a7bc9bd5..2433a4fe 100644
--- a/app/Classes/Pterodactyl.php
+++ b/app/Classes/Pterodactyl.php
@@ -11,6 +11,7 @@ use Exception;
use Illuminate\Http\Client\PendingRequest;
use Illuminate\Http\Client\Response;
use Illuminate\Support\Facades\Http;
+use Illuminate\Support\Facades\Log;
class Pterodactyl
{
@@ -369,7 +370,9 @@ class Pterodactyl
}
$node = $response['attributes'];
$freeMemory = $node['memory'] - $node['allocated_resources']['memory'];
+ Log::debug("Free Memory:".$freeMemory);
$freeDisk = $node['disk'] - $node['allocated_resources']['disk'];
+ Log::debug("Free Memory:".$freeDisk);
if ($freeMemory < $requireMemory) {
return false;
}
diff --git a/app/Http/Controllers/ServerController.php b/app/Http/Controllers/ServerController.php
index 8dabf0a0..03c06313 100644
--- a/app/Http/Controllers/ServerController.php
+++ b/app/Http/Controllers/ServerController.php
@@ -277,7 +277,7 @@ class ServerController extends Controller
$requireMemory = $newProduct->memory - $oldProduct->memory;
$requiredisk = $newProduct->disk - $oldProduct->disk;
$checkResponse = Pterodactyl::checkNodeResources($node, $requireMemory, $requiredisk);
- if ($checkResponse == False) return redirect()->route('servers.index')->with('error', __("The node '" . $nodeName . "' doesn't have the required memory or disk left to upgrade the server.". $requiredisk. "disk, ".$requireMemory));
+ if ($checkResponse == False) return redirect()->route('servers.index')->with('error', __("The node '" . $nodeName . "' doesn't have the required memory or disk left to upgrade the server."));
$priceupgrade = $newProduct->getHourlyPrice();
From 09dba51fa6157cf9b4dbdece767b242fd2cad771 Mon Sep 17 00:00:00 2001
From: 1day2die
Date: Mon, 15 Aug 2022 16:22:31 +0200
Subject: [PATCH 03/25] Revert "g"
This reverts commit 5dff5e56fdcad22ad65c2407fb8e48af3b7a168f.
---
app/Classes/Pterodactyl.php | 3 ---
app/Http/Controllers/ServerController.php | 2 +-
2 files changed, 1 insertion(+), 4 deletions(-)
diff --git a/app/Classes/Pterodactyl.php b/app/Classes/Pterodactyl.php
index 2433a4fe..a7bc9bd5 100644
--- a/app/Classes/Pterodactyl.php
+++ b/app/Classes/Pterodactyl.php
@@ -11,7 +11,6 @@ use Exception;
use Illuminate\Http\Client\PendingRequest;
use Illuminate\Http\Client\Response;
use Illuminate\Support\Facades\Http;
-use Illuminate\Support\Facades\Log;
class Pterodactyl
{
@@ -370,9 +369,7 @@ class Pterodactyl
}
$node = $response['attributes'];
$freeMemory = $node['memory'] - $node['allocated_resources']['memory'];
- Log::debug("Free Memory:".$freeMemory);
$freeDisk = $node['disk'] - $node['allocated_resources']['disk'];
- Log::debug("Free Memory:".$freeDisk);
if ($freeMemory < $requireMemory) {
return false;
}
diff --git a/app/Http/Controllers/ServerController.php b/app/Http/Controllers/ServerController.php
index 03c06313..8dabf0a0 100644
--- a/app/Http/Controllers/ServerController.php
+++ b/app/Http/Controllers/ServerController.php
@@ -277,7 +277,7 @@ class ServerController extends Controller
$requireMemory = $newProduct->memory - $oldProduct->memory;
$requiredisk = $newProduct->disk - $oldProduct->disk;
$checkResponse = Pterodactyl::checkNodeResources($node, $requireMemory, $requiredisk);
- if ($checkResponse == False) return redirect()->route('servers.index')->with('error', __("The node '" . $nodeName . "' doesn't have the required memory or disk left to upgrade the server."));
+ if ($checkResponse == False) return redirect()->route('servers.index')->with('error', __("The node '" . $nodeName . "' doesn't have the required memory or disk left to upgrade the server.". $requiredisk. "disk, ".$requireMemory));
$priceupgrade = $newProduct->getHourlyPrice();
From 11c29739c7ba4e967681277b4869837059a5aead Mon Sep 17 00:00:00 2001
From: 1day2die
Date: Mon, 15 Aug 2022 16:22:38 +0200
Subject: [PATCH 04/25] Revert "Update ServerController.php"
This reverts commit a443ae854f7de441bfa4f14d904035f88553a143.
---
app/Http/Controllers/ServerController.php | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/app/Http/Controllers/ServerController.php b/app/Http/Controllers/ServerController.php
index 8dabf0a0..f53f4756 100644
--- a/app/Http/Controllers/ServerController.php
+++ b/app/Http/Controllers/ServerController.php
@@ -268,7 +268,7 @@ class ServerController extends Controller
$serverAttributes = Pterodactyl::getServerAttributes($server->pterodactyl_id);
$serverRelationships = $serverAttributes['relationships'];
- // Get node resource allocation info
+ // Get node resource allocation info
$nodeId = $serverRelationships['node']['attributes']['id'];
$node = Node::where('id', $nodeId)->firstOrFail();
$nodeName = $node->name;
@@ -277,7 +277,7 @@ class ServerController extends Controller
$requireMemory = $newProduct->memory - $oldProduct->memory;
$requiredisk = $newProduct->disk - $oldProduct->disk;
$checkResponse = Pterodactyl::checkNodeResources($node, $requireMemory, $requiredisk);
- if ($checkResponse == False) return redirect()->route('servers.index')->with('error', __("The node '" . $nodeName . "' doesn't have the required memory or disk left to upgrade the server.". $requiredisk. "disk, ".$requireMemory));
+ if ($checkResponse == False) return redirect()->route('servers.index')->with('error', __("The node '" . $nodeName . "' doesn't have the required memory or disk left to upgrade the server."));
$priceupgrade = $newProduct->getHourlyPrice();
From 39569917c70d9a766a320a111cde6aeb7a0db3b8 Mon Sep 17 00:00:00 2001
From: 1day2die
Date: Mon, 15 Aug 2022 19:03:13 +0200
Subject: [PATCH 05/25] Update settings.blade.php
---
resources/views/servers/settings.blade.php | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/resources/views/servers/settings.blade.php b/resources/views/servers/settings.blade.php
index 7607de10..59edb45e 100644
--- a/resources/views/servers/settings.blade.php
+++ b/resources/views/servers/settings.blade.php
@@ -256,7 +256,7 @@
Created on: {{ $ticket->created_at->diffForHumans() }}
+
From 07a2ebfcccd71a7e7998bad3eecf5601e2f039f8 Mon Sep 17 00:00:00 2001
From: 1day2die
Date: Wed, 17 Aug 2022 19:31:14 +0200
Subject: [PATCH 18/25] min required credits per product when upgrading
---
app/Http/Controllers/ServerController.php | 2 +-
resources/views/servers/settings.blade.php | 6 ++++--
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/app/Http/Controllers/ServerController.php b/app/Http/Controllers/ServerController.php
index 03c06313..cf731ddf 100644
--- a/app/Http/Controllers/ServerController.php
+++ b/app/Http/Controllers/ServerController.php
@@ -284,7 +284,7 @@ class ServerController extends Controller
if ($priceupgrade < $oldProduct->getHourlyPrice()) {
$priceupgrade = 0;
}
- if ($user->credits >= $priceupgrade)
+ if ($user->credits >= $priceupgrade && $user->credits >= $newProduct->minimum_credits)
{
$server->product_id = $request->product_upgrade;
diff --git a/resources/views/servers/settings.blade.php b/resources/views/servers/settings.blade.php
index 942457f6..e320533c 100644
--- a/resources/views/servers/settings.blade.php
+++ b/resources/views/servers/settings.blade.php
@@ -227,7 +227,7 @@
{{ __('Upgrade / Downgrade') }}
- @endif
+
@@ -255,7 +255,8 @@
@foreach($products as $product)
@if(in_array($server->egg, $product->eggs) && $product->id != $server->product->id && $product->disabled == false)
-
+
@endif
@endforeach
@@ -269,6 +270,7 @@
+ @endif