Skip to content
Snippets Groups Projects
Commit 4c169c16 authored by Torsten Oppermann's avatar Torsten Oppermann
Browse files

[TASK] Fixing minor issues

parent 55f79be9
No related branches found
No related tags found
1 merge request!11Feature security update
......@@ -385,12 +385,10 @@ class MailController extends ActionController {
}
// provide code example on how to register correctly
$code = '$GLOBALS[\'sgmail\'][\'' . $extensionName . '\'][\''
$code = '$GLOBALS[\'sg_mail\'][\'' . $extensionName . '\'][\''
. \str_replace('.php', '', $configFile)
. '\'] = \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath(\''
. $extensionName . '\') . \'/Configuration/SgMail/' . $configFile . '\';';
. '\'] = \'EXT:' . $extensionName . '/Configuration/SgMail/' . $configFile . '\';';
$deprecationWarnings[] = [
'file' => $configFile,
'code' => $code
];
}
......
......@@ -824,7 +824,7 @@ class MailTemplateService {
if (!\file_exists($pathToRegistrationFile)) {
continue;
}
$GLOBALS['sgmail']['sg_mail'][$configFile] = $pathToRegistrationFile;
$GLOBALS['sg_mail']['sg_mail'][$configFile] = $pathToRegistrationFile;
}
}
}
......
......@@ -91,7 +91,7 @@ class RegisterService implements \TYPO3\CMS\Core\SingletonInterface {
MailTemplateService::registerExtensions();
}
foreach ($GLOBALS['sgmail'] as $extension) {
foreach ($GLOBALS['sg_mail'] as $extension) {
foreach ($extension as $key => $registerFile) {
if (\is_file($registerFile)) {
$configArray = (include $registerFile);
......
......@@ -25,7 +25,7 @@ sg_mail ist multi-site and multi-language ready.
To register your extension with sg_mail, you need a **Configuration File** for each template you want to integrate.
It needs be a *.php* file and has to be inside the Configuration folder **typo3conf/ext/{your_extension}/Configuration/Sgmail** of your extension.
Additionally you need to make your registration file known in your **ext_local_conf.php** file:
Additionally you need to make your registration file known in your **ext_localconf.php** file:
// register mail templates
$GLOBALS['sgmail']['my_extension_key']['unique_template_name'] = \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('my_extension_key') . '/Configuration/SgMail/MyTemplate.php';
......
......@@ -107,9 +107,9 @@
</trans-unit>
<trans-unit id="backend.deprecationInfo" approved="yes" xml:space="preserve">
<source><![CDATA[Some template configurations have been registered in an old way and won`t work in future versions.
Please register your configurations in the according ext_local_conf.php.]]></source>
Please register your configurations in the according ext_localconf.php.]]></source>
<target><![CDATA[Es wurden Template Registrierungen entdeckt, die in zukünftigen Versionen nicht mehr funktionieren werden.
Bitte registrieren Sie Ihre Templates in den entsprechenden ext_local_conf.php Dateien.]]></target>
Bitte registrieren Sie Ihre Templates in den entsprechenden ext_localconf.php Dateien.]]></target>
</trans-unit>
<trans-unit id="backend.description" approved="yes">
<source><![CDATA[Description]]></source>
......
......@@ -50,7 +50,7 @@
</trans-unit>
<trans-unit id="backend.deprecationInfo" xml:space="preserve">
<source><![CDATA[Some template configurations have been registered in an old way and won`t work in future versions.
Please register your configurations in the according ext_local_conf.php.]]></source>
Please register your configurations in the according ext_localconf.php.]]></source>
</trans-unit>
<trans-unit id="backend.configuration">
<source><![CDATA[Configuration editor]]></source>
......
......@@ -34,7 +34,6 @@
<div id="deprecationPanel" class="collapse">
<div class="panel-body">
<f:for each="{deprecationWarnings}" as="warning">
<b>{warning.file}</b><br>
<small>{warning.code}</small>
<br>
</f:for>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment