MDL-18155 no warning if allowed email domains set; merged from MOODLE_19_STABLE

diff --git a/admin/report/security/lib.php b/admin/report/security/lib.php
index a819d0b785276d1cd390e54149304a1cdc85a670..2909fe4319c025a30b7e9bec46705303e14e8d62 100644 (file)
--- a/admin/report/security/lib.php
+++ b/admin/report/security/lib.php
@@ -398,8 +398,13 @@ function report_security_check_emailchangeconfirmation($detailed=false) {
     $result->link    = "<a href=\"$CFG->wwwroot/$CFG->admin/settings.php?section=sitepolicies\">".get_string('sitepolicies', 'admin').'</a>';
 
     if (empty($CFG->emailchangeconfirmation)) {
-        $result->status = REPORT_SECURITY_WARNING;
-        $result->info   = get_string('check_emailchangeconfirmation_error', 'report_security');
+        if (empty($CFG->allowemailaddresses)) {
+            $result->status = REPORT_SECURITY_WARNING;
+            $result->info   = get_string('check_emailchangeconfirmation_error', 'report_security');
+        } else {
+            $result->status = REPORT_SECURITY_INFO;
+            $result->info   = get_string('check_emailchangeconfirmation_info', 'report_security');
+        }
     } else {
         $result->status = REPORT_SECURITY_OK;
         $result->info   = get_string('check_emailchangeconfirmation_ok', 'report_security');

diff --git a/lang/en_utf8/report_security.php b/lang/en_utf8/report_security.php
index 734512189945aaba99a9d3047c1f820c4a8e3365..378def49dc38d0bfe72c5a8f01464707d5b7b4ba 100644 (file)
--- a/lang/en_utf8/report_security.php
+++ b/lang/en_utf8/report_security.php
@@ -62,6 +62,7 @@ $string['check_displayerrors_ok'] = 'Displaying of PHP errors disabled.';
 
 $string['check_emailchangeconfirmation_details'] = '<p>It is recommended that an email confirmation step is required when users change their email address in their profile. If disabled, spammers may try to exploit the server to send spam.</p>';
 $string['check_emailchangeconfirmation_error'] = 'Users may enter any email address.';
+$string['check_emailchangeconfirmation_info'] = 'Users may enter email addresses from allowed domains only.';
 $string['check_emailchangeconfirmation_name'] = 'Email change confirmation';
 $string['check_emailchangeconfirmation_ok'] = 'Confirmation of change of email address in user profile.';