MDL-9233 denied and allowed email address domains are not matched correctly

diff --git a/lib/moodlelib.php b/lib/moodlelib.php
index b8311cf81ff9a0de5c0a65f34c2b886580ab32f4..c569b6778171186caeec950eb02669cc1139bdaf 100644 (file)
--- a/lib/moodlelib.php
+++ b/lib/moodlelib.php
@@ -3683,7 +3683,7 @@ function email_is_not_allowed($email) {
             if (!$allowedpattern) {
                 continue;
             }
-            if (strpos(strrev($email), strrev($allowedpattern)) === 0) { // Match!   (bug 5250)
+            if (strpos(strrev($email), strrev('@'.$allowedpattern)) === 0) { // Match!   (bug 5250)
                 return false;
             }
         }
@@ -3696,7 +3696,7 @@ function email_is_not_allowed($email) {
             if (!$deniedpattern) {
                 continue;
             }
-            if (strpos(strrev($email), strrev($deniedpattern)) === 0) { // Match!   (bug 5250)
+            if (strpos(strrev($email), strrev('@'.$deniedpattern)) === 0) { // Match!   (bug 5250)
                 return get_string('emailnotallowed', '', $CFG->denyemailaddresses);
             }
         }