Merge branch 'master' into feature_4_3

Classes/Controller/MailController.php

@@ -97,6 +97,28 @@ class MailController extends ActionController {
 		}
 
 		$registerArray = MailTemplateService::getRegisterArray();
+		$extensionConfiguration = unserialize($GLOBALS['TYPO3_CONF_VARS']['EXT']['extConf']['sg_mail']);
+		if (isset($extensionConfiguration['excludeTemplates']) && $extensionConfiguration['excludeTemplates'] !== '') {
+			$excludedTemplates = GeneralUtility::trimExplode(',', $extensionConfiguration['excludeTemplates'], TRUE);
+			if ($excludedTemplates && count($excludedTemplates)) {
+				foreach ($excludedTemplates as $excludedTemplate) {
+					list($extensionKey, $templateName) = GeneralUtility::trimExplode('.', $excludedTemplate);
+					if ($extensionKey && $templateName && isset($registerArray[$extensionKey][$templateName])) {
+						unset($registerArray[$extensionKey][$templateName]);
+					}
+				}
+			}
+		}
+		$removeExtensionKeys = [];
+		foreach ($registerArray as $extensionKey => $extensionTemplates) {
+			if (count($extensionTemplates) === 0) {
+				$removeExtensionKeys[] = $extensionKey;
+			}
+		}
+		foreach ($removeExtensionKeys as $extensionKey) {
+			unset($registerArray[$extensionKey]);
+		}
+		reset($registerArray);
 
 		// if no extensions are registered, redirect to empty action
 		if (empty($registerArray)) {
@@ -169,7 +191,7 @@ class MailController extends ActionController {
 		$this->view->assign('colspace', $colspace);
 		$this->view->assign('languageTemplates', $templates);
 		$this->view->assign('languageLabels', BackendService::getLanguageLabels($languages));
-		$this->view->assign('templates', MailTemplateService::getRegisterArray());
+		$this->view->assign('templates', $registerArray);
 
 		$templateDescription = $registerArray[$parameters['selectedExtension']][$parameters['selectedTemplate']]['description'];
 

README.md

@@ -212,6 +212,9 @@ With the **Mail Queue** mode, you can see the current content of your mailing qu
  	
 Additionally you can now filter the mail queue or export it to a csv file.
 
+## Known Facts
+
+### Countries aren't respected yet. Currently just languages are used.
 
 ## Developer Guide
 

Resources/Private/Language/de.locallang.xlf

@@ -313,6 +313,10 @@
 			<source>Example</source>
 			<target>Beispiel</target>
 		</trans-unit>
+		<trans-unit id="configuration.excludeTemplates">
+			<source>Exclude Mail Templates:Comma-separated list of {extension_key}.{template_name}</source>
+			<target>Mail-Templates ausschließen:Kommagetrennte Liste von {extension_key}.{template_name}</target>
+		</trans-unit>
 		<trans-unit id="mlang_labels_tabdescr" approved="yes">
 			<source>Mail Templates</source>
 			<target>Mail-Templates</target>

Resources/Private/Language/locallang.xlf

@@ -237,6 +237,9 @@
 		<trans-unit id="backend.value">
 			<source>Example</source>
 		</trans-unit>
+		<trans-unit id="configuration.excludeTemplates">
+			<source>Exclude Mail Templates:Comma-separated list of {extension_key}.{template_name}</source>
+		</trans-unit>
 		<trans-unit id="mlang_labels_tabdescr">
 			<source>Mail Templates</source>
 		</trans-unit>

composer.json

@@ -6,7 +6,7 @@
 	"license": [
 		"GPL-2.0+"
 	],
-	"version": "4.1.3",
+	"version": "4.2.1",
 	"repositories": [
 		{
 			"type": "composer",

ext_conf_template.txt

+# cat=general; type=string; label=LLL:EXT:sg_mail/Resources/Private/Language/locallang.xlf:configuration.excludeTemplates
+excludeTemplates =

ext_emconf.php

@@ -8,7 +8,7 @@ $EM_CONF['sg_mail'] = array (
 	'title' => 'Mail Templates',
 	'description' => 'Mail Templates',
 	'category' => 'module',
-	'version' => '4.1.3',
+	'version' => '4.2.1',
 	'state' => 'stable',
 	'uploadfolder' => false,
 	'createDirs' => '',