Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
mahara
mahara
Commits
635e2075
Commit
635e2075
authored
Jun 10, 2010
by
Richard Mansfield
Browse files
Delay group invite notifications when sent in bulk
Signed-off-by:
Richard Mansfield
<
richardm@catalyst.net.nz
>
parent
360c7423
Changes
2
Hide whitespace changes
Inline
Side-by-side
htdocs/group/inviteusers.php
View file @
635e2075
...
...
@@ -87,9 +87,11 @@ function addmembers_submit(Pieform $form, $values) {
return
;
}
db_begin
();
foreach
(
$values
[
'users'
]
as
$userid
)
{
group_invite_user
(
$group
,
$userid
,
$USER
->
get
(
'id'
));
group_invite_user
(
$group
,
$userid
,
$USER
->
get
(
'id'
)
,
'member'
,
true
);
}
db_commit
();
$SESSION
->
add_ok_msg
(
get_string
(
'invitationssent'
,
'group'
,
count
(
$values
[
'users'
])));
redirect
(
get_config
(
'wwwroot'
)
.
'group/members.php?id='
.
GROUP
);
...
...
htdocs/lib/group.php
View file @
635e2075
...
...
@@ -445,7 +445,7 @@ function group_remove_user($groupid, $userid=null, $force=false) {
* @param object $userid User to invite
* @param object $userfrom User sending the invitation
*/
function
group_invite_user
(
$group
,
$userid
,
$userfrom
,
$role
=
'member'
)
{
function
group_invite_user
(
$group
,
$userid
,
$userfrom
,
$role
=
'member'
,
$delay
=
null
)
{
$user
=
optional_userobj
(
$userid
);
$data
=
new
StdClass
;
...
...
@@ -456,13 +456,14 @@ function group_invite_user($group, $userid, $userfrom, $role='member') {
ensure_record_exists
(
'group_member_invite'
,
$data
,
$data
);
$lang
=
get_user_language
(
$user
->
id
);
require_once
(
'activity.php'
);
activity
_occurred
(
'maharamessage'
,
array
(
$
activity
data
=
array
(
'users'
=>
array
(
$user
->
id
),
'subject'
=>
get_string_from_language
(
$lang
,
'invitetogroupsubject'
,
'group'
),
'message'
=>
get_string_from_language
(
$lang
,
'invitetogroupmessage'
,
'group'
,
display_name
(
$userfrom
,
$user
),
$group
->
name
),
'url'
=>
get_config
(
'wwwroot'
)
.
'group/view.php?id='
.
$group
->
id
,
'urltext'
=>
$group
->
name
,
));
);
activity_occurred
(
'maharamessage'
,
$activitydata
,
null
,
null
,
$delay
);
}
// Pieforms for various operations on groups
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment