[TASK] Merge conflict

Classes/Controller/MailController.php

 <?php
-
 namespace SGalinski\SgMail\Controller;
 
 /***************************************************************
@@ -25,7 +24,6 @@ namespace SGalinski\SgMail\Controller;
  *
  *  This copyright notice MUST APPEAR in all copies of the script!
  ***************************************************************/
-
 use SGalinski\SgMail\Domain\Model\Template;
 use SGalinski\SgMail\Service\MailTemplateService;
 use SGalinski\SgMail\Session\PhpSession;
@@ -44,13 +42,11 @@ class MailController extends ActionController {
 	 * @inject
 	 */
 	protected $languageRepository;
-
 	/**
 	 * @var \SGalinski\SgMail\Domain\Repository\TemplateRepository
 	 * @inject
 	 */
 	protected $templateRepository;
-
 	/**
 	 * @var \SGalinski\SgMail\Session\PhpSession
 	 */
@@ -74,17 +70,14 @@ class MailController extends ActionController {
 			$this->session = $this->objectManager->get('SGalinski\SgMail\Session\PhpSession');
 			$this->session->setSessionKey('sg_mail_controller_session');
 		}
-
 		$registerArray = MailTemplateService::getRegisterArray();
 		$activatedLanguages = $this->languageRepository->findSelected();
 		$languages = ['en'];
 		foreach ($activatedLanguages as $language) {
 			$languages[] = $language->getLocale();
 		}
-
 		$this->view->assign('languages', $languages);
 		$this->view->assign('templates', MailTemplateService::getRegisterArray());
-
 		// get last selected languages
 		if ($selectedLanguageLeft === NULL) {
 			$selectedLanguageLeft = $this->session->getDataByKey('selectedLanguageLeft');
@@ -92,7 +85,6 @@ class MailController extends ActionController {
 				$selectedLanguageLeft = $languages[0];
 			}
 		}
-
 		if ($selectedLanguageRight === NULL) {
 			$selectedLanguageRight = $this->session->getDataByKey('selectedLanguageRight');
 			if ($selectedLanguageRight === NULL) {
@@ -103,56 +95,45 @@ class MailController extends ActionController {
 				}
 			}
 		}
-
 		if ($selectedTemplate === NULL) {
 			$selectedExtension = key($registerArray);
 			$selectedTemplate = key($registerArray[$selectedExtension]);
 		}
 		$selectedTemplateArray = $registerArray[$selectedExtension][$selectedTemplate];
-
 		$this->session->setDataByKey('selectedLanguageLeft', $selectedLanguageLeft);
 		$this->session->setDataByKey('selectedLanguageRight', $selectedLanguageRight);
-
 		$templateLeft = $this->templateRepository->findOneByTemplate(
 			$selectedExtension, $selectedTemplate, $selectedLanguageLeft
 		);
-
 		$templateRight = $this->templateRepository->findOneByTemplate(
 			$selectedExtensionKey, $selectedTemplateKey, $selectedLanguageRight
 		);
-
 		if ($templateLeft !== NULL) {
 			$this->view->assign('contentLeft', $templateLeft->getContent());
 		} else {
 			$defaultTemplatePath = $registerArray[$selectedExtension][$selectedTemplate]['templatePath'];
 			$defaultTemplateFile = $defaultTemplatePath . $selectedLanguageLeft . '.' . 'template.html';
-
 			if (file_exists($defaultTemplateFile)) {
 				$this->view->assign('contentLeft', file_get_contents($defaultTemplateFile));
 			}
 		}
-
 		if ($templateRight !== NULL) {
 			$this->view->assign('contentRight', $templateRight->getContent());
 		} else {
 			$defaultTemplatePath = $registerArray[$selectedExtension][$selectedTemplate]['templatePath'];
 			$defaultTemplateFile = $defaultTemplatePath . $selectedLanguageRight . '.' . 'template.html';
-
 			if (file_exists($defaultTemplateFile)) {
 				$this->view->assign('contentRight', file_get_contents($defaultTemplateFile));
 			}
 		}
-
 		$this->view->assign(
 			'subjectLeft', $templateLeft !== NULL ? $templateLeft->getSubject() :
 			$registerArray[$selectedExtension][$selectedTemplate]['subjects'][$selectedLanguageLeft]
 		);
-
 		$this->view->assign(
 			'subjectRight', $templateRight !== NULL ? $templateRight->getSubject() :
 			$registerArray[$selectedExtension][$selectedTemplate]['subjects'][$selectedLanguageRight]
 		);
-
 		$this->view->assign('selectedTemplate', $selectedTemplateArray);
 		$this->view->assign('selectedTemplateKey', $selectedTemplate);
 		$this->view->assign('selectedExtensionKey', $selectedExtension);
@@ -178,16 +159,13 @@ class MailController extends ActionController {
 		$selectedLanguageLeft = NULL, $selectedLanguageRight = NULL, $subjectLeft = NULL, $subjectRight = NULL
 	) {
 		$this->saveTemplate($selectedExtension, $selectedTemplate, $selectedLanguageLeft, $contentLeft, $subjectLeft);
-
 		if ($selectedLanguageLeft !== $selectedLanguageRight) {
 			$this->saveTemplate(
 				$selectedExtension, $selectedTemplate, $selectedLanguageRight, $contentRight, $subjectRight
 			);
 		}
-
 		$message = LocalizationUtility::translate('backend.success', 'sg_mail');
 		$this->addFlashMessage($message, '', FlashMessage::OK);
-
 		$arguments = $this->request->getArguments();
 		$this->redirect('index', NULL, NULL, $arguments);
 	}
@@ -209,26 +187,22 @@ class MailController extends ActionController {
 		$template = $this->templateRepository->findOneByTemplate(
 			$selectedExtension, $selectedTemplate, $selectedLanguage
 		);
-
 		$templateAlreadyExists = TRUE;
 		$objectManager = GeneralUtility::makeInstance(ObjectManager::class);
 		if ($template === NULL) {
 			$templateAlreadyExists = FALSE;
 			$template = $objectManager->get(Template::class);
 		}
-
 		$template->setExtensionKey($selectedExtension);
 		$template->setTemplateName($selectedTemplate);
 		$template->setLanguage($selectedLanguage);
 		$template->setContent($selectedContent);
 		$template->setSubject($selectedSubject);
-
 		if ($templateAlreadyExists) {
 			$this->templateRepository->update($template);
 		} else {
 			$this->templateRepository->add($template);
 		}
-
 		return $template;
 	}
 
@@ -254,7 +228,6 @@ class MailController extends ActionController {
 		$mailTemplateService->setTemplateName($selectedTemplateKey);
 		$mailTemplateService->setExtensionKey($selectedExtensionKey);
 		$mailIsSend = $mailTemplateService->sendEmail(TRUE);
-
 		if ($selectedLanguageRight !== $selectedLanguageLeft) {
 			/** @var \SGalinski\SgMail\Service\MailTemplateService $mailTemplateService */
 			$mailTemplateService = $objectManager->get(MailTemplateService::class);
@@ -265,7 +238,6 @@ class MailController extends ActionController {
 			$mailTemplateService->setExtensionKey($selectedExtensionKey);
 			$mailIsSend = $mailTemplateService->sendEmail(TRUE);
 		}
-
 		if ($mailIsSend) {
 			$message = LocalizationUtility::translate('backend.success_mail', 'sg_mail');
 			$this->addFlashMessage($message, '', FlashMessage::OK);
@@ -273,7 +245,6 @@ class MailController extends ActionController {
 			$message = LocalizationUtility::translate('backend.failure_mail', 'sg_mail');
 			$this->addFlashMessage($message, '', FlashMessage::ERROR);
 		}
-
 		$arguments = $this->request->getArguments();
 		$this->redirect('index', NULL, NULL, $arguments);
 	}