1 files changed, 19 insertions, 28 deletions

diff --git a/mod/groups/actions/invite.php b/mod/groups/actions/invite.php
index eef8fb5ce..e8eeb3330 100644
--- a/mod/groups/actions/invite.php
+++ b/mod/groups/actions/invite.php
@@ -1,63 +1,54 @@
 <?php
-
 /**
  * Invite a user to join a group
  *
  * @package ElggGroups
  */
 
-// Load configuration
-global $CONFIG;
-
 $logged_in_user = get_loggedin_user();
 
 $user_guid = get_input('user_guid');
-if (!is_array($user_guid))
+if (!is_array($user_guid)) {
 	$user_guid = array($user_guid);
+}
 $group_guid = get_input('group_guid');
 
-if (sizeof($user_guid))
-{
-	foreach ($user_guid as $u_id)
-	{
+if (sizeof($user_guid)) {
+	foreach ($user_guid as $u_id) {
 		$user = get_entity($u_id);
 		$group = get_entity($group_guid);
 
 		if ( $user && $group) {
 
-			if (($group instanceof ElggGroup) && ($group->canEdit()))
-			{
-				if (!check_entity_relationship($group->guid, 'invited', $user->guid))
-				{
-					if ($user->isFriend())
-					{
+			if (($group instanceof ElggGroup) && ($group->canEdit())) {
+				if (!check_entity_relationship($group->guid, 'invited', $user->guid)) {
+					if ($user->isFriend()) {
 
 						// Create relationship
 						add_entity_relationship($group->guid, 'invited', $user->guid);
 
 						// Send email
-						$url = "{$CONFIG->url}pg/groups/invitations/{$user->username}";
-						if (notify_user($user->getGUID(), $group->owner_guid,
+						$url = elgg_normalize_url("pg/groups/invitations/$user->username");
+						$result = 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))
+								NULL);
+						if ($result) {
 							system_message(elgg_echo("groups:userinvited"));
-						else
+						} else {
 							register_error(elgg_echo("groups:usernotinvited"));
-
-					}
-					else
+						}
+					} else {
 						register_error(elgg_echo("groups:usernotinvited"));
-				}
-				else
+					}
+				} else {
 					register_error(elgg_echo("groups:useralreadyinvited"));
-			}
-			else
+				}
+			} else {
 				register_error(elgg_echo("groups:notowner"));
+			}
 		}
 	}
 }
 
 forward(REFERER);
-
-?>