L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-59737_master' of git://github.com/markn86/moodle

Browse Source
This commit is contained in:
Andrew Nicols
2017-08-14 12:25:33 +08:00
parent cc012017ad f1dd575c6f
commit d9d1e6cb4d
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backup/util/helper/backup_anonymizer_helper.class.php
+5 -3
View File
@@ -56,8 +56,10 @@ class backup_anonymizer_helper {
if (preg_match('/^anon\d*$/', $user->username)) {
$match = preg_match('/^anonfirstname\d*$/', $user->firstname);
$match = $match && preg_match('/^anonlastname\d*$/', $user->lastname);
$match = $match && preg_match('/^anon\d*@doesntexist\.com$/', $user->email);
if ($match) {
// Check .com for backwards compatibility.
$emailmatch = preg_match('/^anon\d*@doesntexist\.com$/', $user->email) ||
preg_match('/^anon\d*@doesntexist\.invalid$/', $user->email);
if ($match && $emailmatch) {
return true;
}
}
@@ -93,7 +95,7 @@ class backup_anonymizer_helper {
public static function process_user_email($value) {
static $counter = 0;
$counter++;
return 'anon' . $counter . '@doesntexist.com'; // Just a counter
return 'anon' . $counter . '@doesntexist.invalid'; // Just a counter.
}
public static function process_user_icq($value) {