typo3/template_aide
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[MERGE] Branch 'master' of https://phabricator.glanzstueck.agency/source/typo3-template_aide

Browse Source
This commit is contained in:
Philipp Dieter 2021-11-21 23:09:51 +01:00
commit 70d0856ba0
4 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Classes/Traits/DependencyInjectionTrait.php
View File

@ -88,7 +88,7 @@ trait DependencyInjectionTrait
); );
$frameworkConfiguration = $this->configurationManager->getConfiguration( $frameworkConfiguration = $this->configurationManager->getConfiguration(
ConfigurationManagerInterface::CONFIGURATION_TYPE_FRAMEWORK, ConfigurationManagerInterface::CONFIGURATION_TYPE_FRAMEWORK,
$this->getExtensionKey() str_replace('_', '', $this->getExtensionKey())
); );
$this->configurationManager->setConfiguration( $this->configurationManager->setConfiguration(
$frameworkConfiguration $frameworkConfiguration

7
Classes/Utility/MailUtility.php
View File

@ -280,6 +280,13 @@ class MailUtility
$bodydataText[] = $textRow; $bodydataText[] = $textRow;
$bodydataHtml[] = $htmlRow; $bodydataHtml[] = $htmlRow;
break; break;
case 'attachment':
$mail->attach(new \Swift_Attachment(
$row['data'][0],
$row['data'][1],
$row['data'][2]
));
break;
case 'attachmentBase64': case 'attachmentBase64':
$attachmentdata = explode(',', $row['data']); $attachmentdata = explode(',', $row['data']);
preg_match('/\w*:(.*);\w*/', $attachmentdata[0], $matches); preg_match('/\w*:(.*);\w*/', $attachmentdata[0], $matches);

11
Classes/Utility/SiteConfigUtility.php
View File

@ -27,8 +27,10 @@ class SiteConfigUtility
* @var string $path * @var string $path
* @return string * @return string
*/ */
public static function getByPath($path) public static function getByPath(
{ $path,
$limitToSiteConfig = true
) {
$pathParts = explode('.', $path); $pathParts = explode('.', $path);
$objectManager = GeneralUtility::makeInstance( $objectManager = GeneralUtility::makeInstance(
ObjectManager::class ObjectManager::class
@ -40,7 +42,10 @@ class SiteConfigUtility
ConfigurationManagerInterface::CONFIGURATION_TYPE_FULL_TYPOSCRIPT ConfigurationManagerInterface::CONFIGURATION_TYPE_FULL_TYPOSCRIPT
); );
$typoscript = GeneralUtility::removeDotsFromTS($typoscript); $typoscript = GeneralUtility::removeDotsFromTS($typoscript);
$siteConfig = $typoscript['config']['site']; $siteConfig = $typoscript;
if ($limitToSiteConfig) {
$siteConfig = $typoscript['config']['site'];
}
$current = &$siteConfig; $current = &$siteConfig;
foreach ($pathParts as $key) { foreach ($pathParts as $key) {
$current = &$current[$key]; $current = &$current[$key];

4
Resources/Private/PageTSConfig/default.tsconfig
View File

@ -1 +1,5 @@
<INCLUDE_TYPOSCRIPT: source="FILE:EXT:templates_aide/Resources/Private/PageTSConfig/lib/layout.tsconfig"> <INCLUDE_TYPOSCRIPT: source="FILE:EXT:templates_aide/Resources/Private/PageTSConfig/lib/layout.tsconfig">
[applicationContext = Development]
TCAdefaults.pages.hidden = 0
[end]