Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 15 additions & 3 deletions src/Middleware/TrailingSlashRedirector.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php

namespace Axllent\TrailingSlash\Middleware;

use SilverStripe\Control\Controller;
Expand All @@ -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.
Expand All @@ -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
Expand Down Expand Up @@ -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(), '/'
Expand Down Expand Up @@ -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);
}
}

Expand Down