From 55566853bd1617b1ad12a512303223029e9586b4 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/dashboard-news.tpl.php |  4 ++--
 Theme/Backend/news-archive.tpl.php   |  8 ++++----
 Theme/Backend/news-create.tpl.php    | 12 ++++++------
 Theme/Backend/news-dashboard.tpl.php |  8 ++++----
 Theme/Backend/news-single.tpl.php    |  4 ++--
 5 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/Theme/Backend/dashboard-news.tpl.php b/Theme/Backend/dashboard-news.tpl.php
index e722525..4834b62 100644
--- a/Theme/Backend/dashboard-news.tpl.php
+++ b/Theme/Backend/dashboard-news.tpl.php
@@ -36,8 +36,8 @@ $newsList = $this->getData('news');
             ?>
             <tr data-href="<?= $url; ?>">
                 <td data-label=""><a href="<?= $url; ?>"><?= $news->isFeatured() ? '<i class="fa fa-star favorite"></i>' : ''; ?></a>
-                <td data-label="<?= $this->getHtml('Type', 'News') ?>"><a href="<?= $url; ?>"><span class="tag <?= htmlspecialchars($color, ENT_COMPAT, 'utf-8'); ?>"><?= $this->getHtml('TYPE' . $news->getType(), 'News') ?></span></a>
-                <td data-label="<?= $this->getHtml('Title', 'News') ?>"><a href="<?= $url; ?>"><?= htmlspecialchars($news->getTitle(), ENT_COMPAT, 'utf-8'); ?></a>
+                <td data-label="<?= $this->getHtml('Type', 'News') ?>"><a href="<?= $url; ?>"><span class="tag <?= $this->printHtml($color); ?>"><?= $this->getHtml('TYPE' . $news->getType(), 'News') ?></span></a>
+                <td data-label="<?= $this->getHtml('Title', 'News') ?>"><a href="<?= $url; ?>"><?= $this->printHtml($news->getTitle()); ?></a>
                     <?php endforeach; ?>
                     <?php if($count === 0) : ?>
             <tr><td colspan="5" class="empty"><?= $this->getHtml('Empty', 0, 0); ?>
diff --git a/Theme/Backend/news-archive.tpl.php b/Theme/Backend/news-archive.tpl.php
index 3f670cd..ea84b87 100644
--- a/Theme/Backend/news-archive.tpl.php
+++ b/Theme/Backend/news-archive.tpl.php
@@ -46,10 +46,10 @@ echo $this->getData('nav')->render(); ?>
                             elseif($news->getType() === \Modules\News\Models\NewsType::LINK) { $color = 'yellow'; } 
                         ?>
                             <tr>
-                                <td><span class="tag <?= htmlspecialchars($color, ENT_COMPAT, 'utf-8'); ?>"><?= $this->getHtml('TYPE' . $news->getType()) ?></span></a>
-                                <td><a href="<?= $url; ?>"><?= htmlspecialchars($news->getTitle(), ENT_COMPAT, 'utf-8'); ?></a>
-                                <td><a href="<?= $url; ?>"><?= htmlspecialchars($news->getCreatedBy()->getName1(), ENT_COMPAT, 'utf-8'); ?></a>
-                                <td><a href="<?= $url; ?>"><?= htmlspecialchars($news->getPublish()->format('Y-m-d'), ENT_COMPAT, 'utf-8'); ?></a>
+                                <td><span class="tag <?= $this->printHtml($color); ?>"><?= $this->getHtml('TYPE' . $news->getType()) ?></span></a>
+                                <td><a href="<?= $url; ?>"><?= $this->printHtml($news->getTitle()); ?></a>
+                                <td><a href="<?= $url; ?>"><?= $this->printHtml($news->getCreatedBy()->getName1()); ?></a>
+                                <td><a href="<?= $url; ?>"><?= $this->printHtml($news->getPublish()->format('Y-m-d')); ?></a>
                         <?php endforeach; ?>
                         <?php if($count === 0) : ?>
                 <tr><td colspan="4" class="empty"><?= $this->getHtml('Empty', 0, 0); ?>
diff --git a/Theme/Backend/news-create.tpl.php b/Theme/Backend/news-create.tpl.php
index 9619e05..5b017b8 100644
--- a/Theme/Backend/news-create.tpl.php
+++ b/Theme/Backend/news-create.tpl.php
@@ -44,10 +44,10 @@ echo $this->getData('nav')->render(); ?>
                     <table class="layout wf-100">
                         <tr><td colspan="2"><label for="publish"><?= $this->getHtml('Status'); ?></label>
                         <tr><td colspan="2"><select name="status">
-                                    <option value="<?= htmlspecialchars(Modules\News\Models\NewsStatus::DRAFT, ENT_COMPAT, 'utf-8'); ?>" selected><?= $this->getHtml('Draft'); ?>
-                                    <option value="<?= htmlspecialchars(Modules\News\Models\NewsStatus::VISIBLE, ENT_COMPAT, 'utf-8'); ?>"><?= $this->getHtml('Visible'); ?>
+                                    <option value="<?= $this->printHtml(Modules\News\Models\NewsStatus::DRAFT); ?>" selected><?= $this->getHtml('Draft'); ?>
+                                    <option value="<?= $this->printHtml(Modules\News\Models\NewsStatus::VISIBLE); ?>"><?= $this->getHtml('Visible'); ?>
                         <tr><td colspan="2"><label for="publish"><?= $this->getHtml('Publish'); ?></label>
-                        <tr><td colspan="2"><input type="datetime-local" id="publish" value="<?= htmlspecialchars((new \DateTime('NOW'))->format('Y-m-d\TH:i:s'), ENT_COMPAT, 'utf-8'); ?>">
+                        <tr><td colspan="2"><input type="datetime-local" id="publish" value="<?= $this->printHtml((new \DateTime('NOW'))->format('Y-m-d\TH:i:s')); ?>">
                         <tr><td><input type="submit" value="<?= $this->getHtml('Delete', 0); ?>"><td class="rightText"><input type="submit" value="<?= $this->getHtml('Save', 0); ?>"> <input type="submit" value="<?= $this->getHtml('Publish'); ?>">
                     </table>
                 </form>
@@ -57,9 +57,9 @@ echo $this->getData('nav')->render(); ?>
             <div class="inner">
                 <table class="layout wf-100">
                     <tr><td colspan="2"><label><?= $this->getHtml('Type'); ?></label>
-                    <tr><td colspan="2"><span class="radio"><input type="radio" name="type" form="docForm" value="<?= htmlspecialchars(Modules\News\Models\NewsType::ARTICLE, ENT_COMPAT, 'utf-8'); ?>" id="news" checked><label for="news"><?= $this->getHtml('News'); ?></label></span>
-                    <tr><td colspan="2"><span class="radio"><input type="radio" name="type" form="docForm" value="<?= htmlspecialchars(Modules\News\Models\NewsType::HEADLINE, ENT_COMPAT, 'utf-8'); ?>" id="headline"><label for="headline"><?= $this->getHtml('Headline'); ?></label></span>
-                    <tr><td colspan="2"><span class="radio"><input type="radio" name="type" form="docForm" value="<?= htmlspecialchars(Modules\News\Models\NewsType::LINK, ENT_COMPAT, 'utf-8'); ?>" id="link"><label for="link"><?= $this->getHtml('Link'); ?></label></span>
+                    <tr><td colspan="2"><span class="radio"><input type="radio" name="type" form="docForm" value="<?= $this->printHtml(Modules\News\Models\NewsType::ARTICLE); ?>" id="news" checked><label for="news"><?= $this->getHtml('News'); ?></label></span>
+                    <tr><td colspan="2"><span class="radio"><input type="radio" name="type" form="docForm" value="<?= $this->printHtml(Modules\News\Models\NewsType::HEADLINE); ?>" id="headline"><label for="headline"><?= $this->getHtml('Headline'); ?></label></span>
+                    <tr><td colspan="2"><span class="radio"><input type="radio" name="type" form="docForm" value="<?= $this->printHtml(Modules\News\Models\NewsType::LINK); ?>" id="link"><label for="link"><?= $this->getHtml('Link'); ?></label></span>
                 </table>
             </div>
         </section>
diff --git a/Theme/Backend/news-dashboard.tpl.php b/Theme/Backend/news-dashboard.tpl.php
index 1b9c97f..ebc706c 100644
--- a/Theme/Backend/news-dashboard.tpl.php
+++ b/Theme/Backend/news-dashboard.tpl.php
@@ -41,10 +41,10 @@ echo $this->getData('nav')->render(); ?>
                 ?>
                 <tr data-href="<?= $url; ?>">
                     <td data-label=""><a href="<?= $url; ?>"><?= $news->isFeatured() ? '<i class="fa fa-star favorite"></i>' : ''; ?></a>
-                    <td data-label="<?= $this->getHtml('Type') ?>"><a href="<?= $url; ?>"><span class="tag <?= htmlspecialchars($color, ENT_COMPAT, 'utf-8'); ?>"><?= $this->getHtml('TYPE' . $news->getType()) ?></span></a>
-                    <td data-label="<?= $this->getHtml('Title') ?>"><a href="<?= $url; ?>"><?= htmlspecialchars($news->getTitle(), ENT_COMPAT, 'utf-8'); ?></a>
-                    <td data-label="<?= $this->getHtml('Author') ?>"><a href="<?= $url; ?>"><?= htmlspecialchars($news->getCreatedBy()->getName1(), ENT_COMPAT, 'utf-8'); ?></a>
-                    <td data-label="<?= $this->getHtml('Date') ?>"><a href="<?= $url; ?>"><?= htmlspecialchars($news->getPublish()->format('Y-m-d'), ENT_COMPAT, 'utf-8'); ?></a>
+                    <td data-label="<?= $this->getHtml('Type') ?>"><a href="<?= $url; ?>"><span class="tag <?= $this->printHtml($color); ?>"><?= $this->getHtml('TYPE' . $news->getType()) ?></span></a>
+                    <td data-label="<?= $this->getHtml('Title') ?>"><a href="<?= $url; ?>"><?= $this->printHtml($news->getTitle()); ?></a>
+                    <td data-label="<?= $this->getHtml('Author') ?>"><a href="<?= $url; ?>"><?= $this->printHtml($news->getCreatedBy()->getName1()); ?></a>
+                    <td data-label="<?= $this->getHtml('Date') ?>"><a href="<?= $url; ?>"><?= $this->printHtml($news->getPublish()->format('Y-m-d')); ?></a>
                         <?php endforeach; ?>
                         <?php if($count === 0) : ?>
                 <tr><td colspan="5" class="empty"><?= $this->getHtml('Empty', 0, 0); ?>
diff --git a/Theme/Backend/news-single.tpl.php b/Theme/Backend/news-single.tpl.php
index 9f7d897..3ae77a1 100644
--- a/Theme/Backend/news-single.tpl.php
+++ b/Theme/Backend/news-single.tpl.php
@@ -21,10 +21,10 @@ echo $this->getData('nav')->render(); ?>
 <div class="row">
     <div class="col-xs-12">
         <section class="box wf-100">
-            <header><h1><?= htmlspecialchars($news->getTitle(), ENT_COMPAT, 'utf-8'); ?></h1></header>
+            <header><h1><?= $this->printHtml($news->getTitle()); ?></h1></header>
             <div class="inner">
                 <article>
-                    <?= htmlspecialchars($news->getContent(), ENT_COMPAT, 'utf-8'); ?>
+                    <?= $this->printHtml($news->getContent()); ?>
                 </article>
             </div>
         </section>