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

MDL-17559 user edit: fixed undefined email property warnings; merged from MOODLE_19_STABLE

Browse Source
This commit is contained in:
skodak
2008-12-08 20:16:49 +00:00
parent 2f5237edea
commit d0b2acde4f
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
user/edit.php
+1 -1
View File
@@ -116,7 +116,7 @@
if ($CFG->emailchangeconfirmation) {
// Handle change of email carefully for non-trusted users
if ($user->email != $usernew->email && !has_capability('moodle/user:update', $systemcontext)) {
if (isset($usernew->email) and $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);
user/edit_form.php
+5 -3
View File
@@ -113,17 +113,19 @@ class user_edit_form extends moodleform {
$user = $DB->get_record('user', array('id'=>$usernew->id));
// validate email
if (!validate_email($usernew->email)) {
if (!isset($usernew->email)) {
// mail not confirmed yet
} else if (!validate_email($usernew->email)) {
$errors['email'] = get_string('invalidemail');
} else if (($usernew->email !== $user->email) and $DB->record_exists('user', array('email'=>$usernew->email, 'mnethostid'=>$CFG->mnet_localhost_id))) {
$errors['email'] = get_string('emailexists');
}
if ($usernew->email === $user->email and over_bounce_threshold($user)) {
if (isset($usernew->email) and $usernew->email === $user->email and over_bounce_threshold($user)) {
$errors['email'] = get_string('toomanybounces');
}
if (!empty($CFG->verifychangedemail) and !isset($errors['email']) and !has_capability('moodle/user:update', get_context_instance(CONTEXT_SYSTEM))) {
if (isset($usernew->email) and !empty($CFG->verifychangedemail) and !isset($errors['email']) and !has_capability('moodle/user:update', get_context_instance(CONTEXT_SYSTEM))) {
$errorstr = email_is_not_allowed($usernew->email);
if ($errorstr !== false) {
$errors['email'] = $errorstr;