mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

validate the generated email address and fall back to localhost.localdomain in case it is not valid 

fixes #1844
This commit is contained in:
Thomas Mueller 2013-03-01 22:24:19 +01:00
parent 5036e316a6
commit 6c304fa5c0
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/public/util.php
View File

@ -217,11 +217,14 @@ class Util {
*/
public static function getDefaultEmailAddress($user_part) {
$host_name = self::getServerHostName();
// handle localhost installations
if ($host_name === 'localhost') {
$host_name = "example.com";
$defaultEmailAddress = $user_part.'@'.$host_name;
if (\PHPMailer::ValidateAddress($defaultEmailAddress)) {
return $defaultEmailAddress;
}
return $user_part.'@'.$host_name;
// incase we cannot build a valid email address from the hostname let's fallback to 'localhost.localdomain'
return $user_part.'@localhost.localdomain';
}
/**