L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-13811 Completed the required changes. Also added a "Cancel email change" link.

Browse Source
This commit is contained in:
nicolasconnault
2008-07-05 14:41:55 +00:00
parent 4c3a837f21
commit f978083108
7 changed files with 174 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
user/edit.php
+70 -3
View File
@@ -10,6 +10,7 @@
$userid = optional_param('id', $USER->id, PARAM_INT); // user id
$course = optional_param('course', SITEID, PARAM_INT); // course id (defaults to Site)
$cancelemailchange = optional_param('cancelemailchange', false, PARAM_INT); // course id (defaults to Site)
if (!$course = get_record('course', 'id', $course)) {
error('Course ID was incorrect');
@@ -32,11 +33,34 @@
error('User ID was incorrect');
}
// Process email change cancellation
if ($cancelemailchange) {
useredit_load_preferences($user);
$user->preference_newemail = null;
$user->preference_newemailkey = null;
$user->preference_newemailattemptsleft = null;
useredit_update_user_preference($user);
}
// Guest can not be edited
if (isguestuser($user)) {
print_error('guestnoeditprofile');
}
// User interests separated by commas
if (!empty($CFG->usetags)) {
require_once($CFG->dirroot.'/tag/lib.php');
$user->interests = tag_get_tags_csv('user', $user->id, TAG_RETURN_TEXT);
}
// remote users cannot be edited
if (is_mnet_remote_user($user)) {
redirect($CFG->wwwroot . "/user/view.php?course={$course->id}");
}
$systemcontext = get_context_instance(CONTEXT_SYSTEM);
$personalcontext = get_context_instance(CONTEXT_USER, $user->id);
// check access control
if ($user->id != $USER->id) {
// teachers, parents, etc.
@@ -63,9 +87,28 @@
$userform = new user_edit_form();
$userform->set_data($user);
$email_changed = false;
if ($usernew = $userform->get_data()) {
add_to_log($course->id, 'user', 'update', "view.php?id=$user->id&course=$course->id", '');
$email_changed_html = '';
if ($CFG->emailchangeconfirmation) {
// Handle change of email carefully for non-trusted users
if ($user->email != $usernew->email && !has_capability('moodle/user:update', $systemcontext)) {
$a = new stdClass();
$a->newemail = $usernew->preference_newemail = $usernew->email;
$usernew->preference_newemailkey = random_string(20);
$usernew->preference_newemailattemptsleft = 3;
$a->oldemail = $usernew->email = $user->email;
$email_changed_html = print_box(get_string('auth_changingemailaddress', 'auth', $a), 'generalbox', 'notice', true);
$email_changed_html .= print_continue("$CFG->wwwroot/user/view.php?id=$user->id&course=$course->id", true);
$email_changed = true;
}
}
$authplugin = get_auth_plugin($user->auth);
$usernew->timemodified = time();
@@ -99,6 +142,24 @@
// save custom profile fields data
profile_save_data($usernew);
// If email was changed, send confirmation email now
if ($email_changed && $CFG->emailchangeconfirmation) {
$temp_user = fullclone($user);
$temp_user->email = $usernew->preference_newemail;
$a = new stdClass();
$a->url = $CFG->wwwroot . '/user/emailupdate.php?key=' . $usernew->preference_newemailkey . '&id=' . $user->id;
$a->site = $SITE->fullname;
$a->fullname = fullname($user, true);
$emailupdatemessage = get_string('auth_emailupdatemessage', 'auth', $a);
$emailupdatetitle = get_string('auth_emailupdatetitle', 'auth', $a);
if(!$mail_results = email_to_user($temp_user, get_admin(), $emailupdatetitle, $emailupdatemessage)) {
die("could not send email!");
}
}
if ($USER->id == $user->id) {
// Override old $USER session variable if needed
$usernew = (array)get_record('user', 'id', $user->id); // reload from db
@@ -107,7 +168,9 @@
}
}
redirect("$CFG->wwwroot/user/view.php?id=$user->id&course=$course->id");
if (!$email_changed || !$CFG->emailchangeconfirmation) {
redirect("$CFG->wwwroot/user/view.php?id=$user->id&course=$course->id");
}
}
@@ -131,8 +194,12 @@
$currenttab = 'editprofile';
require('tabs.php');
/// Finally display THE form
$userform->display();
if ($email_changed) {
echo $email_changed_html;
} else {
/// Finally display THE form
$userform->display();
}
/// and proper footer
print_footer($course);