From e2560cd9cb6f34598d13fd663828205d9f0ba891 Mon Sep 17 00:00:00 2001
From: Pierre Rudloff <contact@rudloff.pro>
Date: Mon, 19 Oct 2020 22:24:59 +0200
Subject: [PATCH] Code cleanup

---
 classes/ViewFactory.php | 13 ++++++-------
 index.php               |  7 ++++---
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/classes/ViewFactory.php b/classes/ViewFactory.php
index 23f3957..253492f 100644
--- a/classes/ViewFactory.php
+++ b/classes/ViewFactory.php
@@ -8,6 +8,7 @@ namespace Alltube;
 
 use Psr\Container\ContainerInterface;
 use Slim\Http\Request;
+use Slim\Http\Uri;
 use Slim\Views\Smarty;
 use Slim\Views\SmartyPlugins;
 use SmartyException;
@@ -34,31 +35,29 @@ class ViewFactory
 
         $view = new Smarty(__DIR__ . '/../templates/');
 
+        /** @var Uri $uri */
         $uri = $request->getUri();
         if (in_array('https', $request->getHeader('X-Forwarded-Proto'))) {
             $uri = $uri->withScheme('https')->withPort(443);
         }
 
         // set values from X-Forwarded-* headers
-        $host = current($request->getHeader('X-Forwarded-Host'));
-        if ($host) {
+        if ($host = current($request->getHeader('X-Forwarded-Host'))) {
             $uri = $uri->withHost($host);
         }
 
-        $port = current($request->getHeader('X-Forwarded-Port'));
-        if ($port) {
+        if ($port = current($request->getHeader('X-Forwarded-Port'))) {
             $uri = $uri->withPort(intVal($port));
         }
 
-        $path = current($request->getHeader('X-Forwarded-Path'));
-        if ($path) {
+        if ($path = current($request->getHeader('X-Forwarded-Path'))) {
             $uri = $uri->withBasePath($path);
         }
 
         /** @var LocaleManager $localeManager */
         $localeManager = $container->get('locale');
 
-        $smartyPlugins = new SmartyPlugins($container->get('router'), $uri->withUserInfo(null));
+        $smartyPlugins = new SmartyPlugins($container->get('router'), $uri->withUserInfo(''));
         $view->registerPlugin('function', 'path_for', [$smartyPlugins, 'pathFor']);
         $view->registerPlugin('function', 'base_url', [$smartyPlugins, 'baseUrl']);
         $view->registerPlugin('block', 't', [$localeManager, 'smartyTranslate']);
diff --git a/index.php b/index.php
index 137e1fd..02c8eb8 100644
--- a/index.php
+++ b/index.php
@@ -33,15 +33,16 @@ try {
     // Locales.
     $container['locale'] = LocaleManagerFactory::create();
 
-    $app->add(new LocaleMiddleware($container));
-    $app->add(new RouterPathMiddleware($container));
-
     // Smarty.
     $container['view'] = ViewFactory::create($container);
 
     // Logger.
     $container['logger'] = LoggerFactory::create($container);
 
+    // Middlewares.
+    $app->add(new LocaleMiddleware($container));
+    $app->add(new RouterPathMiddleware($container));
+
     // Controllers.
     $frontController = new FrontController($container);
     $jsonController = new JsonController($container);