Commit 3dfd6c0e authored by Carsten  Rose's avatar Carsten Rose
Browse files

FormAction.php, Report.php, Sendmail.php, Index.rst: By default all QFQ send...

FormAction.php, Report.php, Sendmail.php, Index.rst:  By default all QFQ send mails contains now 'auto-submit'.
parent 65faca6f
......@@ -1319,7 +1319,8 @@ Type: sendmail
* ‘’‘sendMailFrom‘’‘ - Sender of the email. Optional: 'realname <john@doe.com>'. **Mandatory**.
* ‘’‘sendMailSubject‘’‘ - Subject of the email.
* ‘’‘sendMailReplyTo‘’‘ - Reply this email address. Optional: 'realname <john@doe.com>'.
* ‘’‘sendMailFlagAutoSubmit‘’‘ - **on|off** - If 'on', the mail contains the header 'Auto-Submitted: auto-send' - suppress OoO replies.
* ‘’‘sendMailFlagAutoSubmit‘’‘ - **on|off** - If 'on' (default), the mail contains the header
'Auto-Submitted: auto-send' - this suppress a) OoO replies, b) forwarding of emails.
* ‘’‘sendMailGrId‘’‘ - Will be copied to the mailLog record. Helps to setup specific logfile queries.
* ‘’‘sendMailXId‘’‘ - Will be copied to the mailLog record. Helps to setup specific logfile queries.
......@@ -2114,7 +2115,7 @@ Send text emails. Every mail will be logged in the table `mailLog`.
+------------------------------------------------------------+------------------------------------------------------------------------------------------+------------+
|REPLY-TO:email |Email address to reply to (if different from sender) | |
+------------------------------------------------------------+------------------------------------------------------------------------------------------+------------+
|flagAutoSubmit 'on' / 'off' |If 'on', the mail contains the header 'Auto-Submitted: auto-send' - suppress OoO replies | |
|flagAutoSubmit 'on' / 'off' |If 'on' (default), add mail header 'Auto-Submitted: auto-send' - suppress OoO replies | |
+------------------------------------------------------------+------------------------------------------------------------------------------------------+------------+
|grId |Will be copied to the mailLog record. Helps to setup specific logfile queries | |
+------------------------------------------------------------+------------------------------------------------------------------------------------------+------------+
......
......@@ -189,7 +189,7 @@ class FormAction {
$mail[SENDMAIL_IDX_SUBJECT] = $this->evaluate->parse($feSpecAction[FE_SENDMAIL_SUBJECT]);
$mail[SENDMAIL_IDX_BODY] = $this->evaluate->parse($feSpecAction[FE_VALUE]);
$mail[SENDMAIL_IDX_REPLY_TO] = $this->evaluate->parse($feSpecAction[FE_SENDMAIL_REPLY_TO]);
$mail[SENDMAIL_IDX_FLAG_AUTO_SUBMIT] = $this->evaluate->parse($feSpecAction[FE_SENDMAIL_FLAG_AUTO_SUBMIT]) === 'on' ? 'on' : 'off';
$mail[SENDMAIL_IDX_FLAG_AUTO_SUBMIT] = $this->evaluate->parse($feSpecAction[FE_SENDMAIL_FLAG_AUTO_SUBMIT]) === 'off' ? 'off' : 'on';
$mail[SENDMAIL_IDX_GR_ID] = $this->evaluate->parse($feSpecAction[FE_SENDMAIL_GR_ID]);
$mail[SENDMAIL_IDX_X_ID] = $this->evaluate->parse($feSpecAction[FE_SENDMAIL_X_ID]);
$mail[SENDMAIL_IDX_RECEIVER_CC] = $this->evaluate->parse($feSpecAction[FE_SENDMAIL_CC]);
......
......@@ -677,7 +677,7 @@ class Report {
}
if (!isset($mailarr[SENDMAIL_IDX_FLAG_AUTO_SUBMIT])) {
$mailarr[SENDMAIL_IDX_FLAG_AUTO_SUBMIT] = 'off';
$mailarr[SENDMAIL_IDX_FLAG_AUTO_SUBMIT] = 'on';
}
if (!isset($mailarr[SENDMAIL_IDX_GR_ID])) {
......
......@@ -22,7 +22,7 @@ class Sendmail {
* SENDMAIL_IDX_SUBJECT string
* SENDMAIL_IDX_BODY string
* SENDMAIL_IDX_REPLY_TO optional: email address
* SENDMAIL_IDX_FLAG_AUTO_SUBMIT optional: 'on'|'off'
* SENDMAIL_IDX_FLAG_AUTO_SUBMIT optional: 'on'|'off', default: 'on'
* SENDMAIL_IDX_GR_ID optional: integer
* SENDMAIL_IDX_X_ID optional: integer
*
......@@ -61,7 +61,8 @@ class Sendmail {
$header .= "Reply-To: " . $mailarr[SENDMAIL_IDX_REPLY_TO] . "\r\n";
}
if (isset($mailarr[SENDMAIL_IDX_FLAG_AUTO_SUBMIT]) && $mailarr[SENDMAIL_IDX_FLAG_AUTO_SUBMIT] === 'on') {
// By default 'on'
if (!isset($mailarr[SENDMAIL_IDX_FLAG_AUTO_SUBMIT]) || $mailarr[SENDMAIL_IDX_FLAG_AUTO_SUBMIT] === 'on') {
$header .= "Auto-Submitted: auto-send\r\n";
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment