[TASK] Add missing RST for #102799

The RST and some templates adaptions have been missed in the 11.5 backport of #102799. Resolves: #103109 Related: #102799 Releases: 11.5 Change-Id: Ib3279436003417415cc286873f7959d618f6e02a Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/82969 Reviewed-by: Andreas Kienast <a.fernandez@scripting-base.de> Reviewed-by: Stefan Bürk <stefan@buerk.tech> Tested-by: Andreas Kienast <a.fernandez@scripting-base.de> Tested-by: core-ci <typo3@b13.com> Reviewed-by: Benjamin Franzke <ben@bnf.dev> Tested-by: Benjamin Franzke <ben@bnf.dev> Reviewed-by: Benni Mack <benni@typo3.org> Tested-by: Stefan Bürk <stefan@buerk.tech>
TYPO3 · Feb 13, 2024 · 6cc9270 · 6cc9270
1 parent 55873fe
commit 6cc9270
Show file tree

Hide file tree

Showing 8 changed files with 47 additions and 14 deletions.
diff --git a/...t-102799-TYPO3_CONF_VARSGFXprocessor_stripColorProfileParametersOptionAdded.rst b/...t-102799-TYPO3_CONF_VARSGFXprocessor_stripColorProfileParametersOptionAdded.rst
@@ -0,0 +1,40 @@
+.. include:: /Includes.rst.txt
+
+.. _important-102799-1707403491:
+
+===========================================================================================
+Important: #102799 - TYPO3_CONF_VARS.GFX.processor_stripColorProfileParameters option added
+===========================================================================================
+
+See :issue:`102799`
+
+Description
+===========
+
+The string-based configuration option
+:php:`$GLOBALS['TYPO3_CONF_VARS']['GFX']['processor_stripColorProfileCommand']`
+has been superseded by
+:php:`$GLOBALS['TYPO3_CONF_VARS']['GFX']['processor_stripColorProfileParameters']`
+for security reasons.
+
+The former option expected a string of command line parameters. The defined
+parameters had to be shell-escaped beforehand, while the new option expects an
+array of strings that will be shell-escaped by TYPO3 when used.
+
+The existing configuration will continue to be supported. Still, it is suggested
+to use the new configuration format, as the Install Tool is adapted to allow
+modification of the new configuration option only:
+
+..  code-block:: php
+
+    // Before
+    $GLOBALS['TYPO3_CONF_VARS']['GFX']['processor_stripColorProfileCommand'] = '+profile \'*\'';
+
+    // After
+    $GLOBALS['TYPO3_CONF_VARS']['GFX']['processor_stripColorProfileParameters'] = [
+        '+profile',
+        '*'
+    ];
+
+
+.. index:: LocalConfiguration, ext:core
diff --git a/typo3/sysext/install/Resources/Private/Partials/Settings/LocalConfiguration/SubSection.html b/typo3/sysext/install/Resources/Private/Partials/Settings/LocalConfiguration/SubSection.html
@@ -31,14 +31,7 @@ <h3 class="panel-title">
                     </f:if>
                 </div>
                 <div class="item-body">
-                    <f:if condition="{item.readonly}">
-                        <div class="t3js-infobox callout callout-info">
-                            <div class="callout-body">
-                                For security reasons, this option cannot be changed here.<br>
-                                Please configure via <code>typo3conf/LocalConfiguration.php</code> or <code>typo3conf/AdditionalConfiguration.php</code>.
-                            </div>
-                        </div>
-                    </f:if>
+                    <f:render partial="Settings/ReadonlyInfo" arguments="{configuration: item}" />
                     <f:if condition="{item.differentValueInCurrentConfiguration}">
                         <div class="t3js-infobox callout callout-sm callout-warning">
                             <div class="callout-body">

diff --git a/typo3/sysext/install/Resources/Private/Partials/Settings/Presets/Cache/Custom.html b/typo3/sysext/install/Resources/Private/Partials/Settings/Presets/Cache/Custom.html
@@ -17,6 +17,7 @@
         <div class="row mb-3">
             <label class="col-sm-6 col-form-label" for="{feature.name}{preset.name}{configurationKey}">{configurationKey}</label>
             <div class="col-sm-6">
+                <f:render partial="Settings/ReadonlyInfo" arguments="{configuration: configuration}" />
                 <input
                     id="{feature.name}{preset.name}{configurationKey}"
                     type="text"
@@ -26,7 +27,6 @@
                     data-radio="t3-install-tool-configuration-cache-custom"
                     {f:if(condition: configuration.readonly, then: 'disabled')}
                     />
-                <f:render partial="Settings/Presets/ReadonlyInfo" arguments="{configuration: configuration}" />
             </div>
         </div>
     </f:for>

diff --git a/typo3/sysext/install/Resources/Private/Partials/Settings/Presets/Context/Custom.html b/typo3/sysext/install/Resources/Private/Partials/Settings/Presets/Context/Custom.html
@@ -18,6 +18,7 @@
         <div class="row mb-3">
             <label class="col-sm-4 col-form-label" for="{feature.name}{preset.name}{configurationKey}">{configurationKey}</label>
             <div class="col-sm-8">
+                <f:render partial="Settings/ReadonlyInfo" arguments="{configuration: configuration}" />
                 <input
                     id="{feature.name}{preset.name}{configurationKey}"
                     type="text"
@@ -27,7 +28,6 @@
                     data-radio="t3-install-tool-configuration-context-custom"
                     {f:if(condition: configuration.readonly, then: 'disabled')}
                 />
-                <f:render partial="Settings/Presets/ReadonlyInfo" arguments="{configuration: configuration}" />
             </div>
         </div>
     </f:for>

diff --git a/typo3/sysext/install/Resources/Private/Partials/Settings/Presets/Image/Custom.html b/typo3/sysext/install/Resources/Private/Partials/Settings/Presets/Image/Custom.html
@@ -19,6 +19,7 @@
         <div class="row mb-3">
             <label class="col-sm-4 col-form-label" for="{feature.name}{preset.name}{configurationKey}">{configurationKey}</label>
             <div class="col-sm-8">
+                <f:render partial="Settings/ReadonlyInfo" arguments="{configuration: configuration}" />
                 <input
                     id="{feature.name}{preset.name}{configurationKey}"
                     type="text"
@@ -28,7 +29,6 @@
                     data-radio="t3-install-tool-configuration-image-custom"
                     {f:if(condition: configuration.readonly, then: 'disabled')}
                 />
-                <f:render partial="Settings/Presets/ReadonlyInfo" arguments="{configuration: configuration}" />
             </div>
         </div>
     </f:for>

diff --git a/typo3/sysext/install/Resources/Private/Partials/Settings/Presets/Mail/Custom.html b/typo3/sysext/install/Resources/Private/Partials/Settings/Presets/Mail/Custom.html
@@ -18,6 +18,7 @@
         <div class="row mb-3">
             <label class="col-sm-6 col-form-label" for="{feature.name}{preset.name}{configurationKey}">{configurationKey}</label>
             <div class="col-sm-6">
+                <f:render partial="Settings/ReadonlyInfo" arguments="{configuration: configuration}" />
                 <input
                     id="{feature.name}{preset.name}{configurationKey}"
                     type="{f:if(condition: '{configurationKey} == "MAIL/transport_smtp_password"', then: 'password', else: 'text')}"
@@ -28,7 +29,6 @@
                     data-radio="t3-install-tool-configuration-mail-custom"
                     {f:if(condition: configuration.readonly, then: 'disabled')}
                     />
-                <f:render partial="Settings/Presets/ReadonlyInfo" arguments="{configuration: configuration}" />
             </div>
         </div>
     </f:for>

diff --git a/typo3/sysext/install/Resources/Private/Partials/Settings/Presets/PasswordHashing/Custom.html b/typo3/sysext/install/Resources/Private/Partials/Settings/Presets/PasswordHashing/Custom.html
@@ -20,6 +20,7 @@
         <div class="row mb-3">
             <label class="col-sm-6 col-form-label" for="{feature.name}{preset.name}{configurationKey}">{configurationKey}</label>
             <div class="col-sm-6">
+                <f:render partial="Settings/ReadonlyInfo" arguments="{configuration: configuration}" />
                 <input
                     id="{feature.name}{preset.name}{configurationKey}"
                     type="text"
@@ -29,7 +30,6 @@
                     data-radio="t3-install-tool-configuration-passwordHashing-custom"
                     {f:if(condition: configuration.readonly, then: 'disabled')}
                     />
-                <f:render partial="Settings/Presets/ReadonlyInfo" arguments="{configuration: configuration}" />
             </div>
         </div>
     </f:for>

diff --git a/...rtials/Settings/Presets/ReadonlyInfo.html → ...ivate/Partials/Settings/ReadonlyInfo.html b/...rtials/Settings/Presets/ReadonlyInfo.html → ...ivate/Partials/Settings/ReadonlyInfo.html
@@ -1,6 +1,6 @@
 <html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">
     <f:if condition="{configuration.readonly}">
-        <div class="t3js-infobox callout callout-info mt-1 mb-0">
+        <div class="t3js-infobox callout callout-info">
             <div class="callout-body">
                 For security reasons, this option cannot be changed here.<br>
                 Please configure via <code>typo3conf/LocalConfiguration.php</code> or <code>typo3conf/AdditionalConfiguration.php</code>.