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

Merge branch 'MDL-69600-divertemails' of https://github.com/brendanheywood/moodle

Browse source
This commit is contained in:
Jun Pataleta 2020-09-29 20:28:05 +08:00
commit 83cf43b045
4 changed files with 41 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/moodlelib.php
View file

@ -5984,7 +5984,7 @@ function email_should_be_diverted($email) {
return true;
}
$patterns = array_map('trim', explode(',', $CFG->divertallemailsexcept));
$patterns = array_map('trim', preg_split("/[\s,]+/", $CFG->divertallemailsexcept));
foreach ($patterns as $pattern) {
if (preg_match("/$pattern/", $email)) {
return false;

20
lib/tests/moodlelib_test.php
View file

@ -3297,6 +3297,26 @@ class core_moodlelib_testcase extends advanced_testcase {
),
false,
),
'divertsexceptionsnewline' => array(
'divertallemailsto' => 'somewhere@elsewhere.com',
'divertallemailsexcept' => "@dev.com\nfred(\+.*)?@example.com",
array(
'dev1@dev.com',
'fred@example.com',
'fred+verp@example.com',
),
false,
),
'alsodivertsnewline' => array(
'divertallemailsto' => 'somewhere@elsewhere.com',
'divertallemailsexcept' => "@dev.com\nfred(\+.*)?@example.com",
array(
'foo@example.com',
'test@real.com',
'fred.jones@example.com',
),
true,
),
);
}