MrUnknownDE/panel
1
0
Fork 0
mirror of https://github.com/MrUnknownDE/panel.git synced 2026-04-13 03:43:45 +02:00
Code Issues Packages Projects 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
2 changed files with 5 additions and 5 deletions
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);
// 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)) {
continue;
break;
}
// Can't remove the assigned IP/Port combo
if ($ip === $allocation->ip && $port === $allocation->port) {
continue;
break;
}
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);
// 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)) {
continue;
break;
}
// Don't allow double port assignments
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([