From 12d286988dbcdff5aad3620838e7ab777ac67a92 Mon Sep 17 00:00:00 2001 From: brettp Date: Wed, 14 Oct 2009 20:41:19 +0000 Subject: Standardized actions/* git-svn-id: http://code.elgg.org/elgg/trunk@3542 36083f99-b078-4883-b0ff-0f9b5a30f544 --- actions/friends/remove.php | 68 ++++++++++++++++++++++------------------------ 1 file changed, 32 insertions(+), 36 deletions(-) (limited to 'actions/friends/remove.php') diff --git a/actions/friends/remove.php b/actions/friends/remove.php index 20181bc84..83dd377e6 100644 --- a/actions/friends/remove.php +++ b/actions/friends/remove.php @@ -1,42 +1,38 @@ removeFriend($friend_guid); + } else{ + register_error(sprintf(elgg_echo("friends:remove:failure"), $friend->name)); + $errors = true; + } +} catch (Exception $e) { + register_error(sprintf(elgg_echo("friends:remove:failure"), $friend->name)); + $errors = true; +} - // Ensure we are logged in - gatekeeper(); - action_gatekeeper(); - - // Get the GUID of the user to friend - $friend_guid = get_input('friend'); - $friend = get_entity($friend_guid); - $errors = false; +if (!$errors) { + system_message(sprintf(elgg_echo("friends:remove:successful"), $friend->name)); +} - // Get the user - try{ - if ($friend instanceof ElggUser) - $_SESSION['user']->removeFriend($friend_guid); - else - { - register_error(sprintf(elgg_echo("friends:remove:failure"),$friend->name)); - $errors = true; - } - } catch (Exception $e) { - register_error(sprintf(elgg_echo("friends:remove:failure"),$friend->name)); - $errors = true; - } - if (!$errors) - system_message(sprintf(elgg_echo("friends:remove:successful"),$friend->name)); - - // Forward to the user friends page - forward("pg/friends/" . $_SESSION['user']->username . "/"); - -?> \ No newline at end of file +// Forward to the user friends page +forward("pg/friends/" . $_SESSION['user']->username . "/"); -- cgit v1.2.3