MDL-82379 core_user: Move email change token to user private access key

2024-12-05 13:37:56 +08:00
parent 488da643c6
commit bef45583cc
4 changed files with 18 additions and 6 deletions
@@ -199,9 +199,11 @@ if ($userform->is_cancelled()) {
        // Other users require a confirmation email.
        if (isset($usernew->email) and $user->email != $usernew->email && !has_capability('moodle/user:update', $systemcontext)) {
            $a = new stdClass();
-            $emailchangedkey = random_string(20);
+            // Set the key to expire in 10 minutes.
+            $validuntil = time() + 600;
+            $emailchangedkey = create_user_key('core_user/email_change', $user->id, null, null, $validuntil);
+
            set_user_preference('newemail', $usernew->email, $user->id);
-            set_user_preference('newemailkey', $emailchangedkey, $user->id);
            set_user_preference('newemailattemptsleft', 3, $user->id);

            $a->newemail = $emailchanged = $usernew->email;