Commit 760d53db authored by Carsten  Rose's avatar Carsten Rose
Browse files

Merge remote-tracking branch 'origin/master'

parents 7d4ba19f c6f68e66
Pipeline #1026 passed with stage
in 1 minute and 38 seconds
......@@ -2258,6 +2258,7 @@ abstract class AbstractBuildForm {
$orientation = ($formElement[FE_MAX_LENGTH] > 1) ? ALIGN_HORIZONTAL : ALIGN_VERTICAL;
$radioClass = ($orientation === ALIGN_HORIZONTAL) ? 'radio-inline' : 'radio';
$radioOuterTag = ($orientation === ALIGN_HORIZONTAL) ? 'label' : 'div';
$br = '';
$attribute = $attributeBase;
......@@ -2300,7 +2301,7 @@ abstract class AbstractBuildForm {
$wrapAttribute = Support::doAttribute('title', $formElement[FE_TOOLTIP]);
$wrapAttribute .= Support::doAttribute('class', $radioClass);
$htmlElement = Support::wrapTag("<div $wrapAttribute>", $htmlElement) . $br;
$htmlElement = Support::wrapTag("<$radioOuterTag $wrapAttribute>", $htmlElement) . $br;
$html .= $htmlElement;
......
......@@ -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`;",
],
);
......
......@@ -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);
}
......
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