1
1
mirror of https://github.com/pterodactyl/panel.git synced 2024-10-27 12:22:28 +01:00

Fix user deletion

This commit is contained in:
Dane Everitt 2017-02-17 19:28:23 -05:00
parent 397172de3b
commit 054e65b78f
No known key found for this signature in database
GPG Key ID: EEA66103B3D71F53

View File

@ -165,7 +165,7 @@ class UserRepository
*/
public function delete($id)
{
if (Models\Server::where('owner', $id)->count() > 0) {
if (Models\Server::where('owner_id', $id)->count() > 0) {
throw new DisplayException('Cannot delete a user with active servers attached to thier account.');
}
@ -177,10 +177,15 @@ class UserRepository
DB::beginTransaction();
try {
Models\Permission::where('user_id', $id)->delete();
Models\Subuser::where('user_id', $id)->delete();
Models\User::destroy($id);
foreach(Models\Subuser::with('permissions')->where('user_id', $id)->get() as &$subuser) {
foreach($subuser->permissions as &$permission) {
$permission->delete();
}
$subuser->delete();
}
Models\User::destroy($id);
DB::commit();
return true;