From a55f150eac4255db31548b1a4a1442726fc99023 Mon Sep 17 00:00:00 2001 From: printempw Date: Sun, 6 Aug 2017 22:53:02 +0800 Subject: [PATCH] Fix operating admin himself --- app/Http/Controllers/AdminController.php | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/app/Http/Controllers/AdminController.php b/app/Http/Controllers/AdminController.php index 9ecc3a31..4cbd818f 100644 --- a/app/Http/Controllers/AdminController.php +++ b/app/Http/Controllers/AdminController.php @@ -231,8 +231,10 @@ class AdminController extends Controller return json(trans('admin.users.operations.non-existent'), 1); } - if ($user->permission >= app('user.current')->permission) { - return json(trans('admin.users.operations.no-permission'), 1); + if ($user->uid !== app('user.current')->uid) { + if ($user->permission >= app('user.current')->permission) { + return json(trans('admin.users.operations.no-permission'), 1); + } } if ($action == "email") { @@ -319,10 +321,10 @@ class AdminController extends Controller abort(404, trans('general.unexistent-player')); } - if ($player->user->permission >= app('user.current')->permission && - $player->user()->first()->uid !== app('user.current')->uid) - { - return json(trans('admin.players.no-permission'), 1); + if ($player->user()->first()->uid !== app('user.current')->uid) { + if ($player->user->permission >= app('user.current')->permission) { + return json(trans('admin.players.no-permission'), 1); + } } if ($action == "preference") {