diff --git a/typo3/sysext/core/Configuration/DefaultConfigurationDescription.yaml b/typo3/sysext/core/Configuration/DefaultConfigurationDescription.yaml
index d16006d818ab76c6468b7d4642a451792a72eb48..d90d8ec43751696139d39cf639c217839448237a 100644
--- a/typo3/sysext/core/Configuration/DefaultConfigurationDescription.yaml
+++ b/typo3/sysext/core/Configuration/DefaultConfigurationDescription.yaml
@@ -30,12 +30,17 @@ GFX:
description: 'Path to the IM tool ''convert'' with LZW enabled! See ''gif_compress''. If your version 4.2.9 of ImageMagick is compiled with LZW you may leave this field blank AND disable the flag ''gif_compress''! Tip: You can call LZW ''convert'' with a prefix like ''myver_convert'' by setting this path with it, eg. <code>/usr/bin/myver_</code> instead of just <code>/usr/bin/</code>.'
processor:
type: dropdown
- allowedValues: [ 'ImageMagick', 'GraphicsMagick' ]
- description: 'Set this either to "ImageMagick" or "GraphicsMagick". Setting this value will automatically configure some settings for use with the specified program version.'
+ allowedValues:
+ 'ImageMagick': 'Choose ImageMagick for processing images'
+ 'GraphicsMagick': 'Choose GraphicsMagick for processing images'
+ description: 'Select which external software on the server should process images - see also the Preset functionality to see what is available.'
processor_effects:
type: int
- allowedValues: [ -1, 0, 1 ]
- description: '<dl><dt>0</dt><dd>disabled</dd><dt>-1</dt><dd>Do not sharpen images by default</dd><dt>1</dt><dd>All; blur and sharpening is allowed in ImageMagick.</dd></dl>'
+ allowedValues:
+ '-1': 'Do not sharpen images by default'
+ '0': 'Disable all effects from ImageMagick/GraphicsMagick'
+ '1': 'All; blur and sharpening is allowed in ImageMagick'
+ description: 'Apply special ImageMagick functionality when processing images'
processor_allowUpscaling:
type: bool
description: 'If set, images can be scaled up if told so (in <code>\TYPO3\CMS\Core\Imaging\GraphicalFunctions</code>)'
@@ -83,8 +88,11 @@ SYS:
description: 'Restricts the domain name for FE and BE session cookies. When setting the value to ".domain.com" (replace domain.com with your domain!), login sessions will be shared across subdomains. Alternatively, if you have more than one domain with sub-domains, you can set the value to a regular expression to match against the domain of the HTTP request. The result of the match is used as the domain for the cookie. eg. <code>/\.(example1|example2)\.com$/</code> or <code>/\.(example1\.com)|(example2\.net)$/</code>. Separate domains for FE and BE can be set using <a href="#FE-cookieDomain">$TYPO3_CONF_VARS[''FE''][''cookieDomain'']</a> and <a href="#BE-cookieDomain">$TYPO3_CONF_VARS[''BE''][''cookieDomain'']</a> respectively.'
cookieSecure:
type: int
- allowedValues: [ 0, 1, 2 ]
- description: '<p>Indicates that the cookie should only be transmitted over a secure HTTPS connection from the client.</p><dl><dt>0</dt><dd>always send cookie</dd><dt>1 (force HTTPS)</dt><dd>the cookie will only be set if a secure (HTTPS) connection exists - use this in combination with lockSSL since otherwise the application will fail and throw an exception</dd><dt>2</dt><dd>the cookie will be set in each case, but uses the secure flag if a secure (HTTPS) connection exists.</dd></dl>'
+ allowedValues:
+ '0': 'Always send the cookie, regardless if the connection is secure'
+ '1': 'Force HTTPS: the cookie will only be set if a secure (HTTPS) connection exists - use this in combination with lockSSL since otherwise the application will fail and throw an exception'
+ '2': 'The cookie will be set in each case, but uses the secure flag if a secure (HTTPS) connection exists'
+ description: 'Indicates that the cookie should only be transmitted over a secure HTTPS connection from the client.'
doNotCheckReferer:
type: bool
description: 'If set, it''s NOT checked numerous places that the referring host is the same as the current. This is an option you should set if you have problems with proxies not passing the HTTP_REFERER variable.'
@@ -99,8 +107,11 @@ SYS:
description: 'Defines a list of IP addresses which will allow development-output to display. The debug() function will use this as a filter. See the function <code>\TYPO3\CMS\Core\Utility\GeneralUtility::cmpIP()</code> for details on syntax. Setting this to blank value will deny all. Setting to "*" will allow all.'
sqlDebug:
type: int
- allowedValues: [ 0, 1, 2 ]
- description: '<p>Allows displaying executed SQL queries in the browser (for debugging purposes and development)</p><dl><dt>0</dt><dd>no SQL shown (default)</dd><dt>1</dt><dd>show only failed queries</dd><dt>2</dt><dd>show all queries</dd></dl>'
+ allowedValues:
+ '0': 'Disable SQL debug output'
+ '1': 'Display only failed SQL queries'
+ '2': 'Display all SQL queries'
+ description: 'Allows displaying executed SQL queries in the browser (for debugging purposes and development)'
enable_DLOG:
type: bool
description: 'Whether the developer log is enabled.'
@@ -151,8 +162,13 @@ SYS:
description: '<p>semi-colon separated list. Defines one or more logging methods. Possible methods:</p><dl><dt>file,<abs-path-to-file>[,<level>]</dt><dd>logs to a file</dd><dt>mail,<to>[/<from>][,<level>]</dt><dd>sends the log entries via mail</dd><dt>syslog,<facility>,[,<level>]</dt><dd>uses the operating system''s log. Facility may be one of LOCAL0..LOCAL7, USER (on Windows USER is the only valid type).</dd><dt>error_log[,,<level>]</dt><dd>uses the PHP error log</dd></dl><p>The <level> is the individual logging level (see <a href="#SYS-systemLogLevel">[SYS][systemLogLevel]</a>).</p>'
systemLogLevel:
type: int
- allowedValues: [ 0, 1, 2, 3, 4 ]
- description: '<p>Only messages with same or higher severity are logged.</p><ul><li>0: info</li><li>1: notice</li><li>2: warning</li><li>3: error</li><li>4: fatal error</li></ul>'
+ allowedValues:
+ '0': 'Severity: Info'
+ '1': 'Severity: Notice'
+ '2': 'Severity: Warning'
+ '3': 'Severity: Error'
+ '4': 'Severity: Fatal Error'
+ description: 'Enable the severity of log messages to be logged (see systemLog option) - Only messages with same or higher severity are logged.'
enableDeprecationLog:
type: list
description: 'If set, this configuration enables the logging of deprecated methods and functions. The following options are allowed: <dl><dt>String: "file" (or integer "1")</dt><dd>The log file will be written to typo3conf/deprecation_[hash-value].log</dd><dt>String: "devlog"</dt><dd>The log will be written to the development log</dd><dt>String: "console"<dt><dd>The log will be displayed in the Backend''s Debug Console.</dd></dl>Logging options "file", "devlog" and "console" can be combined by comma-separating them.'
@@ -167,8 +183,11 @@ SYS:
description: 'List of IP addresses. If TYPO3 is behind one or more (intransparent) reverse proxies the IP addresses must be added here.'
reverseProxyHeaderMultiValue:
type: text
- allowedValues: [ "none", "first", "last" ]
- description: 'Defines which values of a proxy header (eg HTTP_X_FORWARDED_FOR) to use, if more than one is found. "none" discards the value, "first" and "last" use the first/last of the values in the list.'
+ allowedValues:
+ 'none': 'Do not evaluate the reverse proxy header'
+ 'first': 'Use the first IP address in the proxy header'
+ 'last': 'Use the last IP address in the proxy header'
+ description: 'Defines which values of a proxy header (eg HTTP_X_FORWARDED_FOR) to use, if more than one is found.'
reverseProxyPrefix:
type: text
description: 'Optional prefix to be added to the internal URL (SCRIPT_NAME and REQUEST_URI).'
@@ -183,8 +202,11 @@ SYS:
description: 'List of comma separated tables that are categorizable by default.'
displayErrors:
type: int
- allowedValues: [ -1, 0, 1 ]
- description: '<p>Configures whether PHP errors or Exceptions should be displayed.</p><dl><dt>0</dt><dd>Do not display any PHP error message. Sets PHP "display_errors" setting to 0. Overrides the value of [SYS][exceptionalErrors] and sets it to 0 (= no errors are turned into exceptions). The configured [SYS][productionExceptionHandler] is used as exception handler.</dd><dt>1</dt><dd>Display error messages with the registered [SYS][errorHandler]. Sets PHP "display_errors" setting to 1. The configured [SYS][debugExceptionHandler] is used as exception handler.</dd><dt>-1</dt><dd>TYPO3 CMS does not touch the PHP "display_errors" setting. If [SYS][devIPmask] matches the user''s IP address, the configured [SYS][debugExceptionHandler] is used instead of the [SYS][productionExceptionHandler] to handle exceptions.</dd></dl>'
+ allowedValues:
+ '-1': 'TYPO3 does not touch the PHP setting. If [SYS][devIPmask] matches the user''s IP address, the configured [SYS][debugExceptionHandler] is used instead of the [SYS][productionExceptionHandler] to handle exceptions.'
+ '0': 'Live: Do not display any PHP error message. Sets "display_errors=0". Overrides the value of [SYS][exceptionalErrors] and sets it to 0 (= no errors are turned into exceptions). The configured [SYS][productionExceptionHandler] is used as exception handler.'
+ '1': 'Debug: Display error messages with the registered [SYS][errorHandler]. Sets "display_errors=1". The configured [SYS][debugExceptionHandler] is used as exception handler.'
+ description: 'Configures whether PHP errors or Exceptions should be displayed, effectively setting the PHP option <code>display_errors</code> during runtime.'
productionExceptionHandler:
type: phpClass
description: 'Classname to handle exceptions that might happen in the TYPO3-code. Leave empty to disable exception handling. Default: "TYPO3\CMS\Core\Error\ProductionExceptionHandler". This exception handler displays a nice error message when something went wrong. The error message is logged to the configured logs. Note: The configured "productionExceptionHandler" is used if [SYS][displayErrors] is set to "0" or is set to "-1" and [SYS][devIPmask] doesn''t match the user''s IP.'
@@ -262,8 +284,13 @@ BE:
description: 'Bit 1: If set, <code>warning_email_addr</code> will be notified every time a backend user logs in. Bit 2: If set, <code>warning_email_addr</code> will be notified every time an ADMIN backend user logs in.'
lockIP:
type: int
- allowedValues: [ 0, 1, 2, 3, 4 ]
- description: 'Session IP locking for backend users. See <a href="#FE-lockIP">[FE][lockIP]</a> for details. Default is 4 (which is locking the FULL IP address to session).'
+ allowedValues:
+ '0': 'Do not lock Backend User sessions to their IP address at all'
+ '1': 'Use the first part of the editors'' IPv4 address (e.g. "192.") as part of the session locking of Backend Users'
+ '2': 'Use the first two parts of the editors'' IPv4 address (e.g. "192.168") as part of the session locking of Backend Users'
+ '3': 'Use the first three parts of the editors'' IPv4 address (e.g. "192.168.13") as part of the session locking of Backend Users'
+ '4': 'Default: Use the full editors'' IPv4 address (e.g. "192.168.13.84") as part of the session locking of Backend Users (highest security)'
+ description: 'Session IP locking for backend users. See <a href="#FE-lockIP">[FE][lockIP]</a> for details.'
sessionTimeout:
type: int
description: 'Seconds. Session time out for backend users. The value must be at least 180 to avoid side effects. Default is 3600 seconds = 1 hour.'
@@ -296,8 +323,12 @@ BE:
description: 'If set, the Ajax relogin will show a real popup window for relogin after the count down. Some auth services need this as they add custom validation to the login form. If it''s not set, the Ajax relogin will show an inline relogin window.'
adminOnly:
type: int
- allowedValues: [ -1, 0, 1, 2 ]
- description: '<dl><dt>-1</dt><dd>total shutdown for maintenance purposes</dd><dt>0</dt><dd>normal operation, everyone can login (default)</dd><dt>1</dt><dd>only admins can login (no CLI)</dd><dt>2</dt><dd>only admins and regular CLI users can login</dd></dl>'
+ allowedValues:
+ '-1': 'Total shutdown for maintenance purposes'
+ '0': 'Default: All users can access the TYPO3 Backend'
+ '1': 'Only administrators / system maintainers can log in, CLI interface is disabled as well'
+ '2': 'Only administrators / system maintainers have access to the TYPO3 Backend, CLI executions are allowed as well'
+ description: 'Restricts access to the TYPO3 Backend - especially useful when doing maintenance or updates'
disable_exec_function:
type: bool
description: 'Don''t use exec() function (except for ImageMagick which is disabled by <a href="#GFX-im">[GFX][im]</a>=0). If set, all file operations are done by the default PHP-functions. This is necessary under Windows! On Unix the system commands by exec() can be used, unless this is disabled.'
@@ -321,8 +352,10 @@ BE:
description: 'This determines which interface options is available in the login prompt and in which order (All options: ",backend,frontend")'
explicitADmode:
type: dropdown
- allowedValues: [ 'explicitAllow', 'explicitDeny' ]
- description: 'Sets the general allow/deny mode for selector box values. Value can be either "explicitAllow" or "explicitDeny", nothing else!'
+ allowedValues:
+ 'explicitAllow': 'Administrators have to explicitly grant access for all editors and groups'
+ 'explicitDeny': 'Editors have access to all content types by default, access has to explicitly restricted'
+ description: 'Sets the general allow/deny mode for Content Element Types (CTypes) when granting or restricting access for backend users'
flexformForceCDATA:
type: bool
description: 'If set, will add CDATA to Flexform XML. Some versions of libxml have a bug that causes HTML entities to be stripped from any XML content and this setting will avoid the bug by adding CDATA.'
@@ -331,10 +364,15 @@ BE:
description: 'If set, then the diff-data of localized records is not saved automatically when updated but requires that a translator clicks the special finish_translation/save/close button that becomes available.'
versionNumberInFilename:
type: bool
- description: '<p>If TRUE, included CSS and JS files will have the timestamp embedded in the filename, ie. filename.1269312081.js. This will make browsers and proxies reload the files if they change (thus avoiding caching issues). IMPORTANT: this feature requires extra .htaccess rules to work (please refer to _.htaccess or the _.htaccess file from the dummy package)</p><p>If FALSE the filemtime will be appended as a query-string.</p>'
+ description: |
+ <p>
+ If enabled, included CSS and JS files loaded in the TYPO3 Backend will have the timestamp embedded in the filename, ie. <code>filename.1269312081.js</code>.
+ This will make browsers and proxies reload the files if they change (thus avoiding caching issues).
+ <strong>IMPORTANT:</strong> This feature requires extra <code>.htaccess</code> rules to work (please refer to the <code>_.htaccess</code> file shipped with TYPO3).</p>
+ <p>If disabled the last modification date of the file will be appended as a query-string.</p>
debug:
type: bool
- description: 'If set, the loginrefresh is disabled and pageRenderer is set to debug mode. Use this to debug the backend only!'
+ description: 'If enabled, the loginrefresh is disabled and pageRenderer is set to debug mode. Use this to debug the backend only!'
FE:
type: container
items:
@@ -343,7 +381,7 @@ FE:
description: 'Additional relative paths (comma-list) to allow TypoScript resources be in. Should be prepended with ''/''. If not, then any path where the first part is like this path will match. That is: ''myfolder/ , myarchive'' will match eg. ''myfolder/'', ''myarchive/'', ''myarchive_one/'', ''myarchive_2/'' ... No check is done to see if this directory actually exists in the root of the site. Paths are matched by simply checking if these strings equals the first part of any TypoScript resource filepath. (See class template, function init() in <code>\TYPO3\CMS\Core\TypoScript\Parser\TypoScriptParser)</code>'
debug:
type: bool
- description: 'If set, some debug HTML-comments may be output somewhere. Can also be set by TypoScript.'
+ description: 'If enabled, additional information (if the page was cached, and how long the processing took) as HTML comments is rendered at the end of each frontend request. This can also be enabled/disabled via the TypoScript option <code>config.debug = 0</code>.'
compressionLevel:
type: int
description: 'Determines output compression of FE output. Makes output smaller but slows down the page generation depending on the compression level. Requires zlib in your PHP installation. Range 1-9, where 1 is least compression and 9 is greatest compression. ''true'' as value will set the compression based on the PHP default settings (usually 5). Suggested and most optimal value is 5.'
@@ -373,17 +411,22 @@ FE:
description: 'If set, the pid of fe_user logins must be sent in the form as the field ''pid'' and then the user must be located in the pid. If you unset this, you should change the fe_users.username eval-flag ''uniqueInPid'' to ''unique'' in $TCA. This will do: <code>$TCA[''fe_users''][''columns''][''username''][''config''][''eval'']= ''nospace,lower,required,unique'';</code>'
lockIP:
type: int
- allowedValues: [ 0, 1, 2, 3, 4 ]
- description: 'If >0, fe_users are locked to (a part of) their REMOTE_ADDR IP for their session. Enhances security but may throw off users that may change IP during their session (in which case you can lower it to 2 or 3). The integer indicates how many parts of the IP address to include in the check. Reducing to 1-3 means that only first, second or third part of the IP address is used. 4 is the FULL IP address and recommended. 0 (zero) disables checking of course.'
+ allowedValues:
+ '0': 'Do not lock Frontend User sessions to their IP address at all'
+ '1': 'Use the first part of the visitors'' IPv4 address (e.g. "192.") as part of the session locking of Frontend Users'
+ '2': 'Default - Use the first two parts of the visitors'' IPv4 address (e.g. "192.168") as part of the session locking of Frontend Users'
+ '3': 'Use the first three parts of the visitors'' IPv4 address (e.g. "192.168.13") as part of the session locking of Frontend Users'
+ '4': 'Use the full visitors'' IPv4 address (e.g. "192.168.13.84") as part of the session locking of Frontend Users (highest security)'
+ description: 'If activated, Frontend Users are locked to (a part of) their public IP (<code>$_SERVER[''REMOTE_ADDR'']</code>) for their session. Enhances security but may throw off users that may change IP during their session (in which case you can lower it to 2 or 3). The integer indicates how many parts of the IP address to include in the check for session (next to the user agent)..'
loginSecurityLevel:
type: text
description: 'See description for <a href="#BE-loginSecurityLevel">[BE][loginSecurityLevel]</a>. Default state for frontend is "normal". Alternative authentication services can implement higher levels if preferred. For example, "rsa" level uses RSA password encryption (only if the rsaauth extension is installed).'
lifetime:
type: int
- description: 'Integer: positive. If >0 and the option permalogin is >=0, the cookie of FE users will have a lifetime of the number of seconds this value indicates. Otherwise it will be a session cookie (deleted when browser is shut down). Setting this value to 604800 will result in automatic login of FE users during a whole week, 86400 will keep the FE users logged in for a day.'
+ description: 'If >0 and the option permalogin is >=0, the cookie of FE users will have a lifetime of the number of seconds this value indicates. Otherwise it will be a session cookie (deleted when browser is shut down). Setting this value to 604800 will result in automatic login of FE users during a whole week, 86400 will keep the FE users logged in for a day.'
sessionDataLifetime:
type: int
- description: 'Integer: positive. If >0, the session data will timeout and be removed after the number of seconds given (86400 seconds represents 24 hours).'
+ description: 'If >0, the session data will timeout and be removed after the number of seconds given (86400 seconds represents 24 hours).'
permalogin:
type: text
description: 'In any case, permanent login is only possible if <a href="#FE-lifetime">[FE][lifetime]</a> lifetime is > 0.</dd></dl>'
@@ -418,7 +461,7 @@ FE:
description: 'If enabled, the mount_pid feature allowing ''symlinks'' in the page tree (for frontend operation) is allowed.'
hidePagesIfNotTranslatedByDefault:
type: bool
- description: 'If TRUE, pages that has no translation will be hidden by default. Basically this will inverse the effect of the page localization setting "Hide page if no translation for current language exists" to "Show page even if no translation exists"'
+ description: 'If enabled, pages that has no translation will be hidden by default. Basically this will inverse the effect of the page localization setting "Hide page if no translation for current language exists" to "Show page even if no translation exists"'
disableNoCacheParameter:
type: bool
description: 'If set, the no_cache request parameter will become ineffective. This is currently still an experimental feature and will require a website only with plugins that don''t use this parameter. However, using "&no_cache=1" should be avoided anyway because there are better ways to disable caching for a certain part of the website (see COA_INT/USER_INT documentation in TSref).'
@@ -445,8 +488,14 @@ FE:
description: 'If set, points to an HTML file relative to the TYPO3_site root which will be read and outputted as template for this message. Example: <code>fileadmin/templates/template_workspace_preview_logout.html</code>. Inside you can put the marker %1$s to insert the URL to go back to. Use this in <code><a href="%1$s">Go back...</a></code> links.'
versionNumberInFilename:
type: dropdown
- allowedValues: [ '', 'embed', 'querystring' ]
- description: 'Allows to automatically include a version number (timestamp of the file) to referred CSS and JS filenames on the rendered page. This will make browsers and proxies reload the files if they change (thus avoiding caching issues). Set to ''embed'' will have the timestamp embedded in the filename, ie. filename.1269312081.js. IMPORTANT: ''embed'' requires extra .htaccess rules to work (please refer to _.htaccess or the _.htaccess file from the dummy package)<p>Set to ''querystring'' (default setting) to append the version number as a query parameter (doesn''t require mod_rewrite).</p>'
+ allowedValues:
+ '': "Do not include the version/timestamp of the file at all"
+ 'embed': 'Include the timestamp of the last modification timestamp of files embedded in the filename - e.g. "filename.1269312081.js"'
+ 'querystring': 'Default - Append the last modification timestamp of the file as query string e.g. "filename.js?1269312081"'
+ description: |
+ Allows to automatically include a version number (timestamp of the file) to referred CSS and JS filenames
+ on the rendered page. This will make browsers and proxies reload the files if they change (thus avoiding caching issues).
+ <strong>IMPORTANT</strong>: ''embed'' requires extra <code>.htaccess</code> rules to work (please refer to the <code>_.htaccess</code> file shipped with TYPO3)'
MAIL:
type: container
items:
diff --git a/typo3/sysext/install/Resources/Private/Partials/Action/Tool/Settings/LocalConfiguration/SubSection.html b/typo3/sysext/install/Resources/Private/Partials/Action/Tool/Settings/LocalConfiguration/SubSection.html
index b71942b9761d7c26374759d2ab9b38ec5111aa22..e5ee69d7e3a1511bcd88301451d8a286353b036a 100644
--- a/typo3/sysext/install/Resources/Private/Partials/Action/Tool/Settings/LocalConfiguration/SubSection.html
+++ b/typo3/sysext/install/Resources/Private/Partials/Action/Tool/Settings/LocalConfiguration/SubSection.html
@@ -49,8 +49,8 @@
<select
data-path="{sectionName}/{item.key}"
class="t3-install-form-input-text form-control t3js-localConfiguration-pathValue">
- <f:for each="{item.allowedValues}" as="value">
- <option value="{item.value}" {f:if(condition:'{item.value} == {value}', then: 'selected="selected"')}>{value}</option>
+ <f:for each="{item.allowedValues}" key="optionKey" as="optionLabel">
+ <option value="{optionKey}" {f:if(condition:'{item.value} == {optionKey}', then: 'selected="selected"')}>{optionLabel} ({optionKey})</option>
</f:for>
</select>
</div>