Skip to content
GitLab
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
de008efc
Commit
de008efc
authored
Nov 13, 2008
by
Nigel McNie
Browse files
[UPSTREAM] Add a new event type - userjoinsgroup.
Triggered, guess when - when a use joins a group!
parent
801c1067
Changes
4
Hide whitespace changes
Inline
Side-by-side
htdocs/lib/db/upgrade.php
View file @
de008efc
...
...
@@ -1467,6 +1467,13 @@ function xmldb_core_upgrade($oldversion=0) {
add_field
(
$table
,
$field
);
}
if
(
$oldversion
<
2008111201
)
{
$event
=
(
object
)
array
(
'name'
=>
'userjoinsgroup'
,
);
ensure_record_exists
(
'event_type'
,
$event
,
$event
);
}
return
$status
;
}
...
...
htdocs/lib/group.php
View file @
de008efc
...
...
@@ -344,18 +344,19 @@ function group_add_user($groupid, $userid, $role=null) {
$groupid
=
group_param_groupid
(
$groupid
);
$userid
=
group_param_userid
(
$userid
);
$
c
m
=
new
StdClass
;
$
c
m
->
member
=
$userid
;
$
c
m
->
group
=
$groupid
;
$
c
m
->
ctime
=
db_format_timestamp
(
time
());
$
g
m
=
new
StdClass
;
$
g
m
->
member
=
$userid
;
$
g
m
->
group
=
$groupid
;
$
g
m
->
ctime
=
db_format_timestamp
(
time
());
if
(
!
$role
)
{
$role
=
get_field_sql
(
'SELECT gt.defaultrole FROM {grouptype} gt, {group} g WHERE g.id = ? AND g.grouptype = gt.name'
,
array
(
$groupid
));
}
$
c
m
->
role
=
$role
;
$
g
m
->
role
=
$role
;
db_begin
();
insert_record
(
'group_member'
,
$
c
m
);
insert_record
(
'group_member'
,
$
g
m
);
delete_records
(
'group_member_request'
,
'group'
,
$groupid
,
'member'
,
$userid
);
handle_event
(
'userjoinsgroup'
,
$gm
);
db_commit
();
}
...
...
htdocs/lib/upgrade.php
View file @
de008efc
...
...
@@ -650,6 +650,7 @@ function core_install_firstcoredata_defaults() {
'unexpireuser'
,
'deactivateuser'
,
'activateuser'
,
'userjoinsgroup'
,
'saveartefact'
,
'deleteartefact'
,
'saveview'
,
...
...
htdocs/lib/version.php
View file @
de008efc
...
...
@@ -27,7 +27,7 @@
defined
(
'INTERNAL'
)
||
die
();
$config
=
new
StdClass
;
$config
->
version
=
200811120
0
;
$config
->
version
=
200811120
1
;
$config
->
release
=
'1.1.0beta3dev'
;
$config
->
minupgradefrom
=
2007080700
;
$config
->
minupgraderelease
=
'0.8.0 (release tag 0.8.0_RELEASE)'
;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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