From bbcc8aa9ac2e805520e7f0d125fdb41791d5ac8f Mon Sep 17 00:00:00 2001 From: snipe Date: Wed, 25 Mar 2015 14:26:12 -0700 Subject: [PATCH] Update groups if unlocked --- app/config/version.php | 4 ++-- app/controllers/admin/UsersController.php | 29 +++++++++++++---------- 2 files changed, 18 insertions(+), 15 deletions(-) diff --git a/app/config/version.php b/app/config/version.php index b22b3d1f1f..4a12de20a4 100644 --- a/app/config/version.php +++ b/app/config/version.php @@ -1,5 +1,5 @@ 'v1.2.6.1-130', - 'hash_version' => 'v1.2.6.1-130-gad1a939', + 'app_version' => 'v1.2.6.1-152', + 'hash_version' => 'v1.2.6.1-152-g2cf8256', ); \ No newline at end of file diff --git a/app/controllers/admin/UsersController.php b/app/controllers/admin/UsersController.php index 4eaf895871..9a8c379398 100755 --- a/app/controllers/admin/UsersController.php +++ b/app/controllers/admin/UsersController.php @@ -305,7 +305,7 @@ class UsersController extends AdminController // Do we want to update the user password? - if ($password) { + if (($password) && (!Config::get('app.lock_passwords'))) { $user->password = $password; } @@ -320,19 +320,22 @@ class UsersController extends AdminController $groupsToAdd = array_diff($selectedGroups, $userGroups); $groupsToRemove = array_diff($userGroups, $selectedGroups); - // Assign the user to groups - foreach ($groupsToAdd as $groupId) { - $group = Sentry::getGroupProvider()->findById($groupId); + if (!Config::get('app.lock_passwords')) { - $user->addGroup($group); - } - - // Remove the user from groups - foreach ($groupsToRemove as $groupId) { - $group = Sentry::getGroupProvider()->findById($groupId); - - $user->removeGroup($group); - } + // Assign the user to groups + foreach ($groupsToAdd as $groupId) { + $group = Sentry::getGroupProvider()->findById($groupId); + + $user->addGroup($group); + } + + // Remove the user from groups + foreach ($groupsToRemove as $groupId) { + $group = Sentry::getGroupProvider()->findById($groupId); + + $user->removeGroup($group); + } + } // Was the user updated? if ($user->save()) {