From 4b955a89ccd4a2cf547c70f4c4003befdfcc7db1 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/kanban-board.tpl.php     | 14 +++++++-------
 Theme/Backend/kanban-card.tpl.php      |  6 +++---
 Theme/Backend/kanban-dashboard.tpl.php |  6 +++---
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/Theme/Backend/kanban-board.tpl.php b/Theme/Backend/kanban-board.tpl.php
index 95f32f1..0e09947 100644
--- a/Theme/Backend/kanban-board.tpl.php
+++ b/Theme/Backend/kanban-board.tpl.php
@@ -5,16 +5,16 @@ $columns = $board->getColumns();
 ?>
 <div class="row">
     <?php $i = 0; foreach($columns as $column) : $i++; $cards = $column->getCards(); ?>
-    <div id="kanban-column-<?= htmlspecialchars($i, ENT_COMPAT, 'utf-8'); ?>" class="col-xs-12 col-sm-3" draggable="true">
-        <header><?= htmlspecialchars($column->getName(), ENT_COMPAT, 'utf-8'); ?></header>
+    <div id="kanban-column-<?= $this->printHtml($i); ?>" class="col-xs-12 col-sm-3" draggable="true">
+        <header><?= $this->printHtml($column->getName()); ?></header>
         <?php $j = 0; foreach($cards as $card) : $j++; $labels = $card->getLabels(); ?>
-            <a href="<?= htmlspecialchars(\phpOMS\Uri\UriFactory::build('{/base}/{/lang}/backend/kanban/card?{?}&id=' . $card->getId()), ENT_COMPAT, 'utf-8'); ?>">
-            <section id="kanban-card-<?= htmlspecialchars($i . '-' . $j, ENT_COMPAT, 'utf-8'); ?>" class="box wf-100" draggable="true">
-                <header><h1><?= htmlspecialchars($card->getName(), ENT_COMPAT, 'utf-8'); ?></h1></header>
+            <a href="<?= $this->printHtml(\phpOMS\Uri\UriFactory::build('{/base}/{/lang}/backend/kanban/card?{?}&id=' . $card->getId())); ?>">
+            <section id="kanban-card-<?= $this->printHtml($i . '-' . $j); ?>" class="box wf-100" draggable="true">
+                <header><h1><?= $this->printHtml($card->getName()); ?></h1></header>
                 <div class="inner">
-                    <?= htmlspecialchars($card->getDescription(), ENT_COMPAT, 'utf-8'); ?>
+                    <?= $this->printHtml($card->getDescription()); ?>
                     <?php foreach($labels as $label) : ?>
-                    <span class="tag" style="background: #<?= htmlspecialchars(dechex($label->getColor()), ENT_COMPAT, 'utf-8'); ?>"><?= htmlspecialchars($label->getName(), ENT_COMPAT, 'utf-8'); ?></span>
+                    <span class="tag" style="background: #<?= $this->printHtml(dechex($label->getColor())); ?>"><?= $this->printHtml($label->getName()); ?></span>
                     <?php endforeach; ?>
                 </div>
             </section>
diff --git a/Theme/Backend/kanban-card.tpl.php b/Theme/Backend/kanban-card.tpl.php
index 4e0a918..f4c352f 100644
--- a/Theme/Backend/kanban-card.tpl.php
+++ b/Theme/Backend/kanban-card.tpl.php
@@ -6,9 +6,9 @@ $comments = $card->getComments();
 <div class="row">
     <div class="col-xs-12">
         <section class="box wf-100">
-            <header><h1><?= htmlspecialchars($card->getName(), ENT_COMPAT, 'utf-8'); ?></h1></header>
+            <header><h1><?= $this->printHtml($card->getName()); ?></h1></header>
             <div class="inner">
-                <?= htmlspecialchars($card->getDescription(), ENT_COMPAT, 'utf-8'); ?>
+                <?= $this->printHtml($card->getDescription()); ?>
             </div>
         </section>
     </div>
@@ -19,7 +19,7 @@ $comments = $card->getComments();
     <div class="col-xs-12">
         <section class="box wf-100">
             <div class="inner">
-                <?= htmlspecialchars($comment->getDescription(), ENT_COMPAT, 'utf-8'); ?>
+                <?= $this->printHtml($comment->getDescription()); ?>
             </div>
         </section>
     </div>
diff --git a/Theme/Backend/kanban-dashboard.tpl.php b/Theme/Backend/kanban-dashboard.tpl.php
index e4f7cb8..a96e494 100644
--- a/Theme/Backend/kanban-dashboard.tpl.php
+++ b/Theme/Backend/kanban-dashboard.tpl.php
@@ -6,11 +6,11 @@ echo $this->getData('nav')->render(); ?>
 <div class="row">
     <?php foreach($boards as $board) : ?>  
     <div class="col-xs-12 col-sm-6 col-lg-3">
-        <a href="<?= htmlspecialchars(\phpOMS\Uri\UriFactory::build('{/base}/{/lang}/backend/kanban/board?{?}&id=' . $board->getId()), ENT_COMPAT, 'utf-8'); ?>">
+        <a href="<?= $this->printHtml(\phpOMS\Uri\UriFactory::build('{/base}/{/lang}/backend/kanban/board?{?}&id=' . $board->getId())); ?>">
         <section class="box wf-100">
-            <header><h1><?= htmlspecialchars($board->getName(), ENT_COMPAT, 'utf-8'); ?></h1></header>
+            <header><h1><?= $this->printHtml($board->getName()); ?></h1></header>
             <div class="inner">
-                <?= htmlspecialchars($board->getDescription(), ENT_COMPAT, 'utf-8'); ?>
+                <?= $this->printHtml($board->getDescription()); ?>
             </div>
         </section>
         </a>