diff options
Diffstat (limited to 'mod/groups/actions')
| -rw-r--r-- | mod/groups/actions/addtogroup.php | 4 | ||||
| -rw-r--r-- | mod/groups/actions/groupskillrequest.php | 32 |
2 files changed, 35 insertions, 1 deletions
diff --git a/mod/groups/actions/addtogroup.php b/mod/groups/actions/addtogroup.php index a34f5d48c..97f10aef2 100644 --- a/mod/groups/actions/addtogroup.php +++ b/mod/groups/actions/addtogroup.php @@ -44,7 +44,9 @@ // 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);
+ // send welcome email notify_user($user->getGUID(), $group->owner_guid, sprintf(elgg_echo('groups:welcome:subject'), $group->name), diff --git a/mod/groups/actions/groupskillrequest.php b/mod/groups/actions/groupskillrequest.php new file mode 100644 index 000000000..a2734abb9 --- /dev/null +++ b/mod/groups/actions/groupskillrequest.php @@ -0,0 +1,32 @@ +<?php
+ /**
+ * Delete a user request to join a closed group.
+ *
+ * @package ElggGroups
+ * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+ * @author Curverider Ltd
+ * @copyright Curverider Ltd 2008-2009
+ * @link http://elgg.com/
+ */
+
+ // Load configuration
+ global $CONFIG;
+
+ gatekeeper();
+
+ $user_guid = get_input('user_guid', get_loggedin_userid());
+ $group_guid = get_input('group_guid');
+
+ $user = get_entity($user_guid);
+ $group = get_entity($group_guid);
+
+ // If join request made
+ if (check_entity_relationship($user->guid, 'membership_request', $group->guid))
+ {
+ remove_entity_relationship($user->guid, 'membership_request', $group->guid);
+ system_message(elgg_echo("groups:joinrequestkilled"));
+ }
+
+ forward($_SERVER['HTTP_REFERER']);
+
+?>
\ No newline at end of file |