mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-13 12:32:08 +02:00
Code Issues Projects Releases Wiki Activity

MDL-66762 user: stricter email validation.

Browse Source
This commit is contained in:
Paul Holden 2019-11-01 13:04:48 +00:00 committed by Adrian Greeve
parent d6c704bf8e
commit eb9f830604
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/tests/weblib_test.php
View File

@ -525,6 +525,18 @@ EXPECTED;
'email' => "moodle@example.com>\r\nRCPT TO:<victim@example.com",
'result' => false
],
[
'email' => 'greater>than@example.com',
'result' => false
],
[
'email' => 'less<than@example.com',
'result' => false
],
[
'email' => '"this<is>validbutwerejectit"@example.com',
'result' => false
],
// Extra email addresses from Wikipedia page on Email Addresses.
// Valid.

2
lib/weblib.php
View File

@ -1110,7 +1110,7 @@ function validate_email($address) {
global $CFG;
require_once($CFG->libdir.'/phpmailer/moodle_phpmailer.php');
return moodle_phpmailer::validateAddress($address);
return moodle_phpmailer::validateAddress($address) && !preg_match('/[<>]/', $address);
}
/**