From 3e329a24cb9d7b0a4008d4b90014012234c019c8 Mon Sep 17 00:00:00 2001
From: Will Rossiter <will@fullscreen.io>
Date: Wed, 23 Jun 2021 14:19:41 +1200
Subject: [PATCH] FIX Don't rely on _SERVER values for redirect

Related issue: https://github.com/silverstripe/silverstripe-sharedraftcontent/pull/144

If a redirection is handled internally (such as the linked shareddraftcontent module) then the $_SERVER properties aren't updated directly, but are via the `Environment` API.
---
 src/Middleware/TrailingSlashRedirector.php | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/Middleware/TrailingSlashRedirector.php b/src/Middleware/TrailingSlashRedirector.php
index 932226f..8930ac9 100644
--- a/src/Middleware/TrailingSlashRedirector.php
+++ b/src/Middleware/TrailingSlashRedirector.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Axllent\TrailingSlash\Middleware;
 
 use SilverStripe\Control\Controller;
@@ -7,6 +8,7 @@
 use SilverStripe\Control\HTTPResponse;
 use SilverStripe\Control\Middleware\HTTPMiddleware;
 use SilverStripe\Core\Config\Config;
+use SilverStripe\Core\Environment;
 
 /**
  * Ensure that a single trailing slash is always added to the URL.
@@ -33,6 +35,13 @@ class TrailingSlashRedirector implements HTTPMiddleware
     private static $ignore_agents = [
         'silverstripe/staticpublishqueue',
     ];
+    
+    /**
+     * Redirection status code
+     *
+     * @var int
+     */
+    private static $redirection_status_code = 301;
 
     /**
      * Process request
@@ -66,7 +75,7 @@ public function process(HTTPRequest $request, callable $delegate)
                 return $delegate($request);
             }
 
-            $requested_url = $_SERVER['REQUEST_URI'];
+            $requested_url = Environment::getEnv('REQUEST_URI');
 
             $expected_url = rtrim(
                 Director::baseURL() . $request->getURL(), '/'
@@ -94,8 +103,11 @@ public function process(HTTPRequest $request, callable $delegate)
                 $params       = $request->getVars();
                 $redirect_url = Controller::join_links($expected_url, '/');
                 $response     = new HTTPResponse();
-
-                return $response->redirect($redirect_url, 301);
+                $code = Config::inst()->get(
+                    TrailingSlashRedirector::class, 
+                    'redirection_status_code'
+                );
+                return $response->redirect($redirect_url, $code);
             }
         }