diff --git a/Classes/Domain/Model/Mail.php b/Classes/Domain/Model/Mail.php
index 0d0f46def35f76932e057134841b15226e62cb69..f8dde17b800c3d784cf3fc99103679cb3fb3c375 100644
--- a/Classes/Domain/Model/Mail.php
+++ b/Classes/Domain/Model/Mail.php
@@ -39,6 +39,11 @@ class Mail extends AbstractEntity {
const PRIORITY_HIGH = 150;
const PRIORITY_HIGHEST = 200;
+ /**
+ * @var int
+ */
+ protected $siteRootId = 0;
+
/**
* @var string
*/
@@ -291,4 +296,18 @@ class Mail extends AbstractEntity {
public function setSendingTime($sendingTime) {
$this->sendingTime = $sendingTime;
}
+
+ /**
+ * @return mixed
+ */
+ public function getSiteRootId() {
+ return $this->siteRootId;
+ }
+
+ /**
+ * @param mixed $siteRootId
+ */
+ public function setSiteRootId($siteRootId) {
+ $this->siteRootId = (int) $siteRootId;
+ }
}
diff --git a/Classes/Domain/Model/Template.php b/Classes/Domain/Model/Template.php
index 6df62cfb0f0aa116a4559176f9e35c47d065e543..fc8534e116c36388bebb1e7d9a6454e45f6ea15a 100644
--- a/Classes/Domain/Model/Template.php
+++ b/Classes/Domain/Model/Template.php
@@ -32,6 +32,11 @@ use TYPO3\CMS\Extbase\DomainObject\AbstractEntity;
* Template domain model
*/
class Template extends AbstractEntity {
+ /**
+ * @var int
+ */
+ protected $siteRootId = 0;
+
/**
* @var string
*/
@@ -221,4 +226,18 @@ class Template extends AbstractEntity {
public function setReplyTo($replyTo) {
$this->replyTo = trim($replyTo);
}
+
+ /**
+ * @return mixed
+ */
+ public function getSiteRootId() {
+ return $this->siteRootId;
+ }
+
+ /**
+ * @param mixed $siteRootId
+ */
+ public function setSiteRootId($siteRootId) {
+ $this->siteRootId = (int) $siteRootId;
+ }
}
diff --git a/Configuration/TCA/tx_sgmail_domain_model_mail.php b/Configuration/TCA/tx_sgmail_domain_model_mail.php
index 4289d3eb8bd65f80c654ff8a5decf698988225f6..5ec2f25f362218ca2fc4a7f9972f278975a54b00 100644
--- a/Configuration/TCA/tx_sgmail_domain_model_mail.php
+++ b/Configuration/TCA/tx_sgmail_domain_model_mail.php
@@ -32,7 +32,7 @@ return [
'tstamp' => 'tstamp',
'crdate' => 'crdate',
'cruser_id' => 'cruser_id',
- 'searchFields' => 'mail_subject, mail_body, to_address, from_address, from_name, bcc_addresses, cc_addresses, extension_key, template_name',
+ 'searchFields' => 'mail_subject, mail_body, to_address, from_address, from_name, bcc_addresses, cc_addresses, extension_key, template_name, site_root_id',
'dividers2tabs' => TRUE,
'delete' => 'deleted',
'enablecolumns' => [
@@ -42,11 +42,11 @@ return [
'iconfile' => 'EXT:sg_mail/Resources/Public/Icons/ModuleIconTCA.svg'
],
'interface' => [
- 'showRecordFieldList' => 'hidden, mail_subject, mail_body, to_address, from_address, sent, priority, from_name, bcc_addresses, cc_addresses, extension_key, template_name',
+ 'showRecordFieldList' => 'hidden, mail_subject, mail_body, to_address, from_address, sent, priority, from_name, bcc_addresses, cc_addresses, extension_key, template_name, site_root_id',
],
'types' => [
'1' => [
- 'showitem' => 'hidden;;1, sent, priority, to_address, from_address, mail_subject, mail_body, from_name, bcc_addresses, cc_addresses, extension_key, template_name'
+ 'showitem' => 'hidden;;1, sent, priority, to_address, from_address, mail_subject, mail_body, from_name, bcc_addresses, cc_addresses, extension_key, template_name, site_root_id'
],
],
'columns' => [
@@ -157,6 +157,14 @@ return [
'config' => [
'type' => 'input'
],
+ ],
+ 'site_root_id' => [
+ 'exclude' => TRUE,
+ 'label' => 'LLL:EXT:sg_mail/Resources/Private/Language/locallang_db.xlf:tx_sgmail_domain_model_mail.site_root_id',
+ 'config' => [
+ 'type' => 'input',
+ 'eval' => 'int'
+ ],
]
]
];
diff --git a/Configuration/TCA/tx_sgmail_domain_model_template.php b/Configuration/TCA/tx_sgmail_domain_model_template.php
index 0980b396627013466fd67f035c4428c2cc2d68da..49a0bb917216fdf5e7bd571c34bb2db47352ed60 100644
--- a/Configuration/TCA/tx_sgmail_domain_model_template.php
+++ b/Configuration/TCA/tx_sgmail_domain_model_template.php
@@ -33,7 +33,7 @@ return [
'tstamp' => 'tstamp',
'crdate' => 'crdate',
'cruser_id' => 'cruser_id',
- 'searchFields' => 'extension_key, template_name, language, subject, fromName, fromMail, replyTo',
+ 'searchFields' => 'extension_key, template_name, language, subject, fromName, fromMail, replyTo, site_root_id',
'dividers2tabs' => TRUE,
'delete' => 'deleted',
'enablecolumns' => [
@@ -43,11 +43,11 @@ return [
'iconfile' => 'EXT:sg_mail/Resources/Public/Icons/ModuleIconTCA.svg'
],
'interface' => [
- 'showRecordFieldList' => 'extension_key, template_name, language, content, subject, fromName, fromMail, cc, bcc, replyTo'
+ 'showRecordFieldList' => 'extension_key, template_name, language, content, subject, fromName, fromMail, cc, bcc, replyTo, site_root_id'
],
'types' => [
'1' => [
- 'showitem' => 'hidden;;1, extension_key, template_name, language, content, subject, fromName, fromMail, cc, bcc, replyTo'
+ 'showitem' => 'hidden;;1, extension_key, template_name, language, content, subject, fromName, fromMail, cc, bcc, replyTo, site_root_id'
],
],
'columns' => [
@@ -133,6 +133,14 @@ return [
'config' => [
'type' => 'input'
],
+ ],
+ 'site_root_id' => [
+ 'exclude' => TRUE,
+ 'label' => 'LLL:EXT:sg_mail/Resources/Private/Language/locallang_db.xlf:tx_sgmail_domain_model_template.site_root_id',
+ 'config' => [
+ 'type' => 'input',
+ 'eval' => 'int'
+ ],
]
]
];
diff --git a/Resources/Private/Language/de.locallang_db.xlf b/Resources/Private/Language/de.locallang_db.xlf
index 1626e77940f2823312bc4631d8f465bbfbfd5292..665c0138b72c681cc6f2f788fcc1be5462e8c494 100644
--- a/Resources/Private/Language/de.locallang_db.xlf
+++ b/Resources/Private/Language/de.locallang_db.xlf
@@ -57,6 +57,10 @@
<source>Sent</source>
<target>Gesendet</target>
</trans-unit>
+ <trans-unit id="tx_sgmail_domain_model_mail.site_root_id" approved="yes">
+ <source>Site root id</source>
+ <target>Site root id</target>
+ </trans-unit>
<trans-unit id="tx_sgmail_domain_model_mail.template_name" approved="yes">
<source>Template Name</source>
<target>Template Name</target>
diff --git a/Resources/Private/Language/locallang_db.xlf b/Resources/Private/Language/locallang_db.xlf
index 08e95fb6c9f6b7c41f697524b55c23234dd0eece..59049aae939e3ea1cfb1beac711043b186a07478 100644
--- a/Resources/Private/Language/locallang_db.xlf
+++ b/Resources/Private/Language/locallang_db.xlf
@@ -9,90 +9,93 @@
<authorEmail>torsten@sgalinski.de</authorEmail>
</header>
<body>
- <trans-unit id="tx_sgmail_domain_model_mail">
- <source>Mail Queue Entry</source>
- </trans-unit>
- <trans-unit id="tx_sgmail_domain_model_mail.bcc_addresses">
- <source>BCC Addresses</source>
- </trans-unit>
- <trans-unit id="tx_sgmail_domain_model_mail.cc_addresses">
- <source>CC Addresses</source>
- </trans-unit>
- <trans-unit id="tx_sgmail_domain_model_mail.extension_key">
- <source>Extension Key</source>
- </trans-unit>
- <trans-unit id="tx_sgmail_domain_model_mail.from_address">
- <source>Sender email address</source>
- </trans-unit>
- <trans-unit id="tx_sgmail_domain_model_mail.from_name">
- <source>Sender Name</source>
- </trans-unit>
- <trans-unit id="tx_sgmail_domain_model_mail.mail_body">
- <source>Mail text</source>
- </trans-unit>
- <trans-unit id="tx_sgmail_domain_model_mail.mail_subject">
- <source>Mail subject</source>
- </trans-unit>
- <trans-unit id="tx_sgmail_domain_model_mail.priority">
- <source>Priority (Lowest = 0 | Low = 50 | Medium = 100 | High = 150 | Highest = 200)</source>
- </trans-unit>
- <trans-unit id="tx_sgmail_domain_model_mail.reply_to">
- <source>Reply To</source>
- </trans-unit>
- <trans-unit id="tx_sgmail_domain_model_mail.sending_time">
- <source>Sent at</source>
- </trans-unit>
- <trans-unit id="tx_sgmail_domain_model_mail.sent">
- <source>Sent</source>
- </trans-unit>
- <trans-unit id="tx_sgmail_domain_model_mail.template_name">
- <source>Template Name</source>
- </trans-unit>
- <trans-unit id="tx_sgmail_domain_model_mail.to_address">
- <source>Receiver email address</source>
- </trans-unit>
- <trans-unit id="tx_sgmail_domain_model_template">
- <source>Template</source>
- </trans-unit>
- <trans-unit id="tx_sgmail_domain_model_template.bcc">
- <source>BCC (Blind Carbon Copy Receiver)</source>
- </trans-unit>
- <trans-unit id="tx_sgmail_domain_model_template.bcc_addresses">
- <source>BCC-Adressen</source>
- </trans-unit>
- <trans-unit id="tx_sgmail_domain_model_template.cc">
- <source>CC (Carbon Copy Receiver)</source>
- </trans-unit>
- <trans-unit id="tx_sgmail_domain_model_template.cc_addresses">
- <source>CC-Adressen</source>
- </trans-unit>
- <trans-unit id="tx_sgmail_domain_model_template.content">
- <source>Content</source>
- </trans-unit>
- <trans-unit id="tx_sgmail_domain_model_template.extension_key">
- <source>Extension Key</source>
- </trans-unit>
- <trans-unit id="tx_sgmail_domain_model_template.fromMail">
- <source>Sender-E-Mail-Address</source>
- </trans-unit>
- <trans-unit id="tx_sgmail_domain_model_template.fromName">
- <source>Sender Name</source>
- </trans-unit>
- <trans-unit id="tx_sgmail_domain_model_template.from_name">
- <source>Sender Name</source>
- </trans-unit>
- <trans-unit id="tx_sgmail_domain_model_template.language">
- <source>Language</source>
- </trans-unit>
- <trans-unit id="tx_sgmail_domain_model_template.replyTo">
- <source>Reply To</source>
- </trans-unit>
- <trans-unit id="tx_sgmail_domain_model_template.subject">
- <source>Subject</source>
- </trans-unit>
- <trans-unit id="tx_sgmail_domain_model_template.template_name">
- <source>Template Name</source>
- </trans-unit>
+ <trans-unit id="tx_sgmail_domain_model_mail">
+ <source>Mail Queue Entry</source>
+ </trans-unit>
+ <trans-unit id="tx_sgmail_domain_model_mail.bcc_addresses">
+ <source>BCC Addresses</source>
+ </trans-unit>
+ <trans-unit id="tx_sgmail_domain_model_mail.cc_addresses">
+ <source>CC Addresses</source>
+ </trans-unit>
+ <trans-unit id="tx_sgmail_domain_model_mail.extension_key">
+ <source>Extension Key</source>
+ </trans-unit>
+ <trans-unit id="tx_sgmail_domain_model_mail.from_address">
+ <source>Sender email address</source>
+ </trans-unit>
+ <trans-unit id="tx_sgmail_domain_model_mail.from_name">
+ <source>Sender Name</source>
+ </trans-unit>
+ <trans-unit id="tx_sgmail_domain_model_mail.mail_body">
+ <source>Mail text</source>
+ </trans-unit>
+ <trans-unit id="tx_sgmail_domain_model_mail.mail_subject">
+ <source>Mail subject</source>
+ </trans-unit>
+ <trans-unit id="tx_sgmail_domain_model_mail.priority">
+ <source>Priority (Lowest = 0 | Low = 50 | Medium = 100 | High = 150 | Highest = 200)</source>
+ </trans-unit>
+ <trans-unit id="tx_sgmail_domain_model_mail.reply_to">
+ <source>Reply To</source>
+ </trans-unit>
+ <trans-unit id="tx_sgmail_domain_model_mail.sending_time">
+ <source>Sent at</source>
+ </trans-unit>
+ <trans-unit id="tx_sgmail_domain_model_mail.sent">
+ <source>Sent</source>
+ </trans-unit>
+ <trans-unit id="tx_sgmail_domain_model_mail.site_root_id">
+ <source>Site root id</source>
+ </trans-unit>
+ <trans-unit id="tx_sgmail_domain_model_mail.template_name">
+ <source>Template Name</source>
+ </trans-unit>
+ <trans-unit id="tx_sgmail_domain_model_mail.to_address">
+ <source>Receiver email address</source>
+ </trans-unit>
+ <trans-unit id="tx_sgmail_domain_model_template">
+ <source>Template</source>
+ </trans-unit>
+ <trans-unit id="tx_sgmail_domain_model_template.bcc">
+ <source>BCC (Blind Carbon Copy Receiver)</source>
+ </trans-unit>
+ <trans-unit id="tx_sgmail_domain_model_template.bcc_addresses">
+ <source>BCC-Adressen</source>
+ </trans-unit>
+ <trans-unit id="tx_sgmail_domain_model_template.cc">
+ <source>CC (Carbon Copy Receiver)</source>
+ </trans-unit>
+ <trans-unit id="tx_sgmail_domain_model_template.cc_addresses">
+ <source>CC-Adressen</source>
+ </trans-unit>
+ <trans-unit id="tx_sgmail_domain_model_template.content">
+ <source>Content</source>
+ </trans-unit>
+ <trans-unit id="tx_sgmail_domain_model_template.extension_key">
+ <source>Extension Key</source>
+ </trans-unit>
+ <trans-unit id="tx_sgmail_domain_model_template.fromMail">
+ <source>Sender-E-Mail-Address</source>
+ </trans-unit>
+ <trans-unit id="tx_sgmail_domain_model_template.fromName">
+ <source>Sender Name</source>
+ </trans-unit>
+ <trans-unit id="tx_sgmail_domain_model_template.from_name">
+ <source>Sender Name</source>
+ </trans-unit>
+ <trans-unit id="tx_sgmail_domain_model_template.language">
+ <source>Language</source>
+ </trans-unit>
+ <trans-unit id="tx_sgmail_domain_model_template.replyTo">
+ <source>Reply To</source>
+ </trans-unit>
+ <trans-unit id="tx_sgmail_domain_model_template.subject">
+ <source>Subject</source>
+ </trans-unit>
+ <trans-unit id="tx_sgmail_domain_model_template.template_name">
+ <source>Template Name</source>
+ </trans-unit>
</body>
</file>
</xliff>
\ No newline at end of file
diff --git a/ext_tables.sql b/ext_tables.sql
index 1a81b1b79b951579db32cfb89ed4123cb7065a1a..bfce76ce0b12cb66f7d105a7b7902ce848c167fe 100644
--- a/ext_tables.sql
+++ b/ext_tables.sql
@@ -15,6 +15,7 @@ CREATE TABLE tx_sgmail_domain_model_mail (
template_name varchar(30) DEFAULT '' NOT NULL,
reply_to varchar(30) DEFAULT '' NOT NULL,
sending_time int(11) unsigned DEFAULT '0' NOT NULL,
+ site_root_id int(11) DEFAULT 0 NOT NULL,
tstamp int(11) unsigned DEFAULT '0' NOT NULL,
crdate int(11) unsigned DEFAULT '0' NOT NULL,
@@ -32,6 +33,7 @@ CREATE TABLE tx_sgmail_domain_model_template (
uid int(11) NOT NULL auto_increment,
pid int(11) DEFAULT '0' NOT NULL,
+ site_root_id int(11) DEFAULT 0 NOT NULL,
subject text NOT NULL,
extension_key varchar(255) DEFAULT '' NOT NULL,
template_name varchar(255) DEFAULT '' NOT NULL,