MDL-39961 Events: Replace Legacy events - User
This change includes: * Added user_updated event, replacing old event * Added user_created event, replacing old event * Added user_deleted event, replacing old event * Added user_loggedout event, replacing old event * Added user_enrolment_created event, replacing old event * Added user_enrolment_deleted event, replacing old event * Added user_enrolment_updated event, replacing old event
This commit is contained in:
committed by
Damyon Wiese
parent
80032fea02
commit
bb78e249cd
+6
-19
@@ -29,6 +29,7 @@ require_once($CFG->libdir.'/adminlib.php');
|
||||
require_once($CFG->dirroot.'/user/editadvanced_form.php');
|
||||
require_once($CFG->dirroot.'/user/editlib.php');
|
||||
require_once($CFG->dirroot.'/user/profile/lib.php');
|
||||
require_once($CFG->dirroot.'/user/lib.php');
|
||||
|
||||
//HTTPS is required in this page when $CFG->loginhttps enabled
|
||||
$PAGE->https_required();
|
||||
@@ -177,20 +178,15 @@ if ($usernew = $userform->get_data()) {
|
||||
} else {
|
||||
$usernew->password = hash_internal_user_password($usernew->newpassword);
|
||||
}
|
||||
$usernew->id = $DB->insert_record('user', $usernew);
|
||||
$usercreated = true;
|
||||
add_to_log($course->id, 'user', 'add', "view.php?id=$usernew->id&course=$course->id", '');
|
||||
|
||||
$usernew->id = user_create_user($usernew, false);
|
||||
} else {
|
||||
$usernew = file_postupdate_standard_editor($usernew, 'description', $editoroptions, $usercontext, 'user', 'profile', 0);
|
||||
$DB->update_record('user', $usernew);
|
||||
// pass a true $userold here
|
||||
if (! $authplugin->user_update($user, $userform->get_data())) {
|
||||
// auth update failed, rollback for moodle
|
||||
$DB->update_record('user', $user);
|
||||
// Pass a true old $user here.
|
||||
if (!$authplugin->user_update($user, $usernew)) {
|
||||
// Auth update failed.
|
||||
print_error('cannotupdateuseronexauth', '', '', $user->auth);
|
||||
}
|
||||
add_to_log($course->id, 'user', 'update', "view.php?id=$user->id&course=$course->id", '');
|
||||
user_update_user($usernew, false);
|
||||
|
||||
//set new password if specified
|
||||
if (!empty($usernew->newpassword)) {
|
||||
@@ -206,8 +202,6 @@ if ($usernew = $userform->get_data()) {
|
||||
if (isset($usernew->suspended) and $usernew->suspended and !$user->suspended) {
|
||||
session_kill_user($user->id);
|
||||
}
|
||||
|
||||
$usercreated = false;
|
||||
}
|
||||
|
||||
$usercontext = context_user::instance($usernew->id);
|
||||
@@ -237,13 +231,6 @@ if ($usernew = $userform->get_data()) {
|
||||
// reload from db
|
||||
$usernew = $DB->get_record('user', array('id'=>$usernew->id));
|
||||
|
||||
// trigger events
|
||||
if ($usercreated) {
|
||||
events_trigger('user_created', $usernew);
|
||||
} else {
|
||||
events_trigger('user_updated', $usernew);
|
||||
}
|
||||
|
||||
if ($createpassword) {
|
||||
setnew_password_and_mail($usernew);
|
||||
unset_user_preference('create_password', $usernew);
|
||||
|
||||
Reference in New Issue
Block a user