5 files changed, 144 insertions, 71 deletions
diff --git a/actions/friends/add.php b/actions/friends/add.php
index 760da81b7..d1800ee14 100644
--- a/actions/friends/add.php
+++ b/actions/friends/add.php
@@ -1,36 +1,35 @@
-<?php
-
-	/**
-	 * Elgg add friend action
-	 * 
-	 * @package Elgg
-	 * @subpackage Core
-	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
-	 * @author Curverider Ltd
-	 * @copyright Curverider Ltd 2008
-	 * @link http://elgg.org/
-	 */
-
-	// Ensure we are logged in
-		gatekeeper();
-		
-	// Get the GUID of the user to friend
-		$friend_guid = get_input('friend');
-		$friend = get_entity($friend_guid);
-
-		$errors = false;
-		
-	// Get the user
-		try {
-			$_SESSION['user']->addFriend($friend_guid);
-		} catch (Exception $e) {
-			register_error(sprintf(elgg_echo("friends:add:failure"),$friend->name));
-			$errors = true;
-		}
-		if (!$errors)
-			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
+<?php
+/**
+ * Elgg add friend action
+ *
+ * @package Elgg.Core
+ * @subpackage Friends.Management
+ */
+
+// Get the GUID of the user to friend
+$friend_guid = get_input('friend');
+$friend = get_entity($friend_guid);
+if (!$friend) {
+	register_error(elgg_echo('error:missing_data'));
+	forward(REFERER);
+}
+
+$errors = false;
+
+// Get the user
+try {
+	if (!elgg_get_logged_in_user_entity()->addFriend($friend_guid)) {
+		$errors = true;
+	}
+} catch (Exception $e) {
+	register_error(elgg_echo("friends:add:failure", array($friend->name)));
+	$errors = true;
+}
+if (!$errors) {
+	// add to river
+	add_to_river('river/relationship/friend/create', 'friend', elgg_get_logged_in_user_guid(), $friend_guid);
+	system_message(elgg_echo("friends:add:successful", array($friend->name)));
+}
+
+// Forward back to the page you friended the user on
+forward(REFERER);
diff --git a/actions/friends/collections/add.php b/actions/friends/collections/add.php
new file mode 100644
index 000000000..e63a149f7
--- /dev/null
+++ b/actions/friends/collections/add.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * Elgg collection add page
+ *
+ * @package Elgg.Core
+ * @subpackage Friends.Collections
+ */
+
+$collection_name = htmlspecialchars(get_input('collection_name', '', false), ENT_QUOTES, 'UTF-8');
+$friends = get_input('friends_collection');
+
+if (!$collection_name) {
+	register_error(elgg_echo("friends:nocollectionname"));
+	forward(REFERER);
+}
+
+$id = create_access_collection($collection_name);
+
+if ($id) {
+	$result = update_access_collection($id, $friends);
+	if ($result) {
+		system_message(elgg_echo("friends:collectionadded"));
+		forward("collections/" . elgg_get_logged_in_user_entity()->username);
+	} else {
+		register_error(elgg_echo("friends:nocollectionname"));
+		forward(REFERER);
+	}
+} else {
+	register_error(elgg_echo("friends:nocollectionname"));
+	forward(REFERER);
+}
+\ No newline at end of file
diff --git a/actions/friends/collections/delete.php b/actions/friends/collections/delete.php
new file mode 100644
index 000000000..ff8f1fb55
--- /dev/null
+++ b/actions/friends/collections/delete.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * Elgg friends: delete collection action
+ *
+ * @package Elgg.Core
+ * @subpackage Friends.Collections
+ */
+
+$collection_id = (int) get_input('collection');
+
+// check the ACL exists and we can edit
+if (!can_edit_access_collection($collection_id)) {
+	register_error(elgg_echo("friends:collectiondeletefailed"));
+	forward(REFERER);
+}
+
+if (delete_access_collection($collection_id)) {
+	system_message(elgg_echo("friends:collectiondeleted"));
+} else {
+	register_error(elgg_echo("friends:collectiondeletefailed"));
+}
+
+forward(REFERER);
diff --git a/actions/friends/collections/edit.php b/actions/friends/collections/edit.php
new file mode 100644
index 000000000..9eb5e1eab
--- /dev/null
+++ b/actions/friends/collections/edit.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * Friends collection edit action
+ *
+ * @package Elgg.Core
+ * @subpackage Friends.Collections
+ */
+
+$collection_id = get_input('collection_id');
+$friends = get_input('friend');
+
+// check it exists and we can edit
+if (!can_edit_access_collection($collection_id)) {
+	system_message(elgg_echo('friends:collection:edit_failed'));
+}
+
+if (update_access_collection($collection_id, $friends)) {
+	system_message(elgg_echo('friends:collections:edited'));
+} else {
+	system_message(elgg_echo('friends:collection:edit_failed'));
+}
+
+forward(REFERER);
+\ No newline at end of file
diff --git a/actions/friends/remove.php b/actions/friends/remove.php
index 3d024b9d1..d69d18f31 100644
--- a/actions/friends/remove.php
+++ b/actions/friends/remove.php
@@ -1,35 +1,32 @@
-<?php
-
-	/**
-	 * Elgg remove friend action
-	 * 
-	 * @package Elgg
-	 * @subpackage Core
-	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
-	 * @author Curverider Ltd
-	 * @copyright Curverider Ltd 2008
-	 * @link http://elgg.org/
-	 */
-
-	// Ensure we are logged in
-		gatekeeper();
-		
-	// Get the GUID of the user to friend
-		$friend_guid = get_input('friend');
-		$friend = get_entity($friend_guid);
-		$errors = false;
-
-	// Get the user
-		try{
-			$_SESSION['user']->removeFriend($friend_guid) && get_class($friend) == "ElggUser";
-		} 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
+<?php
+/**
+ * Elgg remove friend action
+ *
+ * @package Elgg.Core
+ * @subpackage Friends.Management
+ */
+
+// Get the GUID of the user to friend
+$friend_guid = get_input('friend');
+$friend = get_entity($friend_guid);
+$errors = false;
+
+// Get the user
+try{
+	if ($friend instanceof ElggUser) {
+		elgg_get_logged_in_user_entity()->removeFriend($friend_guid);
+	} else {
+		register_error(elgg_echo("friends:remove:failure", array($friend->name)));
+		$errors = true;
+	}
+} catch (Exception $e) {
+	register_error(elgg_echo("friends:remove:failure", array($friend->name)));
+	$errors = true;
+}
+
+if (!$errors) {
+	system_message(elgg_echo("friends:remove:successful", array($friend->name)));
+}
+
+// Forward back to the page you made the friend on
+forward(REFERER);