Alex/Pterodactyl-Panel
1
1
Fork 1
mirror of https://github.com/pterodactyl/panel.git synced 2024-11-23 01:22:30 +01:00
Code Issues Releases Wiki Activity

fixes bug that would allow deleting the default allocation for a server.

Browse Source
This commit is contained in:
Dane Everitt 2016-10-23 18:59:13 -04:00
parent 0a481b325c
commit 0b044b3cc6
No known key found for this signature in database
GPG Key ID: EEA66103B3D71F53
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/Repositories/ServerRepository.php
View File

@ -537,12 +537,12 @@ class ServerRepository
list($ip, $port) = explode(':', $combo); list($ip, $port) = explode(':', $combo);
// Invalid, not worth killing the whole thing, we'll just skip over it. // Invalid, not worth killing the whole thing, we'll just skip over it.
if (!filter_var($ip, FILTER_VALIDATE_IP) || !preg_match('/^(\d{1,5})$/', $port)) { if (!filter_var($ip, FILTER_VALIDATE_IP) || !preg_match('/^(\d{1,5})$/', $port)) {
continue; break;
} }
// Can't remove the assigned IP/Port combo // Can't remove the assigned IP/Port combo
if ($ip === $allocation->ip && $port === $allocation->port) { if ($ip === $allocation->ip && $port === $allocation->port) {
continue; break;
} }
Models\Allocation::where('ip', $ip)->where('port', $port)->where('assigned_to', $server->id)->update([ Models\Allocation::where('ip', $ip)->where('port', $port)->where('assigned_to', $server->id)->update([
@ -558,12 +558,12 @@ class ServerRepository
list($ip, $port) = explode(':', $combo); list($ip, $port) = explode(':', $combo);
// Invalid, not worth killing the whole thing, we'll just skip over it. // Invalid, not worth killing the whole thing, we'll just skip over it.
if (!filter_var($ip, FILTER_VALIDATE_IP) || !preg_match('/^(\d{1,5})$/', $port)) { if (!filter_var($ip, FILTER_VALIDATE_IP) || !preg_match('/^(\d{1,5})$/', $port)) {
continue; break;
} }
// Don't allow double port assignments // Don't allow double port assignments
if (Models\Allocation::where('port', $port)->where('assigned_to', $server->id)->count() !== 0) { if (Models\Allocation::where('port', $port)->where('assigned_to', $server->id)->count() !== 0) {
continue; break;
} }
Models\Allocation::where('ip', $ip)->where('port', $port)->whereNull('assigned_to')->update([ Models\Allocation::where('ip', $ip)->where('port', $port)->whereNull('assigned_to')->update([

2
resources/views/admin/servers/view.blade.php
View File

@ -285,7 +285,7 @@
<div> <div>
<select name="remove_additional[]" class="form-control" multiple> <select name="remove_additional[]" class="form-control" multiple>
@foreach ($assigned as $assignment) @foreach ($assigned as $assignment)
<option value="{{ $assignment->ip }}:{{ $assignment->port }}">@if(!is_null($assignment->ip_alias)){{ $assignment->ip_alias }}@else{{ $assignment->ip }}@endif:{{ $assignment->port }} @if(!is_null($assignment->ip_alias))(alias of {{ $assignment->ip }})@endif</option> <option value="{{ $assignment->ip }}:{{ $assignment->port }}" @if($server->allocation === $assignment->id)disabled @endif>@if(!is_null($assignment->ip_alias)){{ $assignment->ip_alias }}@else{{ $assignment->ip }}@endif:{{ $assignment->port }} @if(!is_null($assignment->ip_alias))(alias of {{ $assignment->ip }})@endif</option>
@endforeach @endforeach
</select> </select>
</div> </div>