From fc7f4e880ddfed812438fabc791c5f5056f541e6 Mon Sep 17 00:00:00 2001 From: cash Date: Wed, 17 Nov 2010 12:38:14 +0000 Subject: Closes #1422 admin user actions now check for self before banning, deleting, or removing admin privileges git-svn-id: http://code.elgg.org/elgg/trunk@7332 36083f99-b078-4883-b0ff-0f9b5a30f544 --- actions/admin/user/resetpassword.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'actions/admin/user/resetpassword.php') diff --git a/actions/admin/user/resetpassword.php b/actions/admin/user/resetpassword.php index 24127eb8b..14de69cb6 100644 --- a/actions/admin/user/resetpassword.php +++ b/actions/admin/user/resetpassword.php @@ -17,22 +17,22 @@ admin_gatekeeper(); $guid = get_input('guid'); -$obj = get_entity($guid); +$user = get_entity($guid); -if (($obj instanceof ElggUser) && ($obj->canEdit())) { +if (($user instanceof ElggUser) && ($user->canEdit())) { $password = generate_random_cleartext_password(); // Always reset the salt before generating the user password. - $obj->salt = generate_random_cleartext_password(); - $obj->password = generate_user_password($obj, $password); + $user->salt = generate_random_cleartext_password(); + $user->password = generate_user_password($user, $password); - if ($obj->save()) { + if ($user->save()) { system_message(elgg_echo('admin:user:resetpassword:yes')); - notify_user($obj->guid, + notify_user($user->guid, $CONFIG->site->guid, elgg_echo('email:resetpassword:subject'), - elgg_echo('email:resetpassword:body', array($obj->username, $password)), + elgg_echo('email:resetpassword:body', array($user->username, $password)), NULL, 'email'); } else { -- cgit v1.2.3