aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--mod/groups/actions/addtogroup.php118
-rw-r--r--mod/groups/actions/join.php13
-rw-r--r--mod/groups/actions/joinrequest.php100
3 files changed, 94 insertions, 137 deletions
diff --git a/mod/groups/actions/addtogroup.php b/mod/groups/actions/addtogroup.php
index 0928c80c9..a34f5d48c 100644
--- a/mod/groups/actions/addtogroup.php
+++ b/mod/groups/actions/addtogroup.php
@@ -15,95 +15,75 @@
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');
if (sizeof($user_guid))
- foreach ($user_guid as $u_id)
{
- $requested = false;
-
- $user = get_entity($u_id);
- $group = get_entity($group_guid);
-
- if ( $user && $group) {
+ foreach ($user_guid as $u_id)
+ {
+ $user = get_entity($u_id);
+ $group = get_entity($group_guid);
- if ($_SESSION['user']->getGUID() == $group->owner_guid)
- {
- $requests = $user->group_join_request;
+ if ( $user && $group) {
- if ($requests)
+ if (get_loggedin_userid() == $group->owner_guid)
{
- foreach ($requests as $request)
+
+ // If the group is open or the user has requested membership
+ if (
+ (check_entity_relationship($user->guid, 'membership_request', $group->guid)) ||
+ ($group->isPublicMembership())
+ )
{
- if ($request == $group->getGUID())
+
+ if (!$group->isMember($user))
{
-
- // User has requested to join this group previously, so we can safely add them
-
- // add them
- if ((!$group->isMember($user)) && ($group->join($user)))
- {
-
- // send welcome email
- notify_user($user->getGUID(), $group->owner_guid,
- sprintf(elgg_echo('groups:welcome:subject'), $group->name),
- sprintf(elgg_echo('groups:welcome:body'), $user->name, $group->name, $group->getURL()),
- NULL, "email");
-
- system_message(elgg_echo('groups:addedtogroup'));
+ // Remove relationships
+ remove_entity_relationship($group->guid, 'invited', $user->guid);
+ remove_entity_relationship($user->guid, 'membership_request', $group->guid);
+
+ // send welcome email
+ notify_user($user->getGUID(), $group->owner_guid,
+ sprintf(elgg_echo('groups:welcome:subject'), $group->name),
+ sprintf(elgg_echo('groups:welcome:body'), $user->name, $group->name, $group->getURL()),
+ NULL, "email");
- }
- else
- register_error(elgg_echo("groups:cantjoin"));
-
- $requested = true;
+ system_message(elgg_echo('groups:addedtogroup'));
}
- }
- }
-
- 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);
-
- $logged_in_user = get_loggedin_user();
-
- // Set invite flag
- //if (!$user->setMetaData('group_invite', $group->getGUID(), "", true))
- if (
- (!$user->setMetaData('group_invite', $methods)) ||
- (!$user->isFriend())
- )
- {
- //if (!$user->group_invite = $methods) {
- register_error(elgg_echo("groups:usernotinvited"));
+ else
+ register_error(elgg_echo("groups:cantjoin"));
}
else
{
- // Send email
- if (notify_user($user->getGUID(), $group->owner_guid,
- sprintf(elgg_echo('groups:invite:subject'), $user->name, $group->name),
- sprintf(elgg_echo('groups:invite:body'), $user->name, $group->name, "{$CONFIG->url}action/groups/join?user_guid={$user->guid}&group_guid={$group->guid}"),
- NULL, "email"))
- system_message(elgg_echo("groups:userinvited"));
+ if ($user->isFriend())
+ {
+
+ // Create relationship
+ add_entity_relationship($group->guid, 'invited', $user->guid);
+
+ // Send email
+ if (notify_user($user->getGUID(), $group->owner_guid,
+ sprintf(elgg_echo('groups:invite:subject'), $user->name, $group->name),
+ sprintf(elgg_echo('groups:invite:body'), $user->name, $group->name, "{$CONFIG->url}action/groups/join?user_guid={$user->guid}&group_guid={$group->guid}"),
+ NULL, "email"))
+ 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($forward_url);
+
+ forward($_SERVER['HTTP_REFERER']);
+
?> \ No newline at end of file
diff --git a/mod/groups/actions/join.php b/mod/groups/actions/join.php
index 7e55306f5..ab18c39a0 100644
--- a/mod/groups/actions/join.php
+++ b/mod/groups/actions/join.php
@@ -14,14 +14,10 @@
gatekeeper();
- $user_guid = get_input('user_guid');
+ $user_guid = get_input('user_guid', get_loggedin_userid());
$group_guid = get_input('group_guid');
- $user = NULL;
- if (!$user_guid) $user = $_SESSION['user'];
- else
- $user = get_entity($user_guid);
-
+ $user = get_entity($user_guid);
$group = get_entity($group_guid);
if (($user instanceof ElggUser) && ($group instanceof ElggGroup))
@@ -33,8 +29,9 @@
system_message(elgg_echo("groups:joined"));
// Remove any invite or join request flags
- remove_metadata($user->guid, 'group_invite', $group->guid);
- remove_metadata($user->guid, 'group_join_request', $group->guid);
+ remove_entity_relationship($group->guid, 'invited', $user->guid);
+ remove_entity_relationship($user->guid, 'membership_request', $group->guid);
+
// add to river
add_to_river('river/group/create','join',$user->guid,$group->guid);
diff --git a/mod/groups/actions/joinrequest.php b/mod/groups/actions/joinrequest.php
index 2db4735c5..b7a4c976e 100644
--- a/mod/groups/actions/joinrequest.php
+++ b/mod/groups/actions/joinrequest.php
@@ -14,78 +14,58 @@
gatekeeper();
- $user_guid = get_input('user_guid');
+ $user_guid = get_input('user_guid', get_loggedin_userid());
$group_guid = get_input('group_guid');
- $user = NULL;
- if (!$user_guid) $user = $_SESSION['user'];
- else
- $user = get_entity($user_guid);
-
+ $user = get_entity($user_guid);
$group = get_entity($group_guid);
- if (!$group->isMember($user))
- {
- $invites = $user->group_invite;
-
- if ($invites)
+ // If not a member of this group
+ if (($group) && ($user) && (!$group->isMember($user)))
+ {
+ // If open group or invite exists
+ if (
+ ($group->isPublicMembership()) ||
+ (check_entity_relationship($group->guid, 'invited', $user->guid))
+ )
{
- if (!is_array($invites))
- $invites = array($invites);
-
- foreach ($invites as $invite)
+ if ($group->join($user))
{
- if ($invite == $group->getGUID())
- {
- if ($group->join($user))
- {
- system_message(elgg_echo('groups:joined'));
-
- forward($group->getURL());
- exit;
- }
- else
- system_message(elgg_echo('groups:cantjoin'));
-
- forward($_SERVER['HTTP_REFERER']);
- exit;
- }
-
+ // Remove relationships
+ remove_entity_relationship($group->guid, 'invited', $user->guid);
+ remove_entity_relationship($user->guid, 'membership_request', $group->guid);
+
+ // Group joined
+ system_message(elgg_echo('groups:joined'));
+
+ forward($group->getURL());
+ exit;
}
+ else
+ system_message(elgg_echo('groups:cantjoin'));
}
-
- // else email membership requiest
- // set flag
-
- // Permit multiple values
- $methods = $user->group_join_request;
- if (($methods) && (!is_array($methods)))
- $methods = array($methods);
- if (!$methods) $methods=array();
- $methods[] = $group->getGUID();
- $methods = array_unique($methods);
-
- //if (!$user->setMetaData('group_join_request', $group->getGUID(), "", true))
- if (!$user->group_join_request = $methods)
- system_message(elgg_echo("groups:joinrequestnotmade"));
else
{
-
- // Send email
- if (notify_user($group->owner_guid, $user->getGUID(),
- sprintf(elgg_echo('groups:request:subject'), $user->name, $group->name),
- sprintf(elgg_echo('groups:request:body'), $group->getOwnerEntity()->name, $user->name, $group->name, $user->getURL(), "{$CONFIG->url}action/groups/addtogroup?user_guid={$user->guid}&group_guid={$group->guid}"),
- NULL, "email"))
- system_message(elgg_echo("groups:joinrequestmade"));
+ // If join request not already made
+ if (!check_entity_relationship($user->guid, 'membership_request', $group->guid))
+ {
+ // Add membership requested
+ add_entity_relationship($user->guid, 'membership_request', $group->guid);
+
+ // Send email
+ if (notify_user($group->owner_guid, $user->getGUID(),
+ sprintf(elgg_echo('groups:request:subject'), $user->name, $group->name),
+ sprintf(elgg_echo('groups:request:body'), $group->getOwnerEntity()->name, $user->name, $group->name, $user->getURL(), "{$CONFIG->url}action/groups/addtogroup?user_guid={$user->guid}&group_guid={$group->guid}"),
+ NULL))
+ system_message(elgg_echo("groups:joinrequestmade"));
+ else
+ register_error(elgg_echo("groups:joinrequestnotmade"));
+ }
else
- register_error(elgg_echo("groups:joinrequestnotmade"));
+ system_message(elgg_echo("groups:joinrequestmade"));
}
-
-
}
- else
- register_error(elgg_echo('groups:alreadymember'));
-
+
forward($_SERVER['HTTP_REFERER']);
- exit;
+
?> \ No newline at end of file
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-23 21:48:57 +0000