Merge branch 'F6706-cc-bcc-in-mail-log' into 'master'

F6706 - Add cc and bcc to MailLog - Refs #6706, closes #6706

See merge request !95

extension/qfq/qfq/database/DatabaseUpdateData.php

@@ -128,6 +128,10 @@ $UPDATE_ARRAY = array(
         "ALTER TABLE `Form` ADD `primaryKey` VARCHAR(255) NOT NULL DEFAULT '' AFTER `tableName`",
     ],
 
+    '18.10.2' => [
+        "ALTER TABLE `MailLog` ADD `cc` TEXT NOT NULL AFTER `receiver`, ADD `bcc` TEXT NOT NULL AFTER `cc`;",
+    ],
+
 );
 
 

extension/qfq/qfq/report/SendMail.php

@@ -272,6 +272,8 @@ class SendMail {
 
         // Log
         $log[] = $mailConfig[SENDMAIL_TOKEN_RECEIVER];
+        $log[] = $mailConfig[SENDMAIL_TOKEN_RECEIVER_CC] ?? '';
+        $log[] = $mailConfig[SENDMAIL_TOKEN_RECEIVER_BCC] ?? '';
         $log[] = $mailConfig[SENDMAIL_TOKEN_SENDER];
         $log[] = $mailConfig[SENDMAIL_TOKEN_SUBJECT];
         $log[] = $mailConfig[SENDMAIL_TOKEN_BODY];
@@ -284,7 +286,7 @@ class SendMail {
         $log[] = empty($mailConfig[SENDMAIL_TOKEN_SRC]) ? 0 : $mailConfig[SENDMAIL_TOKEN_SRC];
 
         $db = new Database();
-        $db->sql('INSERT INTO MailLog (`receiver`, `sender`, `subject`, `body`, `header`, `attach`, `grId`, `xId`, `xId2`, `xId3`, `src`, `modified`, `created`) VALUES ( ?, ? , ? , ? ,?, ?, ? ,?, ?, ?, ?, NOW(), NOW() )', ROW_REGULAR, $log);
+        $db->sql('INSERT INTO MailLog (`receiver`, `cc`, `bcc`, `sender`, `subject`, `body`, `header`, `attach`, `grId`, `xId`, `xId2`, `xId3`, `src`, `modified`, `created`) VALUES ( ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, NOW(), NOW() )', ROW_REGULAR, $log);
 
     }