Skip to content
Snippets Groups Projects
Commit 57160725 authored by Torsten Oppermann's avatar Torsten Oppermann
Browse files

[TASK] Code review

parent 86fc91ce
No related branches found
No related tags found
1 merge request!2Feature multiclient
Hide whitespace changes
Inline Side-by-side
Classes/Controller/MailController.php
+ 37
− 19
View file @ 57160725
......@@ -41,6 +41,22 @@ use TYPO3\CMS\Extbase\Utility\LocalizationUtility;
* Controller for the mail templating service module
*/
class MailController extends ActionController {
// Fluid variables
const FLUID_VAR_CONTENT_LEFT = 'contentLeft';
const FLUID_VAR_FROM_NAME_LEFT = 'fromNameLeft';
const FLUID_VAR_FROM_MAIL_LEFT = 'fromMailLeft';
const FLUID_VAR_CC_LEFT = 'ccLeft';
const FLUID_VAR_BCC_LEFT = 'bccLeft';
const FLUID_VAR_REPLY_TO_LEFT = 'replyToLeft';
const FLUID_SUBJECT_LEFT = 'subjectLeft';
const FLUID_VAR_CONTENT_RIGHT = 'contentRight';
const FLUID_VAR_FROM_NAME_RIGHT = 'fromNameRight';
const FLUID_VAR_FROM_MAIL_RIGHT = 'fromMailRight';
const FLUID_VAR_CC_RIGHT = 'ccRight';
const FLUID_VAR_BCC_RIGHT = 'bccRight';
const FLUID_VAR_REPLY_TO_RIGHT = 'replyToRight';
const FLUID_SUBJECT_RIGHT = 'subjectRight';
/**
* DocHeaderComponent
*
......@@ -115,32 +131,32 @@ class MailController extends ActionController {
);
if ($selectedTemplates['left'] instanceof Template) {
$this->view->assign('contentLeft', $selectedTemplates['left']->getContent());
$this->view->assign('fromNameLeft', $selectedTemplates['left']->getFromName());
$this->view->assign('fromMailLeft', $selectedTemplates['left']->getFromMail());
$this->view->assign('ccLeft', $selectedTemplates['left']->getCc());
$this->view->assign('bccLeft', $selectedTemplates['left']->getBcc());
$this->view->assign('replyToLeft', $selectedTemplates['left']->getReplyTo());
$this->view->assign(self::FLUID_VAR_CONTENT_LEFT, $selectedTemplates['left']->getContent());
$this->view->assign(self::FLUID_VAR_FROM_NAME_LEFT, $selectedTemplates['left']->getFromName());
$this->view->assign(self::FLUID_VAR_FROM_MAIL_LEFT, $selectedTemplates['left']->getFromMail());
$this->view->assign(self::FLUID_VAR_CC_LEFT, $selectedTemplates['left']->getCc());
$this->view->assign(self::FLUID_VAR_BCC_LEFT, $selectedTemplates['left']->getBcc());
$this->view->assign(self::FLUID_VAR_REPLY_TO_LEFT, $selectedTemplates['left']->getReplyTo());
} else {
$defaultTemplatePath = $registerArray[$selectedExtension][$selectedTemplate]['templatePath'];
$defaultTemplateFile = $defaultTemplatePath . $selectedLanguages['left'] . '.' . 'template.html';
if (file_exists($defaultTemplateFile)) {
$this->view->assign('contentLeft', file_get_contents($defaultTemplateFile));
$this->view->assign(self::FLUID_VAR_CONTENT_LEFT, file_get_contents($defaultTemplateFile));
}
}
if ($selectedTemplates['right'] instanceof Template) {
$this->view->assign('contentRight', $selectedTemplates['right']->getContent());
$this->view->assign('fromNameRight', $selectedTemplates['right']->getFromName());
$this->view->assign('fromMailRight', $selectedTemplates['right']->getFromMail());
$this->view->assign('ccRight', $selectedTemplates['right']->getCc());
$this->view->assign('bccRight', $selectedTemplates['right']->getBcc());
$this->view->assign('replyToRight', $selectedTemplates['right']->getReplyTo());
$this->view->assign(self::FLUID_VAR_CONTENT_RIGHT, $selectedTemplates['right']->getContent());
$this->view->assign(self::FLUID_VAR_FROM_NAME_RIGHT, $selectedTemplates['right']->getFromName());
$this->view->assign(self::FLUID_VAR_FROM_MAIL_RIGHT, $selectedTemplates['right']->getFromMail());
$this->view->assign(self::FLUID_VAR_CC_RIGHT, $selectedTemplates['right']->getCc());
$this->view->assign(self::FLUID_VAR_BCC_RIGHT, $selectedTemplates['right']->getBcc());
$this->view->assign(self::FLUID_VAR_REPLY_TO_RIGHT, $selectedTemplates['right']->getReplyTo());
} else {
$defaultTemplatePath = $registerArray[$selectedExtension][$selectedTemplate]['templatePath'];
$defaultTemplateFile = $defaultTemplatePath . $selectedLanguages['right'] . '.' . 'template.html';
if (file_exists($defaultTemplateFile)) {
$this->view->assign('contentRight', file_get_contents($defaultTemplateFile));
$this->view->assign(self::FLUID_VAR_CONTENT_RIGHT, file_get_contents($defaultTemplateFile));
}
}
......@@ -148,24 +164,26 @@ class MailController extends ActionController {
if (is_array($subject)) {
$this->view->assign(
'subjectLeft', $selectedTemplates['left'] !== NULL ? $selectedTemplates['left']->getSubject() :
self::FLUID_SUBJECT_LEFT, $selectedTemplates['left'] !== NULL ? $selectedTemplates['left']->getSubject() :
$registerArray[$selectedExtension][$selectedTemplate]['subject'][$selectedLanguages['left']]
);
$this->view->assign(
'subjectRight', $selectedTemplates['right'] !== NULL ? $selectedTemplates['right']->getSubject() :
self::FLUID_SUBJECT_RIGHT, $selectedTemplates['right'] !== NULL ? $selectedTemplates['right']->getSubject() :
$registerArray[$selectedExtension][$selectedTemplate]['subject'][$selectedLanguages['right']]
);
} else {
$translatedSubjects = BackendService::getTranslatedTemplateSubject($subject, $selectedExtension, $selectedLanguages);
$translatedSubjects = BackendService::getTranslatedTemplateSubject(
$subject, $selectedExtension, $selectedLanguages
);
$this->view->assign(
'subjectLeft', $selectedTemplates['left'] !== NULL ? $selectedTemplates['left']->getSubject() :
self::FLUID_SUBJECT_LEFT, $selectedTemplates['left'] !== NULL ? $selectedTemplates['left']->getSubject() :
$translatedSubjects['left']
);
$this->view->assign(
'subjectRight', $selectedTemplates['right'] !== NULL ? $selectedTemplates['right']->getSubject() :
self::FLUID_SUBJECT_RIGHT, $selectedTemplates['right'] !== NULL ? $selectedTemplates['right']->getSubject() :
$translatedSubjects['right']
);
}
......
Classes/Updates/MigrateData.php
+ 1
− 1
View file @ 57160725
......@@ -112,7 +112,7 @@ class MigrateData extends AbstractUpdate {
private function retrieveFirstSiteRoot() {
$databaseConnection = $this->getDatabaseConnection();
$where = "is_siteroot = 1 AND uid <> '0'";
$pagesResult = $databaseConnection->exec_SELECTquery('uid', 'pages', $where, '', '', '1')->fetch_all();
$pagesResult = $databaseConnection->exec_SELECTgetSingleRow('uid', 'pages', $where, '', '', '1');
$dbQueries[] = $databaseConnection->debug_lastBuiltQuery;
if (empty($pagesResult)) {
......
Resources/Private/Templates/Mail/Index.html
+ 26
− 26
View file @ 57160725
......@@ -71,12 +71,12 @@
<f:form class="col-md-12" method="post" controller="Mail" action="sendTestMail">
<f:form.submit class="btn-primary btn form-group" value="{f:translate(key:'backend.send_test')}" />
<f:form.textfield name="emailAddress" type="email" required="TRUE" class="email-input form-group" placeholder="{f:translate(key:'backend.email')}" />
<f:form.hidden name="selectedLanguageLeft" value="{selectedLanguageLeft}"></f:form.hidden>
<f:form.hidden name="selectedLanguageRight" value="{selectedLanguageRight}"></f:form.hidden>
<f:form.hidden name="selectedTemplate" value="{selectedTemplateKey}"></f:form.hidden>
<f:form.hidden name="selectedExtensionKey" value="{selectedTemplate.extension}"></f:form.hidden>
<f:form.hidden name="selectedExtension" value="{selectedTemplate.extension}"></f:form.hidden>
<f:form.hidden name="selectedTemplateKey" value="{selectedTemplateKey}"></f:form.hidden>
<f:form.hidden name="selectedLanguageLeft" value="{selectedLanguageLeft}" />
<f:form.hidden name="selectedLanguageRight" value="{selectedLanguageRight}" />
<f:form.hidden name="selectedTemplate" value="{selectedTemplateKey}" />
<f:form.hidden name="selectedExtensionKey" value="{selectedTemplate.extension}" />
<f:form.hidden name="selectedExtension" value="{selectedTemplate.extension}" />
<f:form.hidden name="selectedTemplateKey" value="{selectedTemplateKey}" />
</f:form>
<f:form method="post" controller="Mail" action="save">
<div class="col-md-12 form-group">
......@@ -110,36 +110,36 @@
</div>
<div class="form-group">
<label for="fromNameLeft" class="">{f:translate(key:'backend.fromName')}</label>
<f:form.textfield type="text" class="form-control" value="{fromNameLeft}" name="fromNameLeft"></f:form.textfield>
<f:form.textfield type="text" class="form-control" value="{fromNameLeft}" name="fromNameLeft" />
</div>
<div class="form-group">
<label for="fromMailLeft" class="">{f:translate(key:'backend.fromMail')}</label>
<f:form.textfield type="email" class="form-control" value="{fromMailLeft}" name="fromMailLeft"></f:form.textfield>
<f:form.textfield type="email" class="form-control" value="{fromMailLeft}" name="fromMailLeft" />
</div>
<div class="form-group">
<label for="ccLeft" class="">{f:translate(key:'backend.cc')}</label>
<f:form.textfield type="text" class="form-control" value="{ccLeft}" name="ccLeft"></f:form.textfield>
<f:form.textfield type="text" class="form-control" value="{ccLeft}" name="ccLeft" />
</div>
<div class="form-group">
<label for="bccLeft" class="">{f:translate(key:'backend.bcc')}</label>
<f:form.textfield type="text" class="form-control" value="{bccLeft}" name="bccLeft"></f:form.textfield>
<f:form.textfield type="text" class="form-control" value="{bccLeft}" name="bccLeft" />
</div>
<div class="form-group">
<label for="replyToLeft" class="">{f:translate(key:'backend.replyTo')}</label>
<f:form.textfield type="text" class="form-control" value="{replyToLeft}" name="replyToLeft"></f:form.textfield>
<f:form.textfield type="text" class="form-control" value="{replyToLeft}" name="replyToLeft" />
</div>
<div class="form-group">
<label for="subjectLeft" class="">{f:translate(key:'backend.subject')}</label>
<f:form.textfield type="text" class="form-control" value="{subjectLeft}" name="subjectLeft"></f:form.textfield>
<f:form.textfield type="text" class="form-control" value="{subjectLeft}" name="subjectLeft" />
</div>
<label for="contentLeft" class="">{f:translate(key:'backend.content')}</label>
<f:form.textarea class="form-control" rows="25" name="contentLeft" value="{contentLeft}"></f:form.textarea>
<f:form.hidden name="selectedLanguageLeft" value="{selectedLanguageLeft}"></f:form.hidden>
<f:form.hidden name="selectedLanguageRight" value="{selectedLanguageRight}"></f:form.hidden>
<f:form.hidden name="selectedTemplate" value="{selectedTemplateKey}"></f:form.hidden>
<f:form.hidden name="selectedExtensionKey" value="{selectedTemplate.extension}"></f:form.hidden>
<f:form.hidden name="selectedExtension" value="{selectedTemplate.extension}"></f:form.hidden>
<f:form.hidden name="selectedTemplateKey" value="{selectedTemplateKey}"></f:form.hidden>
<f:form.textarea class="form-control" rows="25" name="contentLeft" value="{contentLeft}" />
<f:form.hidden name="selectedLanguageLeft" value="{selectedLanguageLeft}" />
<f:form.hidden name="selectedLanguageRight" value="{selectedLanguageRight}" />
<f:form.hidden name="selectedTemplate" value="{selectedTemplateKey}" />
<f:form.hidden name="selectedExtensionKey" value="{selectedTemplate.extension}" />
<f:form.hidden name="selectedExtension" value="{selectedTemplate.extension}" />
<f:form.hidden name="selectedTemplateKey" value="{selectedTemplateKey}" />
</div>
<div class="col-md-6">
......@@ -170,30 +170,30 @@
</div>
<div class="form-group">
<label for="fromNameRight" class="">{f:translate(key:'backend.fromName')}</label>
<f:form.textfield type="text" class="form-control" value="{fromNameRight}" name="fromNameRight"></f:form.textfield>
<f:form.textfield type="text" class="form-control" value="{fromNameRight}" name="fromNameRight" />
</div>
<div class="form-group">
<label for="fromMailRight" class="">{f:translate(key:'backend.fromMail')}</label>
<f:form.textfield type="email" class="form-control" value="{fromMailRight}" name="fromMailRight"></f:form.textfield>
<f:form.textfield type="email" class="form-control" value="{fromMailRight}" name="fromMailRight" />
</div>
<div class="form-group">
<label for="ccRight" class="">{f:translate(key:'backend.cc')}</label>
<f:form.textfield type="text" class="form-control" value="{ccRight}" name="ccRight"></f:form.textfield>
<f:form.textfield type="text" class="form-control" value="{ccRight}" name="ccRight" />
</div>
<div class="form-group">
<label for="bccRight" class="">{f:translate(key:'backend.bcc')}</label>
<f:form.textfield type="text" class="form-control" value="{bccRight}" name="bccRight"></f:form.textfield>
<f:form.textfield type="text" class="form-control" value="{bccRight}" name="bccRight" />
</div>
<div class="form-group">
<label for="replyToRight" class="">{f:translate(key:'backend.replyTo')}</label>
<f:form.textfield type="text" class="form-control" value="{replyToRight}" name="replyToRight"></f:form.textfield>
<f:form.textfield type="text" class="form-control" value="{replyToRight}" name="replyToRight" />
</div>
<div class="form-group">
<label for="subjectRight" class="">{f:translate(key:'backend.subject')}</label>
<f:form.textfield type="text" class=" form-control" value="{subjectRight}" name="subjectRight"></f:form.textfield>
<f:form.textfield type="text" class=" form-control" value="{subjectRight}" name="subjectRight" />
</div>
<label for="contentRight" class="">{f:translate(key:'backend.content')}</label>
<f:form.textarea class="form-control" rows="25" name="contentRight" value="{contentRight}"></f:form.textarea>
<f:form.textarea class="form-control" rows="25" name="contentRight" value="{contentRight}" />
</div>
<div class="col-md-2">
<div class="form-group">
......
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