From 2154a130957b47587020914e17a467424db60e68 Mon Sep 17 00:00:00 2001
From: Dennis Eichhorn <spl1nes.com@googlemail.com>
Date: Sun, 30 Dec 2018 19:50:36 +0100
Subject: [PATCH] minor performance improvements

---
 Controller/BackendController.php | 10 +++++-----
 Theme/Backend/mid-side.tpl.php   |  2 +-
 Theme/Backend/mid.tpl.php        |  2 +-
 Theme/Backend/side.tpl.php       |  4 ++--
 Theme/Backend/splash.tpl.php     |  2 +-
 Theme/Backend/top.tpl.php        |  2 +-
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/Controller/BackendController.php b/Controller/BackendController.php
index d15bebb..fdf5ae5 100644
--- a/Controller/BackendController.php
+++ b/Controller/BackendController.php
@@ -106,19 +106,19 @@ final class BackendController extends Controller
     public function loadLanguage(RequestAbstract $request, ResponseAbstract $response) : void
     {
         $languages = $this->app->moduleManager->getLanguageFiles($request);
+        $langCode  = $response->getHeader()->getL11n()->getLanguage();
 
         foreach ($languages as $path) {
-            if ($path[strlen($path) - 1] === '/') {
-                // Is not a navigation file
+            $path = __DIR__ . '/../../..' . $path . '.' . $langCode . '.lang.php';
+
+            if (!\file_exists($path)) {
                 continue;
             }
 
-            $path = __DIR__ . '/../../..' . $path . '.' . $response->getHeader()->getL11n()->getLanguage() . '.lang.php';
-
             /** @noinspection PhpIncludeInspection */
             $lang = include $path;
 
-            $this->app->l11nManager->loadLanguage($response->getHeader()->getL11n()->getLanguage(), 'Navigation', $lang);
+            $this->app->l11nManager->loadLanguage($langCode, 'Navigation', $lang);
         }
     }
 
diff --git a/Theme/Backend/mid-side.tpl.php b/Theme/Backend/mid-side.tpl.php
index 98ce3e3..3c1c639 100644
--- a/Theme/Backend/mid-side.tpl.php
+++ b/Theme/Backend/mid-side.tpl.php
@@ -17,7 +17,7 @@
 /* Looping through all links */
 if (isset($this->nav[\Modules\Navigation\Models\NavigationType::CONTENT_SIDE])) {
     echo '<div class="b b-5 c3-2 c3" id="i3-2-5">'
-         . '<h1>' . $this->getHtml('Navigation')
+         . '<h1>' . $this->getHtml('Navigation', 'Navigation')
          . '<i class="fa fa-minus min"></i><i class="fa fa-plus max vh"></i>'
          . '</h1>'
          . '<div class="bc-1">'
diff --git a/Theme/Backend/mid.tpl.php b/Theme/Backend/mid.tpl.php
index a0089e8..84b956f 100644
--- a/Theme/Backend/mid.tpl.php
+++ b/Theme/Backend/mid.tpl.php
@@ -23,7 +23,7 @@ if (isset($this->nav[\Modules\Navigation\Models\NavigationType::CONTENT])
         foreach ($parent as $link) {
             if ($link['nav_parent'] === $this->parent) {
                 echo '<li><a href="' . \phpOMS\Uri\UriFactory::build($link['nav_uri']) . '">'
-                     . $this->getHtml($link['nav_name']) . '</a>';
+                     . $this->getHtml($link['nav_name'], 'Navigation') . '</a>';
             }
         }
     }
diff --git a/Theme/Backend/side.tpl.php b/Theme/Backend/side.tpl.php
index 9a554e0..5bca8e4 100644
--- a/Theme/Backend/side.tpl.php
+++ b/Theme/Backend/side.tpl.php
@@ -22,13 +22,13 @@ if (isset($this->nav[\Modules\Navigation\Models\NavigationType::SIDE])) : ?>
                     <?php if (isset($parent['nav_icon'])) : ?>
                         <span class="centerText"><i class="<?= $this->printHtml($parent['nav_icon']); ?>"></i></span>
                     <?php endif; ?>
-                    <?= $this->getHtml($parent['nav_name']) ?><label for="nav-<?= $this->printHtml($parent['nav_name']); ?>"><i class="fa fa-chevron-down min"></i>
+                    <?= $this->getHtml($parent['nav_name'], 'Navigation') ?><label for="nav-<?= $this->printHtml($parent['nav_name']); ?>"><i class="fa fa-chevron-down min"></i>
                     <i class="fa fa-chevron-up max"></i></label>
                     <?php if (isset($this->nav[\Modules\Navigation\Models\NavigationType::SIDE][\Modules\Navigation\Models\LinkType::LINK])) :
                         foreach ($this->nav[\Modules\Navigation\Models\NavigationType::SIDE][\Modules\Navigation\Models\LinkType::LINK] as $key2 => $link) :
                     if ($link['nav_parent'] === $key) : ?>
                 <li>
-                    <a href="<?= \phpOMS\Uri\UriFactory::build($link['nav_uri']); ?>"><?= $this->getHtml($link['nav_name']) ?></a>
+                    <a href="<?= \phpOMS\Uri\UriFactory::build($link['nav_uri']); ?>"><?= $this->getHtml($link['nav_name'], 'Navigation') ?></a>
                     <?php endif;
                     endforeach; endif; ?>
             </ul>
diff --git a/Theme/Backend/splash.tpl.php b/Theme/Backend/splash.tpl.php
index 4954ef2..a78cd85 100644
--- a/Theme/Backend/splash.tpl.php
+++ b/Theme/Backend/splash.tpl.php
@@ -21,7 +21,7 @@ if (isset($this->nav[\Modules\Navigation\Models\NavigationType::CONTENT])) :
                     <div class="inner centerText">
                         <a href="<?= \phpOMS\Uri\UriFactory::build($link['nav_uri']); ?>">
                             <p><i class="fa-5x <?= $this->printHtml($link['nav_icon']); ?>"></i></p>
-                            <p><?= $this->getHtml($link['nav_name']); ?></p>
+                            <p><?= $this->getHtml($link['nav_name'], 'Navigation'); ?></p>
                         </a>
                     </div>
                 </section>
diff --git a/Theme/Backend/top.tpl.php b/Theme/Backend/top.tpl.php
index c6f24fa..1547034 100644
--- a/Theme/Backend/top.tpl.php
+++ b/Theme/Backend/top.tpl.php
@@ -25,7 +25,7 @@ if (isset($this->nav[\Modules\Navigation\Models\NavigationType::TOP])): ?>
                     <i class="<?= $this->printHtml($link['nav_icon']); ?> infoIcon"><?php if (isset($unread[$link['nav_from']]) && $unread[$link['nav_from']] > 0) : ?><span class="badge"><?= $this->printHtml($unread[$link['nav_from']]); ?></span><?php endif; ?></i>
                 <?php endif; ?>
 
-                <?= $this->getHtml($link['nav_name']) ?></a>
+                <?= $this->getHtml($link['nav_name'], 'Navigation') ?></a>
             <?php endforeach;
             endforeach; ?>