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

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

11
admin/settings/server.php
View file

@ -444,6 +444,17 @@ if ($hassiteconfig) {
new lang_string('configallowedemaildomains', 'admin'), new lang_string('configallowedemaildomains', 'admin'),
'')); ''));
$temp->add(new admin_setting_heading('divertallemailsheading', new lang_string('divertallemails', 'admin'),
new lang_string('divertallemailsdetail', 'admin')));
$temp->add(new admin_setting_configtext('divertallemailsto',
new lang_string('divertallemailsto', 'admin'),
new lang_string('divertallemailsto_desc', 'admin'),
''));
$temp->add(new admin_setting_configtextarea('divertallemailsexcept',
new lang_string('divertallemailsexcept', 'admin'),
new lang_string('divertallemailsexcept_desc', 'admin'),
'', PARAM_RAW, '50', '4'));
$url = new moodle_url('/admin/testoutgoingmailconf.php'); $url = new moodle_url('/admin/testoutgoingmailconf.php');
$link = html_writer::link($url, get_string('testoutgoingmailconf', 'admin')); $link = html_writer::link($url, get_string('testoutgoingmailconf', 'admin'));
$temp->add(new admin_setting_heading('testoutgoinmailc', new lang_string('testoutgoingmailconf', 'admin'), $temp->add(new admin_setting_heading('testoutgoinmailc', new lang_string('testoutgoingmailconf', 'admin'),

9
lang/en/admin.php
View file

@ -499,6 +499,15 @@ $string['disabled'] = 'Disabled';
$string['disableuserimages'] = 'Disable user profile images'; $string['disableuserimages'] = 'Disable user profile images';
$string['displayerrorswarning'] = 'Enabling the PHP setting <em>display_errors</em> is not recommended on production sites because some error messages may reveal sensitive information about your server.'; $string['displayerrorswarning'] = 'Enabling the PHP setting <em>display_errors</em> is not recommended on production sites because some error messages may reveal sensitive information about your server.';
$string['displayloginfailures'] = 'Display login failures'; $string['displayloginfailures'] = 'Display login failures';
$string['divertallemails'] = 'Email diverting';
$string['divertallemailsdetail'] = 'Used as a safeguard in development environments when testing emails and should not be used in production.';
$string['divertallemailsexcept'] = 'Email diversion exceptions';
$string['divertallemailsexcept_desc'] = 'A list of email exception rules separated by either commas or new lines. Each rule is interpreted as a regular expression, eg<pre>simone@acme.com
.*@acme.com
fred(\\+.*)?@acme.com
</pre>';
$string['divertallemailsto'] = 'Divert all emails';
$string['divertallemailsto_desc'] = 'If set then all emails will be diverted to this single email address instead.';
$string['dndallowtextandlinks'] = 'Drag and drop upload of text/links'; $string['dndallowtextandlinks'] = 'Drag and drop upload of text/links';
$string['doclang'] = 'Language for docs'; $string['doclang'] = 'Language for docs';
$string['docroot'] = 'Moodle Docs document root'; $string['docroot'] = 'Moodle Docs document root';

2
lib/moodlelib.php
View file

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

20
lib/tests/moodlelib_test.php
View file

@ -3297,6 +3297,26 @@ class core_moodlelib_testcase extends advanced_testcase {
), ),
false, 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,
),
); );
} }