MDL-76559 core: validate_email should not accept empty values

This commit is contained in:
Andrew Nicols
2022-12-06 20:53:47 +08:00
parent 7f5f04dbc2
commit fb7d1b34ef
2 changed files with 20 additions and 1 deletions
+14
View File
@@ -595,6 +595,20 @@ EXPECTED;
'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.
// Valid.
[
+6 -1
View File
@@ -1108,7 +1108,12 @@ function page_get_doc_link_path(moodle_page $page) {
*/
function validate_email($address) {
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);
}