v13 fixes and config updates

composer.json

@@ -38,7 +38,7 @@
         "friendsoftypo3/tt-address": "^9.0",
         "sjbr/sr-feuser-register": "^13.4",
         "bobosch/ods-osm": "^4.3",
-        "minifranske/fs-media-gallery": "^5.0",
+        "minifranske/fs-media-gallery": "^5.x-dev",
         "t3brightside/embedassets": "^1.4",
         "typo3/cms-filelist": "^13.4",
         "typo3/cms-fluid-styled-content": "^13.4",
@@ -66,5 +66,10 @@
         "typo3/cms": {
             "web-dir": "public"
         }
+    },
+    "scripts": {
+        "post-autoload-dump": [
+            "@php patches/fix_fs_media_gallery_album_assign.php"
+        ]
     }
 }

config/system/settings.php

@@ -78,6 +78,7 @@ return [
             'dateTimeNotRequired' => '0',
             'hidePageTreeForAdministrationModule' => '0',
             'manualSorting' => '0',
+            'pageTreePluginPreview' => '1',
             'prependAtCopy' => '1',
             'resourceFolderImporter' => '/news_import',
             'rteForTeaser' => '0',
@@ -132,7 +133,6 @@ return [
     'GFX' => [
         'jpg_quality' => '80',
         'processor' => 'ImageMagick',
-        'processor_allowTemporaryMasksAsPng' => 0,
         'processor_colorspace' => 'RGB',
         'processor_effects' => false,
         'processor_enabled' => '1',
@@ -202,12 +202,10 @@ return [
         'displayErrors' => 1,
         'encryptionKey' => 'efccad22f08ec986fda57f4e46959a58eb14d68c3f43726306c7850ba81e5ae0bc621f40cf3ab47589bbef1c3f23f96f',
         'exceptionalErrors' => 4096,
-        'features' => [
+        'features' => [],
-            'security.usePasswordPolicyForFrontendUsers' => true,
-        ],
-        'sitename' => 'Carte da legare',
         'lang' => [
             'requireApprovedLocalizations' => false,
         ],
+        'sitename' => 'Carte da legare',
     ],
 ];

patches/fix_fs_media_gallery_album_assign.php

@@ -0,0 +1,24 @@
+<?php
+
+declare(strict_types=1);
+
+$file = dirname(__DIR__) . '/vendor/minifranske/fs-media-gallery/Classes/Controller/MediaAlbumController.php';
+
+echo "Fix sending incorrect variable to Fluid template - 20260714\n\n";
+
+if (file_exists($file)) {
+    $content = file_get_contents($file);
+
+    $oldLine = '\'mediaAlbum\' => $mediaAlbum,';
+    $newLine = '\'mediaAlbum\' => $mediaAlbumObject,';
+
+    if (strpos($content, $oldLine) !== false) {
+        $content = str_replace($oldLine, $newLine, $content);
+        file_put_contents($file, $content);
+        echo "\n-> [SUCCESS] Patch fs_media_gallery applied!\n\n";
+    } else {
+        echo "\n-> [INFO] Patch fs_media_gallery not applied or row not found.\n\n";
+    }
+} else {
+    echo "\n-> [ERROR] Unable to find fs-media-gallery file.\n\n";
+}

public/.htaccess

@@ -173,6 +173,10 @@
 
 	ExpiresByType text/x-cross-domain-policy            "access plus 1 week"
 
+	<FilesMatch "^index\.php$">
+		ExpiresActive Off
+	</FilesMatch>
+
 </IfModule>
 
 ### End: Browser caching of resource files ###
@@ -202,7 +206,7 @@
 	AddType application/xml                             rdf xml
 
 	# JavaScript
-	AddType application/javascript                      js
+	AddType application/javascript                      js mjs
 
 	# Manifest files
 	AddType application/manifest+json                   webmanifest
@@ -303,7 +307,7 @@ AddDefaultCharset utf-8
 	# IMPORTANT: This rule has to be the very first RewriteCond in order to work!
 	RewriteCond %{REQUEST_FILENAME} !-f
 	RewriteCond %{REQUEST_FILENAME} !-d
-	RewriteRule ^(.+)\.(\d+)\.(php|js|css|png|jpg|gif|gz)$ %{ENV:CWD}$1.$3 [L]
+	RewriteRule ^(.+)\.(\d+)\.(php|js|mjs|css|png|jpg|gif|svg|avif|webp|gz)$ %{ENV:CWD}$1.$3 [L]
 
 	# Access block for folders
 	RewriteRule _(?:recycler|temp)_/ - [F]
@@ -318,15 +322,13 @@ AddDefaultCharset utf-8
 	RewriteCond %{SCRIPT_FILENAME} -f
 	RewriteRule (?:^|/)\. - [F]
 
-	# Stop rewrite processing, if we are in any other known directory
+	# Stop rewrite processing, if we are in any known directory
 	# NOTE: Add your additional local storages here
 	RewriteRule ^(?:fileadmin/|typo3conf/|typo3temp/|uploads/) - [L]
 
-	# If the file/symlink/directory does not exist but is below /typo3/, redirect to the TYPO3 Backend entry point.
+	# If the file/symlink/directory does not exist but is below /typo3/, redirect to the main TYPO3 entry point.
 	RewriteCond %{REQUEST_FILENAME} !-f
-	RewriteCond %{REQUEST_FILENAME} !-d
+	RewriteRule ^typo3/(.*)$ %{ENV:CWD}index.php [QSA,L]
-	RewriteCond %{REQUEST_FILENAME} !-l
-	RewriteRule ^typo3/(.*)$ %{ENV:CWD}typo3/index.php [QSA,L]
 
 	# If the file/symlink/directory does not exist => Redirect to index.php.
 	# For httpd.conf, you need to prefix each '%{REQUEST_FILENAME}' with '%{DOCUMENT_ROOT}'.

public/index.php

@@ -16,6 +16,6 @@
 // Set up the application for the frontend
 call_user_func(static function () {
     $classLoader = require dirname(__DIR__).'/vendor/autoload.php';
-    \TYPO3\CMS\Core\Core\SystemEnvironmentBuilder::run(0, \TYPO3\CMS\Core\Core\SystemEnvironmentBuilder::REQUESTTYPE_FE);
+    \TYPO3\CMS\Core\Core\SystemEnvironmentBuilder::run();
-    \TYPO3\CMS\Core\Core\Bootstrap::init($classLoader)->get(\TYPO3\CMS\Frontend\Http\Application::class)->run();
+    \TYPO3\CMS\Core\Core\Bootstrap::init($classLoader)->get(\TYPO3\CMS\Core\Http\Application::class)->run();
 });

public/typo3/index.php

@@ -13,9 +13,36 @@
  * The TYPO3 project - inspiring people to share!
  */
 
-// Set up the application for the backend
+// Legacy wrapper for typo3/index.php
-call_user_func(static function () {
+// @deprecated will be removed in TYPO3 v14, /index.php entrypoint should be used directly
-    $classLoader = require dirname(dirname(__DIR__)).'/vendor/autoload.php';
+
-    \TYPO3\CMS\Core\Core\SystemEnvironmentBuilder::run(1, \TYPO3\CMS\Core\Core\SystemEnvironmentBuilder::REQUESTTYPE_BE);
+// defer deprecation log message
-    \TYPO3\CMS\Core\Core\Bootstrap::init($classLoader)->get(\TYPO3\CMS\Backend\Http\Application::class)->run();
+$_SERVER['TYPO3_DEPRECATED_ENTRYPOINT'] = 1;
-});
+
+array_map(
+    static function (string $var): void {
+        $setenv = static function (string $name, ?string $value = null): void {
+            // If PHP is running as an Apache module and an existing
+            // Apache environment variable exists, overwrite it
+            if (function_exists('apache_getenv') && function_exists('apache_setenv') && apache_getenv($name)) {
+                apache_setenv($name, $value);
+            }
+
+            if (function_exists('putenv')) {
+                putenv("$name=$value");
+            }
+
+            $_ENV[$name] = $value;
+        };
+
+        if (isset($_SERVER[$var])) {
+            $_SERVER[$var] = str_replace('/typo3/index.php', '/index.php', $_SERVER[$var]);
+        }
+        if (isset($_ENV[$var])) {
+            $setenv($var, str_replace('/typo3/index.php', '/index.php', $_ENV[$var]));
+        }
+    },
+    ['SCRIPT_NAME', 'SCRIPT_FILENAME', 'SCRIPT_URI', 'SCRIPT_URL', 'PHP_SELF'],
+);
+
+require '../index.php';

public/typo3/install.php

@@ -15,6 +15,6 @@
 
 call_user_func(static function () {
     $classLoader = require dirname(dirname(__DIR__)).'/vendor/autoload.php';
-    \TYPO3\CMS\Core\Core\SystemEnvironmentBuilder::run(1, \TYPO3\CMS\Core\Core\SystemEnvironmentBuilder::REQUESTTYPE_INSTALL);
+    \TYPO3\CMS\Core\Core\SystemEnvironmentBuilder::run(1);
     \TYPO3\CMS\Core\Core\Bootstrap::init($classLoader, true)->get(\TYPO3\CMS\Install\Http\Application::class)->run();
 });