mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-22 00:42:54 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-76559-master' of https://github.com/andrewnicols/moodle

Browse Source
This commit is contained in:
Jun Pataleta 2022-12-06 23:19:53 +08:00
commit 5bc72f5176
2 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/tests/weblib_test.php
View File

@ -599,6 +599,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.
[

7
lib/weblib.php
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);
}