|
@@ -5,6 +5,7 @@ namespace App\Http\Controllers\Admin;
|
|
use App\Classes\Pterodactyl;
|
|
use App\Classes\Pterodactyl;
|
|
use App\Http\Controllers\Controller;
|
|
use App\Http\Controllers\Controller;
|
|
use App\Models\Server;
|
|
use App\Models\Server;
|
|
|
|
+use App\Models\User;
|
|
use Exception;
|
|
use Exception;
|
|
use Illuminate\Contracts\Foundation\Application;
|
|
use Illuminate\Contracts\Foundation\Application;
|
|
use Illuminate\Contracts\View\Factory;
|
|
use Illuminate\Contracts\View\Factory;
|
|
@@ -66,8 +67,12 @@ class ServerController extends Controller
|
|
*/
|
|
*/
|
|
public function edit(Server $server)
|
|
public function edit(Server $server)
|
|
{
|
|
{
|
|
|
|
+ // get all users from the database
|
|
|
|
+ $users = User::all();
|
|
|
|
+
|
|
return view('admin.servers.edit')->with([
|
|
return view('admin.servers.edit')->with([
|
|
'server' => $server,
|
|
'server' => $server,
|
|
|
|
+ 'users' => $users,
|
|
]);
|
|
]);
|
|
}
|
|
}
|
|
|
|
|
|
@@ -76,15 +81,36 @@ class ServerController extends Controller
|
|
*
|
|
*
|
|
* @param Request $request
|
|
* @param Request $request
|
|
* @param Server $server
|
|
* @param Server $server
|
|
- * @return Response
|
|
|
|
*/
|
|
*/
|
|
public function update(Request $request, Server $server)
|
|
public function update(Request $request, Server $server)
|
|
{
|
|
{
|
|
$request->validate([
|
|
$request->validate([
|
|
'identifier' => 'required|string',
|
|
'identifier' => 'required|string',
|
|
|
|
+ 'user_id' => 'required|integer',
|
|
]);
|
|
]);
|
|
|
|
|
|
- $server->update($request->all());
|
|
|
|
|
|
+
|
|
|
|
+ if ($request->get('user_id') != $server->user_id) {
|
|
|
|
+ // find the user
|
|
|
|
+ $user = User::findOrFail($request->get('user_id'));
|
|
|
|
+
|
|
|
|
+ // try to update the owner on pterodactyl
|
|
|
|
+ try {
|
|
|
|
+ $response = Pterodactyl::updateServerOwner($server, $user->pterodactyl_id);
|
|
|
|
+ if ($response->getStatusCode() != 200) {
|
|
|
|
+ return redirect()->back()->with('error', 'Failed to update server owner on pterodactyl');
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ // update the owner on the database
|
|
|
|
+ $server->user_id = $user->id;
|
|
|
|
+ } catch (Exception $e) {
|
|
|
|
+ return redirect()->back()->with('error', 'Internal Server Error');
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ // update the identifier
|
|
|
|
+ $server->identifier = $request->get('identifier');
|
|
|
|
+ $server->save();
|
|
|
|
|
|
return redirect()->route('admin.servers.index')->with('success', 'Server updated!');
|
|
return redirect()->route('admin.servers.index')->with('success', 'Server updated!');
|
|
}
|
|
}
|
|
@@ -102,7 +128,7 @@ class ServerController extends Controller
|
|
|
|
|
|
return redirect()->route('admin.servers.index')->with('success', __('Server removed'));
|
|
return redirect()->route('admin.servers.index')->with('success', __('Server removed'));
|
|
} catch (Exception $e) {
|
|
} catch (Exception $e) {
|
|
- return redirect()->route('admin.servers.index')->with('error', __('An exception has occurred while trying to remove a resource "').$e->getMessage().'"');
|
|
|
|
|
|
+ return redirect()->route('admin.servers.index')->with('error', __('An exception has occurred while trying to remove a resource "') . $e->getMessage() . '"');
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
@@ -128,17 +154,17 @@ class ServerController extends Controller
|
|
|
|
|
|
$CPIDArray = [];
|
|
$CPIDArray = [];
|
|
$renameCount = 0;
|
|
$renameCount = 0;
|
|
- foreach ($CPServers as $CPServer) {//go thru all CP servers and make array with IDs as keys. All values are false.
|
|
|
|
|
|
+ foreach ($CPServers as $CPServer) { //go thru all CP servers and make array with IDs as keys. All values are false.
|
|
if ($CPServer->pterodactyl_id) {
|
|
if ($CPServer->pterodactyl_id) {
|
|
$CPIDArray[$CPServer->pterodactyl_id] = false;
|
|
$CPIDArray[$CPServer->pterodactyl_id] = false;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
- foreach ($pteroServers as $server) {//go thru all ptero servers, if server exists, change value to true in array.
|
|
|
|
|
|
+ foreach ($pteroServers as $server) { //go thru all ptero servers, if server exists, change value to true in array.
|
|
if (isset($CPIDArray[$server['attributes']['id']])) {
|
|
if (isset($CPIDArray[$server['attributes']['id']])) {
|
|
$CPIDArray[$server['attributes']['id']] = true;
|
|
$CPIDArray[$server['attributes']['id']] = true;
|
|
|
|
|
|
- if (isset($server['attributes']['name'])) {//failsafe
|
|
|
|
|
|
+ if (isset($server['attributes']['name'])) { //failsafe
|
|
//Check if a server got renamed
|
|
//Check if a server got renamed
|
|
$savedServer = Server::query()->where('pterodactyl_id', $server['attributes']['id'])->first();
|
|
$savedServer = Server::query()->where('pterodactyl_id', $server['attributes']['id'])->first();
|
|
if ($savedServer->name != $server['attributes']['name']) {
|
|
if ($savedServer->name != $server['attributes']['name']) {
|
|
@@ -150,16 +176,16 @@ class ServerController extends Controller
|
|
}
|
|
}
|
|
}
|
|
}
|
|
$filteredArray = array_filter($CPIDArray, function ($v, $k) {
|
|
$filteredArray = array_filter($CPIDArray, function ($v, $k) {
|
|
- return $v == false;
|
|
|
|
|
|
+ return $v == false;
|
|
}, ARRAY_FILTER_USE_BOTH); //Array of servers, that dont exist on ptero (value == false)
|
|
}, ARRAY_FILTER_USE_BOTH); //Array of servers, that dont exist on ptero (value == false)
|
|
$deleteCount = 0;
|
|
$deleteCount = 0;
|
|
- foreach ($filteredArray as $key => $CPID) {//delete servers that dont exist on ptero anymore
|
|
|
|
- if (! Pterodactyl::getServerAttributes($key, true)) {
|
|
|
|
|
|
+ foreach ($filteredArray as $key => $CPID) { //delete servers that dont exist on ptero anymore
|
|
|
|
+ if (!Pterodactyl::getServerAttributes($key, true)) {
|
|
$deleteCount++;
|
|
$deleteCount++;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
- return redirect()->back()->with('success', __('Servers synced successfully'.(($renameCount) ? (',\n'.__('renamed').' '.$renameCount.' '.__('servers')) : '').((count($filteredArray)) ? (',\n'.__('deleted').' '.$deleteCount.'/'.count($filteredArray).' '.__('old servers')) : ''))).'.';
|
|
|
|
|
|
+ return redirect()->back()->with('success', __('Servers synced successfully' . (($renameCount) ? (',\n' . __('renamed') . ' ' . $renameCount . ' ' . __('servers')) : '') . ((count($filteredArray)) ? (',\n' . __('deleted') . ' ' . $deleteCount . '/' . count($filteredArray) . ' ' . __('old servers')) : ''))) . '.';
|
|
}
|
|
}
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -180,7 +206,7 @@ class ServerController extends Controller
|
|
|
|
|
|
return datatables($query)
|
|
return datatables($query)
|
|
->addColumn('user', function (Server $server) {
|
|
->addColumn('user', function (Server $server) {
|
|
- return '<a href="'.route('admin.users.show', $server->user->id).'">'.$server->user->name.'</a>';
|
|
|
|
|
|
+ return '<a href="' . route('admin.users.show', $server->user->id) . '">' . $server->user->name . '</a>';
|
|
})
|
|
})
|
|
->addColumn('resources', function (Server $server) {
|
|
->addColumn('resources', function (Server $server) {
|
|
return $server->product->description;
|
|
return $server->product->description;
|
|
@@ -191,16 +217,16 @@ class ServerController extends Controller
|
|
$suspendText = $server->isSuspended() ? __('Unsuspend') : __('Suspend');
|
|
$suspendText = $server->isSuspended() ? __('Unsuspend') : __('Suspend');
|
|
|
|
|
|
return '
|
|
return '
|
|
- <a data-content="'.__('Edit').'" data-toggle="popover" data-trigger="hover" data-placement="top" href="'.route('admin.servers.edit', $server->id).'" class="btn btn-sm btn-info mr-1"><i class="fas fa-pen"></i></a>
|
|
|
|
- <form class="d-inline" method="post" action="'.route('admin.servers.togglesuspend', $server->id).'">
|
|
|
|
- '.csrf_field().'
|
|
|
|
- <button data-content="'.$suspendText.'" data-toggle="popover" data-trigger="hover" data-placement="top" class="btn btn-sm '.$suspendColor.' text-white mr-1"><i class="far '.$suspendIcon.'"></i></button>
|
|
|
|
|
|
+ <a data-content="' . __('Edit') . '" data-toggle="popover" data-trigger="hover" data-placement="top" href="' . route('admin.servers.edit', $server->id) . '" class="btn btn-sm btn-info mr-1"><i class="fas fa-pen"></i></a>
|
|
|
|
+ <form class="d-inline" method="post" action="' . route('admin.servers.togglesuspend', $server->id) . '">
|
|
|
|
+ ' . csrf_field() . '
|
|
|
|
+ <button data-content="' . $suspendText . '" data-toggle="popover" data-trigger="hover" data-placement="top" class="btn btn-sm ' . $suspendColor . ' text-white mr-1"><i class="far ' . $suspendIcon . '"></i></button>
|
|
</form>
|
|
</form>
|
|
|
|
|
|
- <form class="d-inline" onsubmit="return submitResult();" method="post" action="'.route('admin.servers.destroy', $server->id).'">
|
|
|
|
- '.csrf_field().'
|
|
|
|
- '.method_field('DELETE').'
|
|
|
|
- <button data-content="'.__('Delete').'" data-toggle="popover" data-trigger="hover" data-placement="top" class="btn btn-sm btn-danger mr-1"><i class="fas fa-trash"></i></button>
|
|
|
|
|
|
+ <form class="d-inline" onsubmit="return submitResult();" method="post" action="' . route('admin.servers.destroy', $server->id) . '">
|
|
|
|
+ ' . csrf_field() . '
|
|
|
|
+ ' . method_field('DELETE') . '
|
|
|
|
+ <button data-content="' . __('Delete') . '" data-toggle="popover" data-trigger="hover" data-placement="top" class="btn btn-sm btn-danger mr-1"><i class="fas fa-trash"></i></button>
|
|
</form>
|
|
</form>
|
|
|
|
|
|
';
|
|
';
|
|
@@ -208,7 +234,7 @@ class ServerController extends Controller
|
|
->addColumn('status', function (Server $server) {
|
|
->addColumn('status', function (Server $server) {
|
|
$labelColor = $server->isSuspended() ? 'text-danger' : 'text-success';
|
|
$labelColor = $server->isSuspended() ? 'text-danger' : 'text-success';
|
|
|
|
|
|
- return '<i class="fas '.$labelColor.' fa-circle mr-2"></i>';
|
|
|
|
|
|
+ return '<i class="fas ' . $labelColor . ' fa-circle mr-2"></i>';
|
|
})
|
|
})
|
|
->editColumn('created_at', function (Server $server) {
|
|
->editColumn('created_at', function (Server $server) {
|
|
return $server->created_at ? $server->created_at->diffForHumans() : '';
|
|
return $server->created_at ? $server->created_at->diffForHumans() : '';
|
|
@@ -217,7 +243,7 @@ class ServerController extends Controller
|
|
return $server->suspended ? $server->suspended->diffForHumans() : '';
|
|
return $server->suspended ? $server->suspended->diffForHumans() : '';
|
|
})
|
|
})
|
|
->editColumn('name', function (Server $server) {
|
|
->editColumn('name', function (Server $server) {
|
|
- return '<a class="text-info" target="_blank" href="'.config('SETTINGS::SYSTEM:PTERODACTYL:URL').'/admin/servers/view/'.$server->pterodactyl_id.'">'.strip_tags($server->name).'</a>';
|
|
|
|
|
|
+ return '<a class="text-info" target="_blank" href="' . config('SETTINGS::SYSTEM:PTERODACTYL:URL') . '/admin/servers/view/' . $server->pterodactyl_id . '">' . strip_tags($server->name) . '</a>';
|
|
})
|
|
})
|
|
->rawColumns(['user', 'actions', 'status', 'name'])
|
|
->rawColumns(['user', 'actions', 'status', 'name'])
|
|
->make();
|
|
->make();
|