From 949a233076ec18f86e60f90a7a8837cb422664af Mon Sep 17 00:00:00 2001 From: cash Date: Thu, 3 Feb 2011 03:33:52 +0000 Subject: Refs #2428 almost done removing CONFIG access - mostly plugin start.php left git-svn-id: http://code.elgg.org/elgg/trunk@7999 36083f99-b078-4883-b0ff-0f9b5a30f544 --- mod/groups/actions/invite.php | 47 +++++++++++++++++-------------------------- 1 file changed, 19 insertions(+), 28 deletions(-) (limited to 'mod/groups/actions/invite.php') 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 @@ 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); - -?> -- cgit v1.2.3