1 files changed, 15 insertions, 20 deletions
diff --git a/actions/admin/user/ban.php b/actions/admin/user/ban.php
index 030f5ae73..209ece2a0 100644
--- a/actions/admin/user/ban.php
+++ b/actions/admin/user/ban.php
@@ -1,35 +1,30 @@
 <?php
 /**
- * Elgg ban user
+ * Bans a user.
  *
- * @package Elgg
- * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
+ * User entities are banned by setting the 'banned' column
+ * to 'yes' in the users_entity table.
+ *
+ * @package Elgg.Core
+ * @subpackage Administration.User
  */
 
-require_once(dirname(dirname(dirname(dirname(__FILE__)))) . "/engine/start.php");
-
-// block non-admin users
-admin_gatekeeper();
-action_gatekeeper();
-
-// Get the user
 $guid = get_input('guid');
-$obj = get_entity($guid);
+$user = get_entity($guid);
+
+if ($guid == elgg_get_logged_in_user_guid()) {
+	register_error(elgg_echo('admin:user:self:ban:no'));
+	forward(REFERER);
+}
 
-if (($obj instanceof ElggUser) && ($obj->canEdit())) {
-	// Now actually disable it
-	if ($obj->ban('banned')) {
+if (($user instanceof ElggUser) && ($user->canEdit())) {
+	if ($user->ban('banned')) {
 		system_message(elgg_echo('admin:user:ban:yes'));
 	} else {
 		register_error(elgg_echo('admin:user:ban:no'));
 	}
 } else {
-	$canedit = $obj->canEdit();
-	$isinstance = ($obj instanceof ElggUser);
 	register_error(elgg_echo('admin:user:ban:no'));
 }
 
-forward('pg/admin/user/');
-exit;
-\ No newline at end of file
+forward(REFERER);
+\ No newline at end of file