1 files changed, 51 insertions, 66 deletions

diff --git a/mod/groups/actions/addtogroup.php b/mod/groups/actions/addtogroup.php
index 2da045fc6..651b90abb 100644
--- a/mod/groups/actions/addtogroup.php
+++ b/mod/groups/actions/addtogroup.php
@@ -1,92 +1,77 @@
 <?php
+/**
+ * Add a user to a group
+ *
+ * @package ElggGroups
+ */
+$logged_in_user = get_loggedin_user();
 
-	/**
-	 * Add a user to a group
-	 *
-	 * @package ElggGroups
-	 */
+$user_guid = get_input('user_guid');
+if (!is_array($user_guid))
+	$user_guid = array($user_guid);
+$group_guid = get_input('group_guid');
 
-	// Load configuration
-	global $CONFIG;
+if (sizeof($user_guid)) {
+	foreach ($user_guid as $u_id) {
+		$user = get_entity($u_id);
+		$group = get_entity($group_guid);
 
-	$logged_in_user = get_loggedin_user();
+		set_page_owner($group->guid);
 
-	$user_guid = get_input('user_guid');
-	if (!is_array($user_guid))
-		$user_guid = array($user_guid);
-	$group_guid = get_input('group_guid');
+		if ($user && $group) {
 
-	if (sizeof($user_guid))
-	{
-		foreach ($user_guid as $u_id)
-		{
-			$user = get_entity($u_id);
-			$group = get_entity($group_guid);
+			//if (get_loggedin_userid() == $group->owner_guid)
+			if ($group->canEdit()) {
 
-			set_page_owner($group->guid);
-
-			if ( $user && $group) {
-
-				//if (get_loggedin_userid() == $group->owner_guid)
-				if ($group->canEdit())
-				{
-
-					// If the group is open or the user has requested membership
-					if (
+				// If the group is open or the user has requested membership
+				if (
 						(check_entity_relationship($user->guid, 'membership_request', $group->guid)) ||
 						($group->isPublicMembership())
-						)
-					{
+				) {
 
-						if (!$group->isMember($user))
-						{
-							// Remove relationships
-							remove_entity_relationship($group->guid, 'invited', $user->guid);
-							remove_entity_relationship($user->guid, 'membership_request', $group->guid);
+					if (!$group->isMember($user)) {
+						// Remove relationships
+						remove_entity_relationship($group->guid, 'invited', $user->guid);
+						remove_entity_relationship($user->guid, 'membership_request', $group->guid);
 
-							//add_entity_relationship($user->guid, 'member', $group->guid);
-							$group->join($user);
+						//add_entity_relationship($user->guid, 'member', $group->guid);
+						$group->join($user);
 
-							// send welcome email
-							notify_user($user->getGUID(), $group->owner_guid,
+						// send welcome email
+						notify_user($user->getGUID(), $group->owner_guid,
 								elgg_echo('groups:welcome:subject', array($group->name)),
 								elgg_echo('groups:welcome:body', array($user->name, $group->name, $group->getURL())),
 								NULL);
 
-							system_message(elgg_echo('groups:addedtogroup'));
-						}
-						else
-							register_error(elgg_echo("groups:cantjoin"));
+						system_message(elgg_echo('groups:addedtogroup'));
 					}
 					else
-					{
-						if ($user->isFriend())
-						{
-
-							// Create relationship
-							add_entity_relationship($group->guid, 'invited', $user->guid);
-
-							// Send email
-							$url = elgg_get_site_url()."pg/groups/invited?user_guid={$user->guid}&group_guid={$group->guid}";
-							if (notify_user($user->getGUID(), $group->owner_guid,
-									elgg_echo('groups:invite:subject', array($user->name, $group->name)),
-									elgg_echo('groups:invite:body', array($user->name, $logged_in_user->name, $group->name, $url)),
-									NULL))
-								system_message(elgg_echo("groups:userinvited"));
-							else
-								register_error(elgg_echo("groups:usernotinvited"));
-
-						}
+						register_error(elgg_echo("groups:cantjoin"));
+				}
+				else {
+					if ($user->isFriend()) {
+
+						// Create relationship
+						add_entity_relationship($group->guid, 'invited', $user->guid);
+
+						// Send email
+						$url = elgg_get_site_url() . "pg/groups/invited?user_guid={$user->guid}&group_guid={$group->guid}";
+						if (notify_user($user->getGUID(), $group->owner_guid,
+										elgg_echo('groups:invite:subject', array($user->name, $group->name)),
+										elgg_echo('groups:invite:body', array($user->name, $logged_in_user->name, $group->name, $url)),
+										NULL))
+							system_message(elgg_echo("groups:userinvited"));
 						else
 							register_error(elgg_echo("groups:usernotinvited"));
 					}
+					else
+						register_error(elgg_echo("groups:usernotinvited"));
 				}
-				else
-					register_error(elgg_echo("groups:notowner"));
 			}
+			else
+				register_error(elgg_echo("groups:notowner"));
 		}
 	}
+}
 
-	forward(REFERER);
-
-?>
+forward(REFERER);