Merge branch 'feature_security_update' of gitlab.sgalinski.de:typo3/sg_mail...

Merge branch 'feature_security_update' of gitlab.sgalinski.de:typo3/sg_mail into feature_security_update

Classes/Command/SendMailCommandController.php

@@ -85,27 +85,28 @@ class SendMailCommandController extends CommandController {
 			$mailMessage->setFrom($fromAddress, $mailToSend->getFromName());
 			$mailMessage->setTo($toAddresses);
 			$mailMessage->setSubject($mailSubject);
-			if (count($ccAddresses)) {
+			if (\count($ccAddresses)) {
 				$mailMessage->setCc($ccAddresses);
 			}
-			if (count($bccAddresses)) {
+
+			if (\count($bccAddresses)) {
 				$mailMessage->setBcc($bccAddresses);
 			}
 
 			$mailMessage->setBody($mailBody, 'text/html');
-            $plaintextService = GeneralUtility::makeInstance(PlaintextService::class);
-            $plaintextBody = $plaintextService->makePlain($mailBody);
-            $mailMessage->addPart($plaintextBody, 'text/plain');
+			$plaintextService = GeneralUtility::makeInstance(PlaintextService::class);
+			$plaintextBody = $plaintextService->makePlain($mailBody);
+			$mailMessage->addPart($plaintextBody, 'text/plain');
 
-            $attachments = $mailToSend->getAttachments();
-            if ($attachments->count() > 0) {
-            	foreach ($attachments as $attachment) {
+			$attachments = $mailToSend->getAttachments();
+			if ($attachments->count() > 0) {
+				foreach ($attachments as $attachment) {
 					/**
 					 * @var FileReference $attachment
 					 */
 					$file = $attachment->getOriginalResource()->getOriginalFile();
-            		$mailMessage->attach(
-            			\Swift_Attachment::newInstance($file->getContents(), $file->getName(), $file->getMimeType())
+					$mailMessage->attach(
+						\Swift_Attachment::newInstance($file->getContents(), $file->getName(), $file->getMimeType())
 					);
 				}
 			}

Classes/Controller/MailController.php

@@ -157,7 +157,6 @@ class MailController extends ActionController {
 		foreach ($templatesFromDb as $key => $template) {
 			if ($template === NULL) {
 				$defaultTemplatePath = $registerArray[$parameters['selectedExtension']][$parameters['selectedTemplate']]['templatePath'];
-				$defaultTemplateFile = $defaultTemplatePath . $key . '.' . 'template.html';
 				$fallbackTemplateFile = $defaultTemplatePath . 'template.html';
 
 				$templateFromFile = new Template();
@@ -177,10 +176,8 @@ class MailController extends ActionController {
 				$subject = $registerArray[$parameters['selectedExtension']][$parameters['selectedTemplate']]['subject'];
 				if ($registerArray[$parameters['selectedExtension']][$parameters['selectedTemplate']]['templateContent']) {
 					$templateFromFile->setContent($registerArray[$parameters['selectedExtension']][$parameters['selectedTemplate']]['templateContent']);
-				} else {
-					if (file_exists($fallbackTemplateFile)) {
-						$templateFromFile->setContent(file_get_contents($fallbackTemplateFile));
-					}
+				} elseif (file_exists($fallbackTemplateFile)) {
+					$templateFromFile->setContent(file_get_contents($fallbackTemplateFile));
 				}
 			} else {
 				$templates[$key] = $template;

Classes/Controller/QueueController.php

@@ -186,8 +186,6 @@ class QueueController extends ActionController {
 	 * Download the queue data as a csv file, respecting the filter settings
 	 *
 	 * @param array $filters
-	 * @throws \TYPO3\CMS\Extbase\Mvc\Exception\StopActionException
-	 * @throws \TYPO3\CMS\Extbase\Mvc\Exception\UnsupportedRequestTypeException
 	 * @throws \TYPO3\CMS\Extbase\Persistence\Exception\InvalidQueryException
 	 * @throws \InvalidArgumentException
 	 */
@@ -197,7 +195,7 @@ class QueueController extends ActionController {
 		header('Content-Type: application/force-download');
 		header('Content-Transfer-Encoding: Binary');
 		header('Content-Disposition: attachment; filename="export.csv"');
-		header('Content-Length: ' . strlen($exportString));
+		header('Content-Length: ' . \strlen($exportString));
 		echo $exportString;
 		exit(0);
 	}

Classes/Domain/Repository/AbstractRepository.php

@@ -58,7 +58,7 @@ abstract class AbstractRepository extends Repository {
 	 * @param bool $ignoreEnableFields
 	 * @return string
 	 */
-	protected function getEnableFieldsStatement($table, $alias = '', $ignoreEnableFields = FALSE) {
+	protected function getEnableFieldsStatement($table, $alias = '', $ignoreEnableFields = FALSE): string {
 		if (TYPO3_MODE === 'FE' && $GLOBALS['TSFE'] instanceof TypoScriptFrontendController) {
 			/** @var PageRepository $pageRepository */
 			$pageRepository = $GLOBALS['TSFE']->sys_page;

Classes/Domain/Repository/MailRepository.php

@@ -90,12 +90,10 @@ class MailRepository extends AbstractRepository {
 			foreach (BackendService::getLanguages() as $lang) {
 				$constraintsAnd[] = $query->logicalNot($query->equals('language', $lang['isocode']));
 			}
-		} else {
-			if ($filters['filterLanguage'] && $filters['filterLanguage'] !== 0
-				&& $filters['filterLanguage'] !== '0' && $filters['filterLanguage'] !== ''
-			) {
-				$constraintsAnd[] = $query->equals('language', $filters['filterLanguage']);
-			}
+		} elseif ($filters['filterLanguage'] && $filters['filterLanguage'] !== 0
+			&& $filters['filterLanguage'] !== '0' && $filters['filterLanguage'] !== ''
+		) {
+			$constraintsAnd[] = $query->equals('language', $filters['filterLanguage']);
 		}
 
 		$constraintsOr = [];

Classes/Domain/Repository/TemplateRepository.php

@@ -26,7 +26,6 @@ namespace SGalinski\SgMail\Domain\Repository;
  *  This copyright notice MUST APPEAR in all copies of the script!
  ***************************************************************/
 
-use SGalinski\SgMail\Domain\Model\Template;
 use TYPO3\CMS\Core\Database\DatabaseConnection;
 use TYPO3\CMS\Extbase\Persistence\Generic\Typo3QuerySettings;
 

ext_localconf.php

@@ -67,4 +67,3 @@ if (!isset($TYPO3_CONF_VARS['SYS']['caching']['cacheConfigurations'][$cacheName]
 		'citypower'
 	];
 }
-