From 2b503e40f236341a048759ed243dd68f0f96f5e7 Mon Sep 17 00:00:00 2001 From: Rajesh Taneja Date: Fri, 30 Aug 2013 15:21:37 +0800 Subject: [PATCH] MDL-31560 Messages: Deprecated generate_email_supportuser generate_email_supportuser was not creating user which can be used by messaging system. core_user::get_support_user() should be used to get support_user record. --- enrol/self/lib.php | 2 +- lib/authlib.php | 2 +- lib/cronlib.php | 2 +- lib/deprecatedlib.php | 12 ++++++++++++ lib/moodlelib.php | 36 ++++++------------------------------ user/edit.php | 2 +- 6 files changed, 22 insertions(+), 34 deletions(-) diff --git a/enrol/self/lib.php b/enrol/self/lib.php index 9b0fa481fcc..22d2f7499d5 100644 --- a/enrol/self/lib.php +++ b/enrol/self/lib.php @@ -433,7 +433,7 @@ class enrol_self_plugin extends enrol_plugin { if ($rusers) { $contact = reset($rusers); } else { - $contact = generate_email_supportuser(); + $contact = core_user::get_support_user(); } // Directly emailing welcome message rather than using messaging. diff --git a/lib/authlib.php b/lib/authlib.php index c24c5be9bc3..f8fac6ea501 100644 --- a/lib/authlib.php +++ b/lib/authlib.php @@ -707,7 +707,7 @@ function login_lock_account($user) { } $site = get_site(); - $supportuser = generate_email_supportuser(); + $supportuser = core_user::get_support_user(); $data = new stdClass(); $data->firstname = $user->firstname; diff --git a/lib/cronlib.php b/lib/cronlib.php index 117f155fe2a..b15105a4c98 100644 --- a/lib/cronlib.php +++ b/lib/cronlib.php @@ -758,7 +758,7 @@ function notify_login_failures() { mtrace('Emailing admins about '. $count .' failed login attempts'); foreach ($recip as $admin) { //emailing the admins directly rather than putting these through the messaging system - email_to_user($admin, generate_email_supportuser(), $subject, $body); + email_to_user($admin, core_user::get_support_user(), $subject, $body); } } diff --git a/lib/deprecatedlib.php b/lib/deprecatedlib.php index c5b65015ab9..3cc26edb3e2 100644 --- a/lib/deprecatedlib.php +++ b/lib/deprecatedlib.php @@ -4532,4 +4532,16 @@ function get_user_device_type() { function get_browser_version_classes() { debugging('get_browser_version_classes has been deprecated, please update your code to use core_useragent instead.', DEBUG_DEVELOPER); return core_useragent::get_browser_version_classes(); +} + +/** + * Generate a fake user for emails based on support settings + * + * @deprecated since Moodle 2.6 + * @see core_user::get_support_user() + * @return stdClass user info + */ +function generate_email_supportuser() { + debugging('generate_email_supportuser is deprecated, please use core_user::get_support_user'); + return core_user::get_support_user(); } \ No newline at end of file diff --git a/lib/moodlelib.php b/lib/moodlelib.php index d599f05ec4a..92091ea16df 100644 --- a/lib/moodlelib.php +++ b/lib/moodlelib.php @@ -5653,7 +5653,7 @@ function email_to_user($user, $from, $subject, $messagetext, $messagehtml = '', $temprecipients = array(); $tempreplyto = array(); - $supportuser = generate_email_supportuser(); + $supportuser = core_user::get_support_user(); // Make up an email address for handling bounces. if (!empty($CFG->handlebounces)) { @@ -5802,30 +5802,6 @@ function generate_email_signoff() { return $signoff; } -/** - * Generate a fake user for emails based on support settings - * - * @return stdClass user info - */ -function generate_email_supportuser() { - global $CFG; - - static $supportuser; - - if (!empty($supportuser)) { - return $supportuser; - } - - $supportuser = new stdClass(); - $supportuser->email = $CFG->supportemail ? $CFG->supportemail : $CFG->noreplyaddress; - $supportuser->firstname = $CFG->supportname ? $CFG->supportname : get_string('noreplyname'); - $supportuser->lastname = ''; - $supportuser->maildisplay = true; - - return $supportuser; -} - - /** * Sets specified user's password and send the new password to the user via email. * @@ -5843,7 +5819,7 @@ function setnew_password_and_mail($user, $fasthash = false) { $site = get_site(); - $supportuser = generate_email_supportuser(); + $supportuser = core_user::get_support_user(); $newpassword = generate_password(); @@ -5877,7 +5853,7 @@ function reset_password_and_mail($user) { global $CFG; $site = get_site(); - $supportuser = generate_email_supportuser(); + $supportuser = core_user::get_support_user(); $userauth = get_auth_plugin($user->auth); if (!$userauth->can_reset_password() or !is_enabled_auth($user->auth)) { @@ -5920,7 +5896,7 @@ function send_confirmation_email($user) { global $CFG; $site = get_site(); - $supportuser = generate_email_supportuser(); + $supportuser = core_user::get_support_user(); $data = new stdClass(); $data->firstname = fullname($user); @@ -5951,7 +5927,7 @@ function send_password_change_confirmation_email($user) { global $CFG; $site = get_site(); - $supportuser = generate_email_supportuser(); + $supportuser = core_user::get_support_user(); $data = new stdClass(); $data->firstname = $user->firstname; @@ -5978,7 +5954,7 @@ function send_password_change_info($user) { global $CFG; $site = get_site(); - $supportuser = generate_email_supportuser(); + $supportuser = core_user::get_support_user(); $systemcontext = context_system::instance(); $data = new stdClass(); diff --git a/user/edit.php b/user/edit.php index 821ba4df5c1..2a060d16ed4 100644 --- a/user/edit.php +++ b/user/edit.php @@ -250,7 +250,7 @@ if ($usernew = $userform->get_data()) { $emailupdatetitle = get_string('emailupdatetitle', 'auth', $a); //email confirmation directly rather than using messaging so they will definitely get an email - $supportuser = generate_email_supportuser(); + $supportuser = core_user::get_support_user(); if (!$mail_results = email_to_user($temp_user, $supportuser, $emailupdatetitle, $emailupdatemessage)) { die("could not send email!"); }