diff options
Diffstat (limited to 'actions/admin/user/delete.php')
| -rw-r--r-- | actions/admin/user/delete.php | 40 |
1 files changed, 25 insertions, 15 deletions
diff --git a/actions/admin/user/delete.php b/actions/admin/user/delete.php index c22d27e8a..7cfbd0925 100644 --- a/actions/admin/user/delete.php +++ b/actions/admin/user/delete.php @@ -1,24 +1,29 @@ <?php /** - * Elgg delete user + * Delete a user. * - * @package Elgg - * @subpackage Core - * @author Curverider Ltd - * @link http://elgg.org/ + * The user will be deleted recursively, meaning all entities + * owned or contained by the user will also be removed. + * + * @package Elgg.Core + * @subpackage Administration.User */ - -// block non-admin users -admin_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:delete:no')); + forward(REFERER); +} + +$name = $user->name; +$username = $user->username; -if (($obj instanceof ElggUser) && ($obj->canEdit())) { - if ($obj->delete()) { - system_message(elgg_echo('admin:user:delete:yes')); +if (($user instanceof ElggUser) && ($user->canEdit())) { + if ($user->delete()) { + system_message(elgg_echo('admin:user:delete:yes', array($name))); } else { register_error(elgg_echo('admin:user:delete:no')); } @@ -26,5 +31,10 @@ if (($obj instanceof ElggUser) && ($obj->canEdit())) { register_error(elgg_echo('admin:user:delete:no')); } -forward($_SERVER['HTTP_REFERER']); -exit; +// forward to user administration if on a user's page as it no longer exists +$forward = REFERER; +if (strpos($_SERVER['HTTP_REFERER'], $username) != FALSE) { + $forward = "admin/users/newest"; +} + +forward($forward); |