summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorJens-Christian Fischer <jens-christian.fischer@switch.ch>2014-01-24 14:04:37 +0100
committerJens-Christian Fischer <jens-christian.fischer@switch.ch>2014-01-24 14:04:37 +0100
commit506393090bf33ea1aa3a18983748e6a5b4078d4d (patch)
treef84c57dab9af50a235bd6bfa843d5f31d45c3899 /lib
parent9fa788c452403646cc5c2a7c0fe875879e7082fa (diff)
downloadnextcloud-server-506393090bf33ea1aa3a18983748e6a5b4078d4d.tar.gz
nextcloud-server-506393090bf33ea1aa3a18983748e6a5b4078d4d.zip
Add 'mail_from_address' configuration
In environments where there are rules for the email addresses, the "from address" that owncloud uses has to be configurable. This patch adds a new configuration variable 'mail_from_address'. If it is configured, owncloud will use this as the sender of *all* emails. (OwnCloud uses 'sharing-noreply' and 'password-noreply' by default). By using the 'mail_from_address' configuration, only this email address will be used.
Diffstat (limited to 'lib')
-rw-r--r--lib/public/util.php1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/public/util.php b/lib/public/util.php
index 8e85f9afc3f..8514a168b46 100644
--- a/lib/public/util.php
+++ b/lib/public/util.php
@@ -256,6 +256,7 @@ class Util {
* it would return 'lostpassword-noreply@example.com'
*/
public static function getDefaultEmailAddress($user_part) {
+ $user_part = \OC_Config::getValue('mail_from_address', $user_part);
$host_name = self::getServerHostName();
$host_name = \OC_Config::getValue('mail_domain', $host_name);
$defaultEmailAddress = $user_part.'@'.$host_name;