Add text "ThisIsAutomaticEmailNoReply" in email see BT#13672

- Add text "ThisIsAutomaticEmailNoReply" in emails if setting:
"noreply_email_address" is set.

- Use "noreply_email_address" (if set) instead of user email.
pull/2487/head
jmontoyaa 9 years ago
parent 2279b4e087
commit 63045f0faf
  1. 5
      main/inc/lib/api.lib.php
  2. 3
      main/inc/lib/notification.lib.php

@ -8197,6 +8197,11 @@ function api_mail_html(
}
$mailView = new Template(null, false, false, false, false, false, false);
$noReply = api_get_setting('noreply_email_address');
if (!empty($noReply)) {
$message .= "<br />".get_lang('ThisIsAutomaticEmailNoReply');
}
$mailView->assign('content', $message);
if (isset($additionalParameters['link'])) {

@ -299,7 +299,8 @@ class Notification extends Model
case self::NOTIFY_INVITATION_AT_ONCE:
case self::NOTIFY_GROUP_AT_ONCE:
$extraHeaders = [];
if (isset($senderInfo['email'])) {
$noReply = api_get_setting('noreply_email_address');
if (empty($noReply) && isset($senderInfo['email'])) {
$extraHeaders = array(
'reply_to' => array(
'name' => $senderInfo['complete_name'],

Loading…
Cancel
Save