From e652e07e8f0ce95874969da8b01f14332344e201 Mon Sep 17 00:00:00 2001
From: Torsten Oppermann <torsten@sgalinski.de>
Date: Tue, 5 Sep 2017 16:12:38 +0200
Subject: [PATCH] [TASK] Misc refactorings
---
Classes/Controller/MailController.php | 2 +
Classes/Service/BackendService.php | 71 -------------------------
Classes/Service/MailTemplateService.php | 3 +-
3 files changed, 3 insertions(+), 73 deletions(-)
diff --git a/Classes/Controller/MailController.php b/Classes/Controller/MailController.php
index 3470b7a9..dc27e74a 100644
--- a/Classes/Controller/MailController.php
+++ b/Classes/Controller/MailController.php
@@ -255,7 +255,9 @@ class MailController extends ActionController {
/** @var \SGalinski\SgMail\Service\MailTemplateService $mailTemplateService */
$mailTemplateService = $objectManager->get(MailTemplateService::class);
$mailIsSend = FALSE;
+
foreach ($parameters['templates'] as $key => $template) {
+
$mailTemplateService->setLanguage($key);
$mailTemplateService->setToAddresses($parameters['emailAddress']);
$mailTemplateService->setFromAddress($template['fromMail']);
diff --git a/Classes/Service/BackendService.php b/Classes/Service/BackendService.php
index dae1b6a1..7cd886fd 100644
--- a/Classes/Service/BackendService.php
+++ b/Classes/Service/BackendService.php
@@ -185,76 +185,6 @@ class BackendService {
return $languageLabels;
}
- /**
- * Get the previous selected languages, the actual selection or the default
- * format ['left' => languagecode, 'right' => ...]
- *
- * @param string $selectedLanguageLeft
- * @param string $selectedLanguageRight
- * @param \SGalinski\SgMail\Session\PhpSession $session
- * @param array $languages
- * @return array
- */
- public static function getSelectedLanguages(
- $selectedLanguageLeft, $selectedLanguageRight, $session, array $languages
- ) {
- $selectedLanguages = [
- 'left' => $selectedLanguageLeft,
- 'right' => $selectedLanguageRight
- ];
-
- if ($selectedLanguageLeft === NULL) {
- $selectedLanguageLeftFromSession = $session->getDataByKey('selectedLanguageLeft');
- if ($selectedLanguageLeftFromSession !== NULL) {
- $selectedLanguages['left'] = $selectedLanguageLeftFromSession;
- } else {
- $selectedLanguages['left'] = $languages[0];
- }
- }
-
- if ($selectedLanguageRight === NULL) {
- $selectedLanguageRightFromSession = $session->getDataByKey('selectedLanguageRight');
- if ($selectedLanguageRightFromSession === NULL) {
- if (isset($languages[1])) {
- $selectedLanguages['right'] = $languages[1];
- } else {
- $selectedLanguages['right'] = $languages[0];
- }
- } else {
- $selectedLanguages['right'] = $selectedLanguageRightFromSession;
- }
- }
- return $selectedLanguages;
- }
-
- /**
- * Get the selected templates for the selected language
- *
- * @param string $selectedExtension
- * @param string $selectedTemplate
- * @param array $languages
- * @param int $pid
- * @return array
- * @throws \InvalidArgumentException
- */
- public static function getSelectedTemplates(
- $selectedExtension, $selectedTemplate, array $languages, $pid
- ) {
- $selectedTemplates = [];
-
- $objectManager = GeneralUtility::makeInstance(ObjectManager::class);
- /** @var TemplateRepository $templateRepository */
- $templateRepository = $objectManager->get(TemplateRepository::class);
-
- foreach ($languages as $language) {
- $selectedTemplates[$language['isocode']] = $templateRepository->findOneByTemplate(
- $selectedExtension, $selectedTemplate, $language['isocode'], $pid
- );
- }
-
- return $selectedTemplates;
- }
-
/**
* Get the languages in an array suitable for filtering
*
@@ -262,7 +192,6 @@ class BackendService {
* @throws \InvalidArgumentException
*/
public static function getLanguagesForFilter() {
- // @TODO
$languages = self::getLanguages();
array_unshift($languages, '');
diff --git a/Classes/Service/MailTemplateService.php b/Classes/Service/MailTemplateService.php
index 6b816206..0c23b6a0 100644
--- a/Classes/Service/MailTemplateService.php
+++ b/Classes/Service/MailTemplateService.php
@@ -33,12 +33,10 @@ use SGalinski\SgMail\Domain\Repository\MailRepository;
use SGalinski\SgMail\Domain\Repository\TemplateRepository;
use Swift_Attachment;
use Swift_OutputByteStream;
-use TYPO3\CMS\Core\Database\DatabaseConnection;
use TYPO3\CMS\Core\Mail\MailMessage;
use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Extbase\Object\ObjectManager;
use TYPO3\CMS\Extbase\Persistence\Generic\PersistenceManager;
-use TYPO3\CMS\Extbase\Persistence\QueryResultInterface;
use TYPO3\CMS\Extbase\Utility\LocalizationUtility;
use TYPO3\CMS\Fluid\View\StandaloneView;
use TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController;
@@ -306,6 +304,7 @@ class MailTemplateService {
* @throws \TYPO3\CMS\Extbase\Persistence\Exception\IllegalObjectTypeException
*/
public function sendEmail($isPreview = FALSE) {
+
if (TYPO3_MODE === 'FE') {
/** @var TypoScriptFrontendController $tsfe */
$tsfe = $GLOBALS['TSFE'];
--
GitLab