From 4a1ae9a7a210495d5e568d48f6dd0e8e98c25e89 Mon Sep 17 00:00:00 2001 From: Philipp Dieter Date: Sun, 14 Nov 2021 19:02:51 +0100 Subject: [PATCH 1/4] [FEATURE] Add attachment option to mailutility --- Classes/Utility/MailUtility.php | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Classes/Utility/MailUtility.php b/Classes/Utility/MailUtility.php index 6f16ebe..db456d2 100644 --- a/Classes/Utility/MailUtility.php +++ b/Classes/Utility/MailUtility.php @@ -280,6 +280,13 @@ class MailUtility $bodydataText[] = $textRow; $bodydataHtml[] = $htmlRow; break; + case 'attachment': + $mail->attach(new \Swift_Attachment( + $row['data'][0], + $row['data'][1], + $row['data'][2] + )); + break; case 'attachmentBase64': $attachmentdata = explode(',', $row['data']); preg_match('/\w*:(.*);\w*/', $attachmentdata[0], $matches); From 04041fa56488412ce45e3546e0656ea7f497e9a0 Mon Sep 17 00:00:00 2001 From: Philipp Dieter Date: Sun, 14 Nov 2021 19:03:55 +0100 Subject: [PATCH 2/4] [FEATURE] Add option to search full typoscript to site config utility --- Classes/Utility/SiteConfigUtility.php | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/Classes/Utility/SiteConfigUtility.php b/Classes/Utility/SiteConfigUtility.php index d14b8be..1a1041a 100644 --- a/Classes/Utility/SiteConfigUtility.php +++ b/Classes/Utility/SiteConfigUtility.php @@ -27,8 +27,10 @@ class SiteConfigUtility * @var string $path * @return string */ - public static function getByPath($path) - { + public static function getByPath( + $path, + $limitToSiteConfig = true + ) { $pathParts = explode('.', $path); $objectManager = GeneralUtility::makeInstance( ObjectManager::class @@ -40,7 +42,10 @@ class SiteConfigUtility ConfigurationManagerInterface::CONFIGURATION_TYPE_FULL_TYPOSCRIPT ); $typoscript = GeneralUtility::removeDotsFromTS($typoscript); - $siteConfig = $typoscript['config']['site']; + $siteConfig = $typoscript; + if ($limitToSiteConfig) { + $siteConfig = $typoscript['config']['site']; + } $current = &$siteConfig; foreach ($pathParts as $key) { $current = &$current[$key]; From 55b9ae220c466ce56b0e20b775d71b41edbb00da Mon Sep 17 00:00:00 2001 From: Philipp Dieter Date: Sun, 14 Nov 2021 19:05:33 +0100 Subject: [PATCH 3/4] [TASK] Don't hide new pages in dev environment --- Resources/Private/PageTSConfig/default.tsconfig | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Resources/Private/PageTSConfig/default.tsconfig b/Resources/Private/PageTSConfig/default.tsconfig index ffb5fbd..31b6307 100644 --- a/Resources/Private/PageTSConfig/default.tsconfig +++ b/Resources/Private/PageTSConfig/default.tsconfig @@ -1 +1,5 @@ + +[applicationContext = Development] +TCAdefaults.pages.hidden = 0 +[end] From 76c9a738f71507647a1b535f5c5150d57bdc8a07 Mon Sep 17 00:00:00 2001 From: Philipp Dieter Date: Sun, 14 Nov 2021 20:55:09 +0100 Subject: [PATCH 4/4] [BUGFIX] Create correct extension key to get configuration --- Classes/Traits/DependencyInjectionTrait.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Classes/Traits/DependencyInjectionTrait.php b/Classes/Traits/DependencyInjectionTrait.php index 27dbbc8..d2ccc13 100644 --- a/Classes/Traits/DependencyInjectionTrait.php +++ b/Classes/Traits/DependencyInjectionTrait.php @@ -88,7 +88,7 @@ trait DependencyInjectionTrait ); $frameworkConfiguration = $this->configurationManager->getConfiguration( ConfigurationManagerInterface::CONFIGURATION_TYPE_FRAMEWORK, - $this->getExtensionKey() + str_replace('_', '', $this->getExtensionKey()) ); $this->configurationManager->setConfiguration( $frameworkConfiguration