From 2728cdaf2382ed64942f6a0761279f2fde55375f Mon Sep 17 00:00:00 2001 From: redmatrix Date: Thu, 29 Sep 2016 17:54:11 -0700 Subject: change notify param --- Zotlabs/Lib/Enotify.php | 5 ++++- include/network.php | 4 +++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Zotlabs/Lib/Enotify.php b/Zotlabs/Lib/Enotify.php index 421d310d9..0a15e9fe5 100644 --- a/Zotlabs/Lib/Enotify.php +++ b/Zotlabs/Lib/Enotify.php @@ -70,7 +70,10 @@ class Enotify { $hostname = substr($hostname,0,strpos($hostname,':')); // Do not translate 'noreply' as it must be a legal 7-bit email address - $sender_email = 'noreply' . '@' . $hostname; + + $sender_email = get_config('system','reply_address'); + if(! $sender_email) + $sender_email = 'noreply' . '@' . $hostname; $additional_mail_header = ""; diff --git a/include/network.php b/include/network.php index c23005935..d8e662083 100644 --- a/include/network.php +++ b/include/network.php @@ -1939,7 +1939,9 @@ function format_and_send_email($sender,$xchan,$item) { $hostname = App::get_hostname(); if(strpos($hostname,':')) $hostname = substr($hostname,0,strpos($hostname,':')); - $sender_email = 'noreply' . '@' . $hostname; + $sender_email = get_config('system','reply_address'); + if(! $sender_email) + $sender_email = 'noreply' . '@' . $hostname; // use the EmailNotification library to send the message -- cgit v1.2.3