Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
mahara
mahara
Commits
ae531c51
Commit
ae531c51
authored
Jan 09, 2018
by
Robert Lyon
Committed by
Gerrit Code Review
Jan 09, 2018
Browse files
Options
Browse Files
Download
Plain Diff
Merge "Bug 1722855: Add usrleavesgroup event trigger"
parents
671e977e
c270263c
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
16 additions
and
1 deletion
+16
-1
htdocs/lib/db/upgrade.php
htdocs/lib/db/upgrade.php
+9
-0
htdocs/lib/group.php
htdocs/lib/group.php
+5
-0
htdocs/lib/upgrade.php
htdocs/lib/upgrade.php
+1
-0
htdocs/lib/version.php
htdocs/lib/version.php
+1
-1
No files found.
htdocs/lib/db/upgrade.php
View file @
ae531c51
...
...
@@ -5554,6 +5554,7 @@ function xmldb_core_upgrade($oldversion=0) {
}
if
(
$oldversion
<
2018010300
)
{
log_debug
(
'Anonymising remaining deleted user data'
);
$sql
=
"UPDATE
{
usr
}
SET username = CONCAT(MD5(username), 1000000 + id),
email = CONCAT(MD5(email), 1000000 + id)
...
...
@@ -5561,5 +5562,13 @@ function xmldb_core_upgrade($oldversion=0) {
execute_sql
(
$sql
);
}
if
(
$oldversion
<
2018010400
)
{
log_debug
(
'Adding new event type "userleavesgroup"'
);
$event
=
(
object
)
array
(
'name'
=>
'userleavesgroup'
);
ensure_record_exists
(
'event_type'
,
$event
,
$event
);
}
return
$status
;
}
htdocs/lib/group.php
View file @
ae531c51
...
...
@@ -1074,6 +1074,11 @@ function group_remove_user($groupid, $userid=null, $force=false) {
if
(
!
$force
&&
!
group_user_can_leave
(
$groupid
,
$userid
))
{
throw
new
AccessDeniedException
(
get_string
(
'usercantleavegroup'
,
'group'
));
}
$data
=
new
StdClass
;
$data
->
user
=
$userid
;
$data
->
group
=
$groupid
;
$data
->
role
=
get_field
(
'group_member'
,
'role'
,
'group'
,
$groupid
,
'member'
,
$userid
);
handle_event
(
'userleavesgroup'
,
$data
);
delete_records
(
'group_member'
,
'group'
,
$groupid
,
'member'
,
$userid
);
global
$USER
;
...
...
htdocs/lib/upgrade.php
View file @
ae531c51
...
...
@@ -871,6 +871,7 @@ function core_install_firstcoredata_defaults() {
'deactivateuser'
,
'activateuser'
,
'userjoinsgroup'
,
'userleavesgroup'
,
'saveartefact'
,
'deleteartefact'
,
'deleteartefacts'
,
...
...
htdocs/lib/version.php
View file @
ae531c51
...
...
@@ -16,7 +16,7 @@ $config = new stdClass();
// See https://wiki.mahara.org/wiki/Developer_Area/Version_Numbering_Policy
// For upgrades on stable branches, increment the version by one. On master, use the date.
$config
->
version
=
2018010
3
00
;
$config
->
version
=
2018010
4
00
;
$config
->
series
=
'18.04'
;
$config
->
release
=
'18.04dev'
;
$config
->
minupgradefrom
=
2015030409
;
...
...
Write
Preview
Markdown
is supported
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