wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #2568 from itheiss/master

Browse source 
Implement setting custom domainname for getDefaultEmailAddress
This commit is contained in:
Bernhard Posselt 2013-03-26 02:50:11 -07:00
commit d49e8ffb5e
3 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
config/config.sample.php
View file

@ -77,6 +77,9 @@ $CONFIG = array(
/* URL of the appstore to use, server should understand OCS */ /* URL of the appstore to use, server should understand OCS */
"appstoreurl" => "http://api.apps.owncloud.com/v1", "appstoreurl" => "http://api.apps.owncloud.com/v1",
/* Domain name used by ownCloud for the sender mail address, e.g. no-reply@example.com */
"mail_domain" => "example.com",
/* Enable SMTP class debugging */ /* Enable SMTP class debugging */
"mail_smtpdebug" => false, "mail_smtpdebug" => false,

1
lib/public/util.php
View file

@ -217,6 +217,7 @@ class Util {
*/ */
public static function getDefaultEmailAddress($user_part) { public static function getDefaultEmailAddress($user_part) {
$host_name = self::getServerHostName(); $host_name = self::getServerHostName();
$host_name = \OC_Config::getValue('mail_domain', $host_name);
$defaultEmailAddress = $user_part.'@'.$host_name; $defaultEmailAddress = $user_part.'@'.$host_name;
if (\OC_Mail::ValidateAddress($defaultEmailAddress)) { if (\OC_Mail::ValidateAddress($defaultEmailAddress)) {

9
tests/lib/util.php
View file

@ -47,4 +47,11 @@ class Test_Util extends PHPUnit_Framework_TestCase {
$email = \OCP\Util::getDefaultEmailAddress("no-reply"); $email = \OCP\Util::getDefaultEmailAddress("no-reply");
$this->assertEquals('no-reply@localhost.localdomain', $email); $this->assertEquals('no-reply@localhost.localdomain', $email);
} }
}
function testGetDefaultEmailAddressFromConfig() {
OC_Config::setValue('mail_domain', 'example.com');
$email = \OCP\Util::getDefaultEmailAddress("no-reply");
$this->assertEquals('no-reply@example.com', $email);
OC_Config::deleteKey('mail_domain');
}
}