Provide basePath support (#309)
* Provide basePath support To be able to serve the application via a reverse proxy in a subfolder smarty needs to be aware of the basepath if any. * Provide basepath support via X-Forwarded headers * Fix warnings * Review adjustments * Provide support X-Forwarded-Host header * Use $uri in view factory directly * Use middleware to set basepath from X-Forwarded-Path header * Fix invalid type hint in RouterPathMiddleware * Add "X-Forwarded-Host" to README
This commit is contained in:
parent
234ecc2c6d
commit
c5298dd24b
4 changed files with 71 additions and 2 deletions
|
@ -33,14 +33,32 @@ class ViewFactory
|
|||
}
|
||||
|
||||
$view = new Smarty(__DIR__ . '/../templates/');
|
||||
|
||||
$uri = $request->getUri();
|
||||
if (in_array('https', $request->getHeader('X-Forwarded-Proto'))) {
|
||||
$request = $request->withUri($request->getUri()->withScheme('https')->withPort(443));
|
||||
$uri = $uri->withScheme('https')->withPort(443);
|
||||
}
|
||||
|
||||
// set values from X-Forwarded-* headers
|
||||
$host = current($request->getHeader('X-Forwarded-Host'));
|
||||
if ($host) {
|
||||
$uri = $uri->withHost($host);
|
||||
}
|
||||
|
||||
$port = current($request->getHeader('X-Forwarded-Port'));
|
||||
if ($port) {
|
||||
$uri = $uri->withPort(intVal($port));
|
||||
}
|
||||
|
||||
$path = current($request->getHeader('X-Forwarded-Path'));
|
||||
if ($path) {
|
||||
$uri = $uri->withBasePath($path);
|
||||
}
|
||||
|
||||
/** @var LocaleManager $localeManager */
|
||||
$localeManager = $container->get('locale');
|
||||
|
||||
$smartyPlugins = new SmartyPlugins($container->get('router'), $request->getUri()->withUserInfo(null));
|
||||
$smartyPlugins = new SmartyPlugins($container->get('router'), $uri->withUserInfo(null));
|
||||
$view->registerPlugin('function', 'path_for', [$smartyPlugins, 'pathFor']);
|
||||
$view->registerPlugin('function', 'base_url', [$smartyPlugins, 'baseUrl']);
|
||||
$view->registerPlugin('block', 't', [$localeManager, 'smartyTranslate']);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue