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/add.php | 65 ++++++++++++-------------- actions/friends/addcollection.php | 91 +++++++++++++++++------------------- actions/friends/deletecollection.php | 91 +++++++++++++++++------------------- actions/friends/editcollection.php | 28 +++++------ actions/friends/remove.php | 68 +++++++++++++-------------- 5 files changed, 160 insertions(+), 183 deletions(-) (limited to 'actions/friends') diff --git a/actions/friends/add.php b/actions/friends/add.php index 63f1e2d94..f58d49b88 100644 --- a/actions/friends/add.php +++ b/actions/friends/add.php @@ -1,40 +1,37 @@ addFriend($friend_guid)) { + $errors = true; + } +} catch (Exception $e) { + register_error(sprintf(elgg_echo("friends:add:failure"),$friend->name)); + $errors = true; +} +if (!$errors){ + // add to river + add_to_river('friends/river/create','friend',$_SESSION['user']->guid,$friend_guid); + system_message(sprintf(elgg_echo("friends:add:successful"),$friend->name)); +} - $errors = false; - - // Get the user - try { - if (!$_SESSION['user']->addFriend($friend_guid)) $errors = true; - } catch (Exception $e) { - register_error(sprintf(elgg_echo("friends:add:failure"),$friend->name)); - $errors = true; - } - if (!$errors){ - // add to river - add_to_river('friends/river/create','friend',$_SESSION['user']->guid,$friend_guid); - system_message(sprintf(elgg_echo("friends:add: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 . "/"); diff --git a/actions/friends/addcollection.php b/actions/friends/addcollection.php index 7dfba1ee7..6a15805ec 100644 --- a/actions/friends/addcollection.php +++ b/actions/friends/addcollection.php @@ -1,50 +1,45 @@ getGUID()); - - //if the collection was created and the user passed some friends from the form, add them - if($create_collection && (!empty($friends))){ - - //add friends to the collection - foreach($friends as $friend){ - add_user_to_access_collection($friend, $create_collection); - } - - } - - // Success message - system_message(elgg_echo("friends:collectionadded")); - // Forward to the collections page - forward("pg/collections/" . $_SESSION['user']->username); - - } else { - - register_error(elgg_echo("friends:nocollectionname")); - // Forward to the add collection page - forward("pg/collections/add"); - - } - -?> \ No newline at end of file +/** + * Elgg collection add page + * + * @package Elgg + * @subpackage Core + + * @author Curverider Ltd + + * @link http://elgg.org/ + */ + +//must be logged in +gatekeeper(); +action_gatekeeper(); + +$collection_name = get_input('collection_name'); +$friends = get_input('friends_collection'); + +//first check to make sure that a collection name has been set and create the new colection +if($collection_name){ + + //create the collection + $create_collection = create_access_collection($collection_name, $_SESSION['user']->getGUID()); + + //if the collection was created and the user passed some friends from the form, add them + if($create_collection && (!empty($friends))){ + //add friends to the collection + foreach($friends as $friend) { + add_user_to_access_collection($friend, $create_collection); + } + } + + // Success message + system_message(elgg_echo("friends:collectionadded")); + // Forward to the collections page + forward("pg/collections/" . $_SESSION['user']->username); + +} else { + register_error(elgg_echo("friends:nocollectionname")); + + // Forward to the add collection page + forward("pg/collections/add"); +} diff --git a/actions/friends/deletecollection.php b/actions/friends/deletecollection.php index bdfcc9b2c..1e18adcea 100644 --- a/actions/friends/deletecollection.php +++ b/actions/friends/deletecollection.php @@ -1,52 +1,45 @@ owner_guid == $_SESSION['user']->getGUID()){ - - $delete_collection = delete_access_collection($collection_id); - - // Success message - if ($delete_collection) - system_message(elgg_echo("friends:collectiondeleted")); - else - register_error(elgg_echo("friends:collectiondeletefailed")); - - } else { - - // Failure message - register_error(elgg_echo("friends:collectiondeletefailed")); - - } - +/** + * Elgg friends: delete collection action + * + * @package Elgg + * @subpackage Core + + * @author Curverider Ltd + + * @link http://elgg.org/ + */ + +// Make sure we're logged in (send us to the front page if not) +gatekeeper(); + +// Get input data +$collection_id = (int) get_input('collection'); + +// Check to see that the access collection exist and grab its owner +$get_collection = get_access_collection($collection_id); + +if($get_collection){ + + if($get_collection->owner_guid == $_SESSION['user']->getGUID()) { + + $delete_collection = delete_access_collection($collection_id); + + // Success message + if ($delete_collection) { + system_message(elgg_echo("friends:collectiondeleted")); } else { - - // Failure message - register_error(elgg_echo("friends:collectiondeletefailed")); - - } - - // Forward to the collections page - forward("pg/collections/" . $_SESSION['user']->username); - -?> \ No newline at end of file + register_error(elgg_echo("friends:collectiondeletefailed")); + } + } else { + // Failure message + register_error(elgg_echo("friends:collectiondeletefailed")); + } +} else { + // Failure message + register_error(elgg_echo("friends:collectiondeletefailed")); +} + +// Forward to the collections page +forward("pg/collections/" . $_SESSION['user']->username); diff --git a/actions/friends/editcollection.php b/actions/friends/editcollection.php index ede61b4b0..4d346e823 100644 --- a/actions/friends/editcollection.php +++ b/actions/friends/editcollection.php @@ -1,20 +1,16 @@ \ No newline at end of file +//chech the collection exists and the current user owners it +update_access_collection($collection_id, $friends); \ No newline at end of file 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