From ded62f8600e51fbcf1783627c0f2f232a60166ae Mon Sep 17 00:00:00 2001
From: Dennis Eichhorn <spl1nes.com@googlemail.com>
Date: Thu, 14 Sep 2017 20:39:58 +0200
Subject: [PATCH] Simplify htmlescape

---
 Theme/Backend/side.tpl.php   | 6 +++---
 Theme/Backend/splash.tpl.php | 2 +-
 Theme/Backend/top.tpl.php    | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Theme/Backend/side.tpl.php b/Theme/Backend/side.tpl.php
index 6444240..cb32f11 100644
--- a/Theme/Backend/side.tpl.php
+++ b/Theme/Backend/side.tpl.php
@@ -17,13 +17,13 @@
 if (isset($this->nav[\Modules\Navigation\Models\NavigationType::SIDE])) : ?>
     <ul id="nav-side" class="nav" role="navigation">
         <?php foreach ($this->nav[\Modules\Navigation\Models\NavigationType::SIDE][\Modules\Navigation\Models\LinkType::CATEGORY] as $key => $parent) : ?>
-        <li><input id="nav-<?= htmlspecialchars($parent['nav_name'], ENT_COMPAT, 'utf-8'); ?>" type="checkbox">
+        <li><input id="nav-<?= $this->printHtml($parent['nav_name']); ?>" type="checkbox">
             <ul>
                 <li>
                     <?php if (isset($parent['nav_icon'])) : ?>
-                        <span class="centerText" style="width: 20px; display: inline-block;"><i class="<?= htmlspecialchars($parent['nav_icon'], ENT_COMPAT, 'utf-8'); ?>"></i></span>
+                        <span class="centerText" style="width: 20px; display: inline-block;"><i class="<?= $this->printHtml($parent['nav_icon']); ?>"></i></span>
                     <?php endif; ?>
-                    <?= $this->getHtml($parent['nav_name']) ?><label for="nav-<?= htmlspecialchars($parent['nav_name'], ENT_COMPAT, 'utf-8'); ?>"><i class="fa fa-chevron-down min"></i>
+                    <?= $this->getHtml($parent['nav_name']) ?><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 foreach ($this->nav[\Modules\Navigation\Models\NavigationType::SIDE][\Modules\Navigation\Models\LinkType::LINK] as $key2 => $link) :
                     if ($link['nav_parent'] === $parent['nav_id']) : ?>
diff --git a/Theme/Backend/splash.tpl.php b/Theme/Backend/splash.tpl.php
index 1d3dc85..fd3e080 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])) :
                 <section class="box w-33 floatLeft">
                     <div class="inner centerText">
                         <a href="<?= \phpOMS\Uri\UriFactory::build($link['nav_uri']); ?>">
-                            <p><i class="fa-5x <?= htmlspecialchars($link['nav_icon'], ENT_COMPAT, 'utf-8'); ?>"></i></p>
+                            <p><i class="fa-5x <?= $this->printHtml($link['nav_icon']); ?>"></i></p>
                             <p><?= $this->getHtml($link['nav_name']); ?></p>
                         </a>
                     </div>
diff --git a/Theme/Backend/top.tpl.php b/Theme/Backend/top.tpl.php
index 42f677e..cda88e1 100644
--- a/Theme/Backend/top.tpl.php
+++ b/Theme/Backend/top.tpl.php
@@ -23,7 +23,7 @@ if (isset($this->nav[\Modules\Navigation\Models\NavigationType::TOP])): ?>
         <li><a href="<?= \phpOMS\Uri\UriFactory::build($link['nav_uri']); ?>">
 
                 <?php if (isset($link['nav_icon'])) : ?>
-                    <i class="<?= htmlspecialchars($link['nav_icon'], ENT_COMPAT, 'utf-8'); ?> infoIcon"><?php if(isset($unread[$link['nav_from']]) && $unread[$link['nav_from']] > 0) : ?><span class="badge"><?= htmlspecialchars($unread[$link['nav_from']], ENT_COMPAT, 'utf-8'); ?></span><?php endif; ?></i>
+                    <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>