aboutsummaryrefslogtreecommitdiff
path: root/mod/groups/actions
diff options
context:
space:
mode:
authormarcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>2008-07-04 16:53:04 +0000
committermarcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>2008-07-04 16:53:04 +0000
commit83aa919f302dfd00295defd03a089e0619bf9406 (patch)
tree3efdb4825161489107a47df516cac2b92756c08e /mod/groups/actions
parentef62cf3614a62d61bd53061a0e2d4f81badfe175 (diff)
downloadelgg-83aa919f302dfd00295defd03a089e0619bf9406.tar.gz
elgg-83aa919f302dfd00295defd03a089e0619bf9406.tar.bz2
Refs #109: Invite support added
git-svn-id: https://code.elgg.org/elgg/trunk@1298 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'mod/groups/actions')
-rw-r--r--mod/groups/actions/addtogroup.php113
-rw-r--r--mod/groups/actions/edit.php9
2 files changed, 70 insertions, 52 deletions
diff --git a/mod/groups/actions/addtogroup.php b/mod/groups/actions/addtogroup.php
index 9ce42d523..b60892012 100644
--- a/mod/groups/actions/addtogroup.php
+++ b/mod/groups/actions/addtogroup.php
@@ -15,75 +15,84 @@
gatekeeper();
+ $forward_url = get_input('forward_url', $_SERVER['HTTP_REFERER']);
$user_guid = get_input('user_guid');
+ if (!is_array($user_guid))
+ $user_guid = array($user_guid);
$group_guid = get_input('group_guid');
- $user = get_entity($user_guid);
- $group = get_entity($group_guid);
-
- if ($_SESSION['user']->getGUID() == $group->owner_guid)
+
+ foreach ($user_guid as $u_id)
{
- $requests = $user->group_join_request;
-
- if ($requests)
+ $requested = false;
+ $user = get_entity($u_id);
+ $group = get_entity($group_guid);
+
+ if ($_SESSION['user']->getGUID() == $group->owner_guid)
{
- foreach ($requests as $request)
+ $requests = $user->group_join_request;
+
+ if ($requests)
{
- if ($request == $group->getGUID())
+ foreach ($requests as $request)
{
-
- // User has requested to join this group previously, so we can safely add them
-
- // add them
- if ((!$group->isMember($user)) && ($group->join($user)))
+ if ($request == $group->getGUID())
{
- // send welcome email
- notify_user($user->getGUID(), $group->owner_guid,
- sprintf(elgg_echo('groups:welcome:subject'), $group->title),
- sprintf(elgg_echo('groups:welcome:body'), $user->name, $group->title, $group->getURL()),
- NULL, "email");
+ // User has requested to join this group previously, so we can safely add them
+
+ // add them
+ if ((!$group->isMember($user)) && ($group->join($user)))
+ {
- system_message(elgg_echo('groups:addedtogroup'));
+ // send welcome email
+ notify_user($user->getGUID(), $group->owner_guid,
+ sprintf(elgg_echo('groups:welcome:subject'), $group->title),
+ sprintf(elgg_echo('groups:welcome:body'), $user->name, $group->title, $group->getURL()),
+ NULL, "email");
+
+ system_message(elgg_echo('groups:addedtogroup'));
+
+ }
+ else
+ system_message(elgg_echo("groups:cantjoin"));
+ $requested = true;
}
+ }
+ }
+
+ if (!$requested)
+ {
+ // Not found in request array, so send an invite and set invite flag
+ $methods = $user->group_invite;
+ if (($methods) && (!is_array($methods)))
+ $methods = array($methods);
+ if (!$methods) $methods=array();
+ $methods[] = $group->getGUID();
+ $methods = array_unique($methods);
+
+ // Set invite flag
+ //if (!$user->setMetaData('group_invite', $group->getGUID(), "", true))
+ if (!$user->group_invite = $methods)
+ system_message(elgg_echo("groups:usernotinvited"));
+ else
+ {
+ // Send email
+ if (notify_user($user->getGUID(), $group->owner_guid,
+ sprintf(elgg_echo('groups:invite:subject'), $user->name, $group->title),
+ sprintf(elgg_echo('groups:invite:body'), $user->name, $group->title, "{$CONFIG->url}action/groups/join?user_guid={$user->guid}&group_guid={$group->guid}"),
+ NULL, "email"))
+ system_message(elgg_echo("groups:userinvited"));
else
- system_message(elgg_echo("groups:cantjoin"));
-
- forward($_SERVER['HTTP_REFERER']);
- exit;
+ system_message(elgg_echo("groups:usernotinvited"));
}
}
}
-
- // Not found in request array, so send an invite and set invite flag
- $methods = $user->group_invite;
- if (($methods) && (!is_array($methods)))
- $methods = array($methods);
- if (!$methods) $methods=array();
- $methods[] = $group->getGUID();
- $methods = array_unique($methods);
-
- // Set invite flag
- //if (!$user->setMetaData('group_invite', $group->getGUID(), "", true))
- if (!$user->group_invite = $methods)
- system_message(elgg_echo("groups:usernotinvited"));
else
- {
- // Send email
- if (notify_user($user->getGUID(), $group->owner_guid,
- sprintf(elgg_echo('groups:invite:subject'), $user->name, $group->title),
- sprintf(elgg_echo('groups:invite:body'), $user->name, $group->title, "{$CONFIG->url}action/groups/join?user_guid={$user->guid}&group_guid={$group->guid}"),
- NULL, "email"))
- system_message(elgg_echo("groups:userinvited"));
- else
- system_message(elgg_echo("groups:usernotinvited"));
- }
-
+ system_message(elgg_echo("groups:notowner"));
}
- else
- system_message(elgg_echo("groups:notowner"));
-
- forward($_SERVER['HTTP_REFERER']);
+
+ forward($forward_url);
exit;
?> \ No newline at end of file
diff --git a/mod/groups/actions/edit.php b/mod/groups/actions/edit.php
index 4e9cdf99e..c8eebbd84 100644
--- a/mod/groups/actions/edit.php
+++ b/mod/groups/actions/edit.php
@@ -45,6 +45,15 @@
}
}
+ // Validate create
+ if (!$group->title)
+ {
+ system_message(elgg_echo("groups:notitle"));
+
+ forward($_SERVER['HTTP_REFERER']);
+ exit;
+ }
+
// Get access
$group->access_id = get_input('access_id', 0);