beenull/ctrlpanel
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

fix: 🐛 Old settings relict

Browse source
This commit is contained in:
IceToast 2023-05-08 11:26:47 +02:00
parent ae9ab59dec
commit ad5ff40761
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
app/Http/Controllers/ServerController.php
View file

@ -48,7 +48,7 @@ class ServerController extends Controller
//Get server infos from ptero //Get server infos from ptero
$serverAttributes = $this->pterodactyl->getServerAttributes($server->pterodactyl_id); $serverAttributes = $this->pterodactyl->getServerAttributes($server->pterodactyl_id);
if (! $serverAttributes) { if (!$serverAttributes) {
continue; continue;
} }
$serverRelationships = $serverAttributes['relationships']; $serverRelationships = $serverAttributes['relationships'];
@ -90,7 +90,7 @@ class ServerController extends Controller
{ {
$this->checkPermission(self::CREATE_PERMISSION); $this->checkPermission(self::CREATE_PERMISSION);
$validate_configuration = $this->validateConfigurationRules($user_settings, $server_settings); $validate_configuration = $this->validateConfigurationRules($user_settings, $server_settings, $general_settings);
if (!is_null($validate_configuration)) { if (!is_null($validate_configuration)) {
return $validate_configuration; return $validate_configuration;
@ -132,7 +132,7 @@ class ServerController extends Controller
/** /**
* @return null|RedirectResponse * @return null|RedirectResponse
*/ */
private function validateConfigurationRules(UserSettings $user_settings, ServerSettings $server_settings) private function validateConfigurationRules(UserSettings $user_settings, ServerSettings $server_settings, GeneralSettings $generalSettings)
{ {
//limit validation //limit validation
if (Auth::user()->servers()->count() >= Auth::user()->server_limit) { if (Auth::user()->servers()->count() >= Auth::user()->server_limit) {
@ -157,7 +157,7 @@ class ServerController extends Controller
if (Auth::user()->credits < ($product->minimum_credits == -1 if (Auth::user()->credits < ($product->minimum_credits == -1
? $user_settings->min_credits_to_make_server ? $user_settings->min_credits_to_make_server
: $product->minimum_credits)) { : $product->minimum_credits)) {
return redirect()->route('servers.index')->with('error', 'You do not have the required amount of '.CREDITS_DISPLAY_NAME.' to use this product!'); return redirect()->route('servers.index')->with('error', 'You do not have the required amount of ' . $generalSettings->credits_display_name . ' to use this product!');
} }
} }
@ -180,12 +180,12 @@ class ServerController extends Controller
} }
/** Store a newly created resource in storage. */ /** Store a newly created resource in storage. */
public function store(Request $request, UserSettings $user_settings, ServerSettings $server_settings) public function store(Request $request, UserSettings $user_settings, ServerSettings $server_settings, GeneralSettings $generalSettings)
{ {
/** @var Node $node */ /** @var Node $node */
/** @var Egg $egg */ /** @var Egg $egg */
/** @var Product $product */ /** @var Product $product */
$validate_configuration = $this->validateConfigurationRules($user_settings, $server_settings); $validate_configuration = $this->validateConfigurationRules($user_settings, $server_settings, $generalSettings);
if (!is_null($validate_configuration)) { if (!is_null($validate_configuration)) {
return $validate_configuration; return $validate_configuration;
@ -211,7 +211,7 @@ class ServerController extends Controller
//get free allocation ID //get free allocation ID
$allocationId = $this->pterodactyl->getFreeAllocationId($node); $allocationId = $this->pterodactyl->getFreeAllocationId($node);
if (! $allocationId) { if (!$allocationId) {
return $this->noAllocationsError($server); return $this->noAllocationsError($server);
} }
@ -338,7 +338,7 @@ class ServerController extends Controller
if ($server->user_id != Auth::user()->id) { if ($server->user_id != Auth::user()->id) {
return redirect()->route('servers.index'); return redirect()->route('servers.index');
} }
if (! isset($request->product_upgrade)) { if (!isset($request->product_upgrade)) {
return redirect()->route('servers.show', ['server' => $server->id])->with('error', __('this product is the only one')); return redirect()->route('servers.show', ['server' => $server->id])->with('error', __('this product is the only one'));
} }
$user = Auth::user(); $user = Auth::user();

2
themes/default/views/servers/index.blade.php
View file

@ -174,7 +174,7 @@
<div class="col-4"> <div class="col-4">
{{ __('Price') }}: {{ __('Price') }}:
<span class="text-muted"> <span class="text-muted">
({{ CREDITS_DISPLAY_NAME }}) ({{ $credits_display_name }})
</span> </span>
</div> </div>
<div class="col-8 text-center"> <div class="col-8 text-center">