From c77ca08fe04a19e099216122249b0cfda6d77091 Mon Sep 17 00:00:00 2001
From: Torsten Oppermann <torsten@sgalinski.de>
Date: Fri, 8 Mar 2019 14:35:33 +0100
Subject: [PATCH] [TASK] Code cleanup
---
.../Controller/ConfigurationController.php | 59 ++++++++++---------
1 file changed, 32 insertions(+), 27 deletions(-)
diff --git a/Classes/Controller/ConfigurationController.php b/Classes/Controller/ConfigurationController.php
index ad6dfabf..59cdf36e 100644
--- a/Classes/Controller/ConfigurationController.php
+++ b/Classes/Controller/ConfigurationController.php
@@ -1,4 +1,4 @@
-<?php
+<?php /** @noinspection CallableParameterUseCaseInTypeContextInspection */
namespace SGalinski\SgMail\Controller;
@@ -27,28 +27,23 @@ namespace SGalinski\SgMail\Controller;
***************************************************************/
use SGalinski\SgMail\Service\BackendService;
-use SGalinski\SgMail\Service\MailTemplateService;
use SGalinski\SgMail\Service\RegisterService;
-use SGalinski\SgMail\Service\TypoScriptSettingsService;
use SGalinski\SgMail\Session\PhpSession;
use TYPO3\CMS\Backend\Template\Components\DocHeaderComponent;
use TYPO3\CMS\Backend\Utility\BackendUtility;
-use TYPO3\CMS\Core\Cache\CacheManager;
-use TYPO3\CMS\Core\Cache\Frontend\FrontendInterface;
use TYPO3\CMS\Core\Messaging\FlashMessage;
use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Core\Utility\VersionNumberUtility;
use TYPO3\CMS\Extbase\Mvc\Controller\ActionController;
use TYPO3\CMS\Extbase\Mvc\Exception\StopActionException;
use TYPO3\CMS\Extbase\Mvc\Exception\UnsupportedRequestTypeException;
-use TYPO3\CMS\Extbase\Object\ObjectManager;
use TYPO3\CMS\Extbase\Utility\LocalizationUtility;
/**
* Controller for the configuration mode of the backend module
*/
class ConfigurationController extends ActionController {
- public const DEFAULT_EXTENSION_KEY = 'sg_mail';
+ const DEFAULT_EXTENSION_KEY = 'sg_mail';
/**
* DocHeaderComponent
@@ -92,18 +87,24 @@ class ConfigurationController extends ActionController {
$this->view->assign('mode', $mode);
if ($mode === 'edit') {
$templateToEdit = $registerArray[$selectedExtension][$selectedTemplate];
- $this->view->assign('templateName', $selectedTemplate);
- $this->view->assign('subject', $templateToEdit['subject']);
- $this->view->assign('templateContent', $templateToEdit['templateContent']);
+
$csv = '';
foreach ($templateToEdit['marker'] as $arr) {
$csv .= implode(';', $arr) . "\r\n";
}
- $this->view->assign('csv', $csv);
- $this->view->assign('extensionKey', $selectedExtension);
- $this->view->assign('description', $templateToEdit['description']);
- $this->view->assign('editMode', 1);
+
+ $this->view->assignMultiple(
+ [
+ 'templateName' => $selectedTemplate,
+ 'subject' => $templateToEdit['subject'],
+ 'templateContent' => $templateToEdit['templateContent'],
+ 'csv' => $csv,
+ 'extensionKey' => $selectedExtension,
+ 'description' => $templateToEdit['description'],
+ 'editMode' => 1
+ ]
+ );
}
// make docheader
@@ -115,13 +116,17 @@ class ConfigurationController extends ActionController {
$this->docHeaderComponent->setMetaInformation($pageInfo);
BackendService::makeButtons($this->docHeaderComponent, $this->request);
- $this->view->assign('docHeader', $this->docHeaderComponent->docHeaderContent());
- $this->view->assign('selectedTemplateFilter', $filters['filterTemplate']);
- $this->view->assign('selectedExtensionFilter', $filters['filterExtension']);
- $this->view->assign('typo3Version', VersionNumberUtility::convertVersionNumberToInteger(TYPO3_version));
- $this->view->assign('selectedTemplateKey', $selectedTemplate);
- $this->view->assign('selectedExtensionKey', $selectedExtension);
- $this->view->assign('mode', 'editor');
+ $this->view->assignMultiple(
+ [
+ 'docHeader' => $this->docHeaderComponent->docHeaderContent(),
+ 'selectedTemplateFilter' => $filters['filterTemplate'],
+ 'selectedExtensionFilter' => $filters['filterExtension'],
+ 'typo3Version' => VersionNumberUtility::convertVersionNumberToInteger(TYPO3_version),
+ 'selectedTemplateKey' => $selectedTemplate,
+ 'selectedExtensionKey' => $selectedExtension,
+ 'mode' => 'editor'
+ ]
+ );
}
/**
@@ -132,7 +137,7 @@ class ConfigurationController extends ActionController {
* @throws \TYPO3\CMS\Core\Cache\Exception\NoSuchCacheException
* @throws \TYPO3\CMS\Extbase\Mvc\Exception\NoSuchArgumentException
*/
- public function createAction(): void {
+ public function createAction() {
if (!$this->request->hasArgument('configuration')) {
$this->redirect(
'index', 'Configuration', NULL,
@@ -145,7 +150,7 @@ class ConfigurationController extends ActionController {
$templateName = $configuration['templateName'];
$extensionKey = $configuration['extensionKey'];
- $csv = str_replace("\r", '', $configuration['csv']);
+ $csv = \str_replace("\r", '', $configuration['csv']);
$subject = $configuration['subject'];
$description = $configuration['description'];
@@ -195,7 +200,7 @@ class ConfigurationController extends ActionController {
* @throws \TYPO3\CMS\Extbase\Mvc\Exception\NoSuchArgumentException
* @throws \TYPO3\CMS\Core\Cache\Exception\NoSuchCacheException
*/
- public function editAction(): void {
+ public function editAction() {
if (!$this->request->hasArgument('configuration')) {
$this->redirect(
'index', 'Configuration', NULL,
@@ -210,14 +215,14 @@ class ConfigurationController extends ActionController {
$extensionKey = $configuration['extensionKey'];
$oldTemplateName = $configuration['oldTemplateName'];
$oldExtensionKey = $configuration['oldExtensionKey'];
- $csv = str_replace("\r", '', $configuration['csv']);
+ $csv = \str_replace("\r", '', $configuration['csv']);
$subject = $configuration['subject'];
$description = $configuration['description'];
$markersCsv = \explode("\n", $csv);
$markers = [];
foreach ($markersCsv as $markerCsv) {
- $rowArray = str_getcsv($markerCsv, ';');
+ $rowArray = \str_getcsv($markerCsv, ';');
if (!$rowArray[0]) {
continue;
}
@@ -262,7 +267,7 @@ class ConfigurationController extends ActionController {
* @throws UnsupportedRequestTypeException
* @throws \TYPO3\CMS\Core\Cache\Exception\NoSuchCacheException
*/
- public function deleteAction(string $selectedTemplate, string $selectedExtension): void {
+ public function deleteAction(string $selectedTemplate, string $selectedExtension) {
$registerService = $this->objectManager->get(RegisterService::class);
$registerService->deleteTemplate($selectedExtension, $selectedTemplate);
$this->redirect(
--
GitLab