1 files changed, 23 insertions, 33 deletions
diff --git a/actions/admin/user/removeadmin.php b/actions/admin/user/removeadmin.php
index 7cd06bc05..8cebc7078 100644
--- a/actions/admin/user/removeadmin.php
+++ b/actions/admin/user/removeadmin.php
@@ -1,37 +1,27 @@
 <?php
-	/**
-	 * Make another user an admin.
-	 * 
-	 * @package Elgg
-	 * @subpackage Core
-	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
-	 * @author Curverider Ltd
-	 * @copyright Curverider Ltd 2008-2009
-	 * @link http://elgg.org/
-	 */
+/**
+ * Revokes admin privileges from a user.
+ *
+ * @package Elgg.Core
+ * @subpackage Administration.User
+ */
 
-	require_once(dirname(dirname(dirname(dirname(__FILE__)))) . "/engine/start.php");
-	global $CONFIG;
-	
-	// block non-admin users
-	admin_gatekeeper();
-	action_gatekeeper();
-	
-	// Get the user 
-	$guid = get_input('guid');
-	$obj = get_entity($guid);
-	
-	if ( ($obj instanceof ElggUser) && ($obj->canEdit()))
-	{
-		$obj->admin = '';
-		if (!$obj->admin)
-			system_message(elgg_echo('admin:user:removeadmin:yes'));
-		else
-			register_error(elgg_echo('admin:user:removeadmin:no'));
-	}
-	else
+$guid = get_input('guid');
+$user = get_entity($guid);
+
+if ($guid == elgg_get_logged_in_user_guid()) {
+	register_error(elgg_echo('admin:user:self:removeadmin:no'));
+	forward(REFERER);
+}
+
+if (($user instanceof ElggUser) && ($user->canEdit())) {
+	if ($user->removeAdmin()) {
+		system_message(elgg_echo('admin:user:removeadmin:yes'));
+	} else {
 		register_error(elgg_echo('admin:user:removeadmin:no'));
-	
-	forward($_SERVER['HTTP_REFERER']);
+	}
+} else {
+	register_error(elgg_echo('admin:user:removeadmin:no'));
+}
 
-?>
-\ No newline at end of file
+forward(REFERER);