harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

change notify param

Browse Source
This commit is contained in:
redmatrix 2016-09-29 17:54:11 -07:00
parent 4117ada2fd
commit 2728cdaf23
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Zotlabs/Lib/Enotify.php
View File

@ -70,7 +70,10 @@ class Enotify {
$hostname = substr($hostname,0,strpos($hostname,':')); $hostname = substr($hostname,0,strpos($hostname,':'));
// Do not translate 'noreply' as it must be a legal 7-bit email address // 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 = ""; $additional_mail_header = "";

4
include/network.php
View File

@ -1939,7 +1939,9 @@ function format_and_send_email($sender,$xchan,$item) {
$hostname = App::get_hostname(); $hostname = App::get_hostname();
if(strpos($hostname,':')) if(strpos($hostname,':'))
$hostname = substr($hostname,0,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 // use the EmailNotification library to send the message