Fix #2499

The mail domain can now be configured in config.php and get´s used in function getDefaultEmailAddress.

e.g. 'mail_domain' => 'example.com'

diff --git a/lib/public/util.php b/lib/public/util.php
index db07cbcfff3911a1e93852cfcaba484c6b455076..6744c2d37bdde2535f20a7646d8a307a2ccd1a17 100644 (file)
--- a/lib/public/util.php
+++ b/lib/public/util.php
@@ -217,6 +217,7 @@ class Util {
         */
        public static function getDefaultEmailAddress($user_part) {
                $host_name = self::getServerHostName();
+               $host_name = \OC_Config::getValue('mail_domain', $host_name);
                $defaultEmailAddress = $user_part.'@'.$host_name;
 
                if (\OC_Mail::ValidateAddress($defaultEmailAddress)) {