diff options
| author | Cash Costello <cash.costello@gmail.com> | 2013-06-25 06:48:14 -0400 |
|---|---|---|
| committer | Cash Costello <cash.costello@gmail.com> | 2013-06-25 06:48:14 -0400 |
| commit | a5497129871c4f11b4f26ea1ed19e27670ded296 (patch) | |
| tree | 993a3dae71a871459fec6bea1dd6469d18db9e09 /actions/avatar | |
| parent | c9d1dd21d3dcf7353570d555c21a2b6ca7ecdd00 (diff) | |
| parent | dd9df95001f5293e7a3a93a365c64842fe3650e4 (diff) | |
| download | elgg-a5497129871c4f11b4f26ea1ed19e27670ded296.tar.gz elgg-a5497129871c4f11b4f26ea1ed19e27670ded296.tar.bz2 | |
Merge branch '18_avatar' into 1.8
Diffstat (limited to 'actions/avatar')
| -rw-r--r-- | actions/avatar/remove.php | 52 |
1 files changed, 27 insertions, 25 deletions
diff --git a/actions/avatar/remove.php b/actions/avatar/remove.php index cd38e456a..9cb40a760 100644 --- a/actions/avatar/remove.php +++ b/actions/avatar/remove.php @@ -3,32 +3,34 @@ * Avatar remove action */ -$guid = get_input('guid'); -$user = get_entity($guid); -if ($user) { - // Delete all icons from diskspace - $icon_sizes = elgg_get_config('icon_sizes'); - foreach ($icon_sizes as $name => $size_info) { - $file = new ElggFile(); - $file->owner_guid = $guid; - $file->setFilename("profile/{$guid}{$name}.jpg"); - $filepath = $file->getFilenameOnFilestore(); - if (!$file->delete()) { - elgg_log("Avatar file remove failed. Remove $filepath manually, please.", 'WARNING'); - } - } - - // Remove crop coords - unset($user->x1); - unset($user->x2); - unset($user->y1); - unset($user->y2); - - // Remove icon - unset($user->icontime); - system_message(elgg_echo('avatar:remove:success')); -} else { +$user_guid = get_input('guid'); +$user = get_user($user_guid); + +if (!$user || !$user->canEdit()) { register_error(elgg_echo('avatar:remove:fail')); + forward(REFERER); } +// Delete all icons from diskspace +$icon_sizes = elgg_get_config('icon_sizes'); +foreach ($icon_sizes as $name => $size_info) { + $file = new ElggFile(); + $file->owner_guid = $user_guid; + $file->setFilename("profile/{$user_guid}{$name}.jpg"); + $filepath = $file->getFilenameOnFilestore(); + if (!$file->delete()) { + elgg_log("Avatar file remove failed. Remove $filepath manually, please.", 'WARNING'); + } +} + +// Remove crop coords +unset($user->x1); +unset($user->x2); +unset($user->y1); +unset($user->y2); + +// Remove icon +unset($user->icontime); + +system_message(elgg_echo('avatar:remove:success')); forward(REFERER); |