moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-05 00:46:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

MDL-76559 core: validate_email should not accept empty values

Browse source
This commit is contained in:
Andrew Nicols 2022-12-03 20:56:16 +08:00
parent 1d863c338a
commit f375cac31a
2 changed files with 20 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

14
lib/tests/weblib_test.php
View file

@ -595,6 +595,20 @@ EXPECTED;
'result' => false 'result' => false
], ],
// Empty e-mail addresess are not valid.
[
'email' => '',
'result' => false,
],
[
'email' => null,
'result' => false,
],
[
'email' => false,
'result' => false,
],
// Extra email addresses from Wikipedia page on Email Addresses. // Extra email addresses from Wikipedia page on Email Addresses.
// Valid. // Valid.
[ [

7
lib/weblib.php
View file

@ -1108,7 +1108,12 @@ function page_get_doc_link_path(moodle_page $page) {
*/ */
function validate_email($address) { function validate_email($address) {
global $CFG; global $CFG;
require_once($CFG->libdir.'/phpmailer/moodle_phpmailer.php');
if ($address === null || $address === '') {
return false;
}
require_once("{$CFG->libdir}/phpmailer/moodle_phpmailer.php");
return moodle_phpmailer::validateAddress($address) && !preg_match('/[<>]/', $address); return moodle_phpmailer::validateAddress($address) && !preg_match('/[<>]/', $address);
} }