Adjust include rendering, add global ssi context indicator

andersundsehr · Oct 7, 2024 · 322ce99 · 322ce99
1 parent 4b80639
commit 322ce99
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/Classes/Middleware/InternalSsiRedirectMiddleware.php b/Classes/Middleware/InternalSsiRedirectMiddleware.php
@@ -14,10 +14,14 @@
 
 class InternalSsiRedirectMiddleware implements MiddlewareInterface
 {
+    public static int $SSI_CONTEXT = 0;
+
     public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
     {
         if (isset($request->getQueryParams()['ssi_include'])) {
-            putenv('SSI_CONTEXT=1');
+            self::$SSI_CONTEXT = 1;
+
+            $originalRequestPath = $request->getQueryParams()['originalRequestPath'] ?? '';
             $ssiInclude = $request->getQueryParams()['ssi_include'];
             if (!preg_match('/^(\w+)$/', (string) $ssiInclude)) {
                 return new HtmlResponse('ssi_include invalid', 400);
@@ -27,7 +31,11 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface
             $absolutePath = Environment::getPublicPath() . $cacheFileName;
             if (!file_exists($absolutePath)) {
                 // ignore response use the content of the file:
-                $handler->handle($request->withAttribute('noCache', true));
+                $handler->handle(
+                    $request
+                        ->withAttribute('noCache', true)
+                        ->withUri($request->getUri()->withPath($originalRequestPath))
+                );
             }
 
             return new HtmlResponse(file_get_contents($absolutePath) ?: '');

diff --git a/Classes/ViewHelpers/RenderIncludeViewHelper.php b/Classes/ViewHelpers/RenderIncludeViewHelper.php
@@ -71,7 +71,7 @@ public static function renderStatic(array $arguments, Closure $renderChildrenClo
         }
 
         $method = self::getExtensionConfiguration()->get('ssi_include', 'method') ?: self::METHOD_SSI;
-        $reqUrl = $basePath . '?ssi_include=' . $filename;
+        $reqUrl = $basePath . '?ssi_include=' . $filename . '&originalRequestUri=' . urlencode($_SERVER['REQUEST_URI']);
         if ($method === self::METHOD_ESI) {
             return '<esi:include src="' . $reqUrl . '" />';
         }