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

[TASK] Mark update wizard as done when success

parent 6c742d45
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Classes/Controller/MailController.php
+ 18
− 34
View file @ e000aa1c
......@@ -41,22 +41,6 @@ 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
*
......@@ -131,32 +115,32 @@ class MailController extends ActionController {
);
if ($selectedTemplates['left'] instanceof Template) {
$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());
$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());
} else {
$defaultTemplatePath = $registerArray[$selectedExtension][$selectedTemplate]['templatePath'];
$defaultTemplateFile = $defaultTemplatePath . $selectedLanguages['left'] . '.' . 'template.html';
if (file_exists($defaultTemplateFile)) {
$this->view->assign(self::FLUID_VAR_CONTENT_LEFT, file_get_contents($defaultTemplateFile));
$this->view->assign('contentLeft', file_get_contents($defaultTemplateFile));
}
}
if ($selectedTemplates['right'] instanceof Template) {
$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());
$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());
} else {
$defaultTemplatePath = $registerArray[$selectedExtension][$selectedTemplate]['templatePath'];
$defaultTemplateFile = $defaultTemplatePath . $selectedLanguages['right'] . '.' . 'template.html';
if (file_exists($defaultTemplateFile)) {
$this->view->assign(self::FLUID_VAR_CONTENT_RIGHT, file_get_contents($defaultTemplateFile));
$this->view->assign('contentRight', file_get_contents($defaultTemplateFile));
}
}
......@@ -164,12 +148,12 @@ class MailController extends ActionController {
if (is_array($subject)) {
$this->view->assign(
self::FLUID_SUBJECT_LEFT, $selectedTemplates['left'] !== NULL ? $selectedTemplates['left']->getSubject() :
'subjectLeft', $selectedTemplates['left'] !== NULL ? $selectedTemplates['left']->getSubject() :
$registerArray[$selectedExtension][$selectedTemplate]['subject'][$selectedLanguages['left']]
);
$this->view->assign(
self::FLUID_SUBJECT_RIGHT, $selectedTemplates['right'] !== NULL ? $selectedTemplates['right']->getSubject() :
'subjectRight', $selectedTemplates['right'] !== NULL ? $selectedTemplates['right']->getSubject() :
$registerArray[$selectedExtension][$selectedTemplate]['subject'][$selectedLanguages['right']]
);
} else {
......@@ -178,12 +162,12 @@ class MailController extends ActionController {
);
$this->view->assign(
self::FLUID_SUBJECT_LEFT, $selectedTemplates['left'] !== NULL ? $selectedTemplates['left']->getSubject() :
'subjectLeft', $selectedTemplates['left'] !== NULL ? $selectedTemplates['left']->getSubject() :
$translatedSubjects['left']
);
$this->view->assign(
self::FLUID_SUBJECT_RIGHT, $selectedTemplates['right'] !== NULL ? $selectedTemplates['right']->getSubject() :
'subjectRight', $selectedTemplates['right'] !== NULL ? $selectedTemplates['right']->getSubject() :
$translatedSubjects['right']
);
}
......
Classes/Updates/MigrateData.php
+ 1
− 0
View file @ e000aa1c
......@@ -101,6 +101,7 @@ class MigrateData extends AbstractUpdate {
}
}
$this->markWizardAsDone();
return TRUE;
}
......
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