From bb061970221ad57256ac1ace34a9192482bda2cf 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/accounts-create.tpl.php  | 12 ++++++------
 Theme/Backend/accounts-list.tpl.php    |  8 ++++----
 Theme/Backend/accounts-single.tpl.php  | 24 ++++++++++++------------
 Theme/Backend/groups-create.tpl.php    |  6 +++---
 Theme/Backend/groups-list.tpl.php      |  4 ++--
 Theme/Backend/groups-single.tpl.php    |  6 +++---
 Theme/Backend/modules-list.tpl.php     |  6 +++---
 Theme/Backend/modules-single.tpl.php   | 12 ++++++------
 Theme/Backend/settings-general.tpl.php | 18 +++++++++---------
 9 files changed, 48 insertions(+), 48 deletions(-)

diff --git a/Theme/Backend/accounts-create.tpl.php b/Theme/Backend/accounts-create.tpl.php
index c9931f4..716dcce 100644
--- a/Theme/Backend/accounts-create.tpl.php
+++ b/Theme/Backend/accounts-create.tpl.php
@@ -23,15 +23,15 @@ echo $this->getData('nav')->render(); ?>
                         <tbody>
                         <tr><td><label for="iType"><?= $this->getHtml('Type'); ?></label>
                         <tr><td><select id="iType" name="type">
-                                    <option value="<?= htmlspecialchars(\phpOMS\Account\AccountType::USER, ENT_COMPAT, 'utf-8'); ?>"><?= $this->getHtml('Person'); ?>
-                                    <option value="<?= htmlspecialchars(\phpOMS\Account\AccountType::GROUP, ENT_COMPAT, 'utf-8'); ?>"><?= $this->getHtml('Organization'); ?>
+                                    <option value="<?= $this->printHtml(\phpOMS\Account\AccountType::USER); ?>"><?= $this->getHtml('Person'); ?>
+                                    <option value="<?= $this->printHtml(\phpOMS\Account\AccountType::GROUP); ?>"><?= $this->getHtml('Organization'); ?>
                                 </select>
                         <tr><td><label for="iStatus"><?= $this->getHtml('Status'); ?></label>
                         <tr><td><select id="iStatus" name="status">
-                                    <option value="<?= htmlspecialchars(\phpOMS\Account\AccountStatus::ACTIVE, ENT_COMPAT, 'utf-8'); ?>"><?= $this->getHtml('Active'); ?>
-                                    <option value="<?= htmlspecialchars(\phpOMS\Account\AccountStatus::INACTIVE, ENT_COMPAT, 'utf-8'); ?>"><?= $this->getHtml('Inactive'); ?>
-                                    <option value="<?= htmlspecialchars(\phpOMS\Account\AccountStatus::TIMEOUT, ENT_COMPAT, 'utf-8'); ?>"><?= $this->getHtml('Timeout'); ?>
-                                    <option value="<?= htmlspecialchars(\phpOMS\Account\AccountStatus::BANNED, ENT_COMPAT, 'utf-8'); ?>"><?= $this->getHtml('Banned'); ?>
+                                    <option value="<?= $this->printHtml(\phpOMS\Account\AccountStatus::ACTIVE); ?>"><?= $this->getHtml('Active'); ?>
+                                    <option value="<?= $this->printHtml(\phpOMS\Account\AccountStatus::INACTIVE); ?>"><?= $this->getHtml('Inactive'); ?>
+                                    <option value="<?= $this->printHtml(\phpOMS\Account\AccountStatus::TIMEOUT); ?>"><?= $this->getHtml('Timeout'); ?>
+                                    <option value="<?= $this->printHtml(\phpOMS\Account\AccountStatus::BANNED); ?>"><?= $this->getHtml('Banned'); ?>
                                 </select>
                         <tr><td><label for="iUsername"><?= $this->getHtml('Username'); ?></label>
                         <tr><td><input id="iUsername" name="name" type="text" placeholder="&#xf007; Fred">
diff --git a/Theme/Backend/accounts-list.tpl.php b/Theme/Backend/accounts-list.tpl.php
index 2e3097a..64febb6 100644
--- a/Theme/Backend/accounts-list.tpl.php
+++ b/Theme/Backend/accounts-list.tpl.php
@@ -49,11 +49,11 @@ echo $this->getData('nav')->render();
                         elseif($value->getStatus() === \phpOMS\Account\AccountStatus::TIMEOUT) { $color = 'purple'; }
                         elseif($value->getStatus() === phpOMS\Account\AccountStatus::BANNED) { $color = 'red'; } ?>
                 <tr data-href="<?= $url; ?>">
-                    <td><a href="<?= $url; ?>"><?= htmlspecialchars($value->getId(), ENT_COMPAT, 'utf-8'); ?></a>
+                    <td><a href="<?= $url; ?>"><?= $this->printHtml($value->getId()); ?></a>
                     <td><a href="<?= $url; ?>"><span class="tag <?= $color; ?>"><?= $this->getHtml('Status'. $value->getStatus()); ?></span></a>
-                    <td><a href="<?= $url; ?>"><?= htmlspecialchars($value->getName1(), ENT_COMPAT, 'utf-8'); ?></a>
-                    <td><a href="<?= $url; ?>"><?= htmlspecialchars($value->getLastActive()->format('Y-m-d H:i:s'), ENT_COMPAT, 'utf-8'); ?></a>
-                    <td><a href="<?= $url; ?>"><?= htmlspecialchars($value->getCreatedAt()->format('Y-m-d H:i:s'), ENT_COMPAT, 'utf-8'); ?></a>
+                    <td><a href="<?= $url; ?>"><?= $this->printHtml($value->getName1()); ?></a>
+                    <td><a href="<?= $url; ?>"><?= $this->printHtml($value->getLastActive()->format('Y-m-d H:i:s')); ?></a>
+                    <td><a href="<?= $url; ?>"><?= $this->printHtml($value->getCreatedAt()->format('Y-m-d H:i:s')); ?></a>
                         <?php endforeach; ?>
                         <?php if($c === 0) : ?>
                         <tr><td colspan="5" class="empty"><?= $this->getHtml('Empty', 0, 0); ?>
diff --git a/Theme/Backend/accounts-single.tpl.php b/Theme/Backend/accounts-single.tpl.php
index ad0109d..4766bbd 100644
--- a/Theme/Backend/accounts-single.tpl.php
+++ b/Theme/Backend/accounts-single.tpl.php
@@ -27,29 +27,29 @@ echo $this->getData('nav')->render(); ?>
                     <table class="layout wf-100">
                         <tbody>
                         <tr><td><label for="iId"><?= $this->getHtml('ID', 0, 0); ?></label>
-                        <tr><td><input id="iId" name="id" type="text" value="<?= htmlspecialchars($account->getId(), ENT_COMPAT, 'utf-8'); ?>" disabled>
+                        <tr><td><input id="iId" name="id" type="text" value="<?= $this->printHtml($account->getId()); ?>" disabled>
                         <tr><td><label for="iType"><?= $this->getHtml('Type'); ?></label>
                         <tr><td><select id="iType" name="type">
-                                    <option value="<?= htmlspecialchars(\phpOMS\Account\AccountType::USER, ENT_COMPAT, 'utf-8'); ?>"<?= htmlspecialchars($account->getType() === \phpOMS\Account\AccountType::USER ? ' selected' : '', ENT_COMPAT, 'utf-8'); ?>><?= $this->getHtml('Person'); ?>
-                                    <option value="<?= htmlspecialchars(\phpOMS\Account\AccountType::GROUP, ENT_COMPAT, 'utf-8'); ?>"<?= htmlspecialchars($account->getType() === \phpOMS\Account\AccountType::GROUP ? ' selected' : '', ENT_COMPAT, 'utf-8'); ?>><?= $this->getHtml('Organization'); ?>
+                                    <option value="<?= $this->printHtml(\phpOMS\Account\AccountType::USER); ?>"<?= $this->printHtml($account->getType() === \phpOMS\Account\AccountType::USER ? ' selected' : ''); ?>><?= $this->getHtml('Person'); ?>
+                                    <option value="<?= $this->printHtml(\phpOMS\Account\AccountType::GROUP); ?>"<?= $this->printHtml($account->getType() === \phpOMS\Account\AccountType::GROUP ? ' selected' : ''); ?>><?= $this->getHtml('Organization'); ?>
                                 </select>
                         <tr><td><label for="iStatus"><?= $this->getHtml('Status'); ?></label>
                         <tr><td><select id="iStatus" name="status">
-                                    <option value="<?= htmlspecialchars(\phpOMS\Account\AccountStatus::ACTIVE, ENT_COMPAT, 'utf-8'); ?>"<?= htmlspecialchars($account->getStatus() === \phpOMS\Account\AccountStatus::ACTIVE ? ' selected' : '', ENT_COMPAT, 'utf-8'); ?>><?= $this->getHtml('Active'); ?>
-                                    <option value="<?= htmlspecialchars(\phpOMS\Account\AccountStatus::INACTIVE, ENT_COMPAT, 'utf-8'); ?>"<?= htmlspecialchars($account->getStatus() === \phpOMS\Account\AccountStatus::INACTIVE ? ' selected' : '', ENT_COMPAT, 'utf-8'); ?>><?= $this->getHtml('Inactive'); ?>
-                                    <option value="<?= htmlspecialchars(\phpOMS\Account\AccountStatus::TIMEOUT, ENT_COMPAT, 'utf-8'); ?>"<?= htmlspecialchars($account->getStatus() === \phpOMS\Account\AccountStatus::TIMEOUT ? ' selected' : '', ENT_COMPAT, 'utf-8'); ?>><?= $this->getHtml('Timeout'); ?>
-                                    <option value="<?= htmlspecialchars(\phpOMS\Account\AccountStatus::BANNED, ENT_COMPAT, 'utf-8'); ?>"<?= htmlspecialchars($account->getStatus() === \phpOMS\Account\AccountStatus::BANNED ? ' selected' : '', ENT_COMPAT, 'utf-8'); ?>><?= $this->getHtml('Banned'); ?>
+                                    <option value="<?= $this->printHtml(\phpOMS\Account\AccountStatus::ACTIVE); ?>"<?= $this->printHtml($account->getStatus() === \phpOMS\Account\AccountStatus::ACTIVE ? ' selected' : ''); ?>><?= $this->getHtml('Active'); ?>
+                                    <option value="<?= $this->printHtml(\phpOMS\Account\AccountStatus::INACTIVE); ?>"<?= $this->printHtml($account->getStatus() === \phpOMS\Account\AccountStatus::INACTIVE ? ' selected' : ''); ?>><?= $this->getHtml('Inactive'); ?>
+                                    <option value="<?= $this->printHtml(\phpOMS\Account\AccountStatus::TIMEOUT); ?>"<?= $this->printHtml($account->getStatus() === \phpOMS\Account\AccountStatus::TIMEOUT ? ' selected' : ''); ?>><?= $this->getHtml('Timeout'); ?>
+                                    <option value="<?= $this->printHtml(\phpOMS\Account\AccountStatus::BANNED); ?>"<?= $this->printHtml($account->getStatus() === \phpOMS\Account\AccountStatus::BANNED ? ' selected' : ''); ?>><?= $this->getHtml('Banned'); ?>
                                 </select>
                         <tr><td><label for="iUsername"><?= $this->getHtml('Username'); ?></label>
-                        <tr><td><input id="iUsername" name="name" type="text" placeholder="&#xf007; Fred" value="<?= htmlspecialchars($account->getName(), ENT_COMPAT, 'utf-8'); ?>" disabled>
+                        <tr><td><input id="iUsername" name="name" type="text" placeholder="&#xf007; Fred" value="<?= $this->printHtml($account->getName()); ?>" disabled>
                         <tr><td><label for="iName1"><?= $this->getHtml('Name1'); ?></label>
-                        <tr><td><input id="iName1" name="name1" type="text" placeholder="&#xf007; Donald" value="<?= htmlspecialchars($account->getName1(), ENT_COMPAT, 'utf-8'); ?>" required>
+                        <tr><td><input id="iName1" name="name1" type="text" placeholder="&#xf007; Donald" value="<?= $this->printHtml($account->getName1()); ?>" required>
                         <tr><td><label for="iName2"><?= $this->getHtml('Name2'); ?></label>
-                        <tr><td><input id="iName2" name="name2" type="text" placeholder="&#xf007; Fauntleroy" value="<?= htmlspecialchars($account->getName2(), ENT_COMPAT, 'utf-8'); ?>">
+                        <tr><td><input id="iName2" name="name2" type="text" placeholder="&#xf007; Fauntleroy" value="<?= $this->printHtml($account->getName2()); ?>">
                         <tr><td><label for="iName3"><?= $this->getHtml('Name3'); ?></label>
-                        <tr><td><input id="iName3" name="name3" type="text" placeholder="&#xf007; Duck" value="<?= htmlspecialchars($account->getName3(), ENT_COMPAT, 'utf-8'); ?>">
+                        <tr><td><input id="iName3" name="name3" type="text" placeholder="&#xf007; Duck" value="<?= $this->printHtml($account->getName3()); ?>">
                         <tr><td><label for="iEmail"><?= $this->getHtml('Email'); ?></label>
-                        <tr><td><input id="iEmail" name="email" type="email" placeholder="&#xf0e0; d.duck@duckburg.com" value="<?= htmlspecialchars($account->getEmail(), ENT_COMPAT, 'utf-8'); ?>">
+                        <tr><td><input id="iEmail" name="email" type="email" placeholder="&#xf0e0; d.duck@duckburg.com" value="<?= $this->printHtml($account->getEmail()); ?>">
                         <tr><td><label for="iPassword"><?= $this->getHtml('Name3'); ?></label>
                         <tr><td><input id="iPassword" name="password" type="text" placeholder="&#xf023; Pa55ssw0rd?">
                         <tr><td><input type="submit" value="<?= $this->getHtml('Save', 0, 0); ?>">
diff --git a/Theme/Backend/groups-create.tpl.php b/Theme/Backend/groups-create.tpl.php
index 8df8344..cdd6026 100644
--- a/Theme/Backend/groups-create.tpl.php
+++ b/Theme/Backend/groups-create.tpl.php
@@ -22,13 +22,13 @@ echo $this->getData('nav')->render(); ?>
         <section class="box wf-100">
             <header><h1><?= $this->getHtml('Group'); ?></h1></header>
             <div class="inner">
-                <form id="group-create" action="<?= \phpOMS\Uri\UriFactory::build('{/base}/{/lang}/api/admin/group'); ?>" method="<?= htmlspecialchars(\phpOMS\Message\Http\RequestMethod::PUT, ENT_COMPAT, 'utf-8'); ?>">
+                <form id="group-create" action="<?= \phpOMS\Uri\UriFactory::build('{/base}/{/lang}/api/admin/group'); ?>" method="<?= $this->printHtml(\phpOMS\Message\Http\RequestMethod::PUT); ?>">
                     <table class="layout wf-100">
                         <tbody>
                         <tr><td colspan="2"><label for="iStatus"><?= $this->getHtml('Status'); ?></label>
                         <tr><td colspan="2"><select id="iStatus" name="status">
-                                    <option value="<?= htmlspecialchars(\phpOMS\Account\GroupStatus::ACTIVE, ENT_COMPAT, 'utf-8'); ?>" selected><?= $this->getHtml('Active'); ?>
-                                    <option value="<?= htmlspecialchars(\phpOMS\Account\GroupStatus::INACTIVE, ENT_COMPAT, 'utf-8'); ?>"><?= $this->getHtml('Inactive'); ?>
+                                    <option value="<?= $this->printHtml(\phpOMS\Account\GroupStatus::ACTIVE); ?>" selected><?= $this->getHtml('Active'); ?>
+                                    <option value="<?= $this->printHtml(\phpOMS\Account\GroupStatus::INACTIVE); ?>"><?= $this->getHtml('Inactive'); ?>
                         <tr><td><label for="iGname"><?= $this->getHtml('Name'); ?></label>
                         <tr><td><input id="iGname" name="name" type="text" placeholder="&#xf0c0; Guest" required>
                         <tr><td><label for="iGroupDescription"><?= $this->getHtml('Description'); ?></label>
diff --git a/Theme/Backend/groups-list.tpl.php b/Theme/Backend/groups-list.tpl.php
index f8b9b6c..3abe102 100644
--- a/Theme/Backend/groups-list.tpl.php
+++ b/Theme/Backend/groups-list.tpl.php
@@ -46,9 +46,9 @@ echo $this->getData('nav')->render(); ?>
                         elseif($value->getStatus() === \phpOMS\Account\GroupStatus::INACTIVE) { $color = 'darkblue'; }
                         elseif($value->getStatus() === \phpOMS\Account\GroupStatus::HIDDEN) { $color = 'purple'; } ?>
                 <tr data-href="<?= $url; ?>">
-                    <td><a href="<?= $url; ?>"><?= htmlspecialchars($value->getId(), ENT_COMPAT, 'utf-8'); ?></a>
+                    <td><a href="<?= $url; ?>"><?= $this->printHtml($value->getId()); ?></a>
                     <td><a href="<?= $url; ?>"><span class="tag <?= $color; ?>"><?= $this->getHtml('Status'. $value->getStatus()); ?></span></a>
-                    <td><a href="<?= $url; ?>"><?= htmlspecialchars($value->getName(), ENT_COMPAT, 'utf-8'); ?></a>
+                    <td><a href="<?= $url; ?>"><?= $this->printHtml($value->getName()); ?></a>
                     <td>
                     <td>
                     <td>
diff --git a/Theme/Backend/groups-single.tpl.php b/Theme/Backend/groups-single.tpl.php
index fa9cf04..2d8052a 100644
--- a/Theme/Backend/groups-single.tpl.php
+++ b/Theme/Backend/groups-single.tpl.php
@@ -28,9 +28,9 @@ echo $this->getData('nav')->render(); ?>
                     <table class="layout wf-100">
                         <tbody>
                         <tr><td><label for="iGid"><?= $this->getHtml('ID', 0, 0); ?></label>
-                        <tr><td><input id="iGid" name="gid" type="text" value="<?= htmlspecialchars($group->getId(), ENT_COMPAT, 'utf-8'); ?>" disabled>
+                        <tr><td><input id="iGid" name="gid" type="text" value="<?= $this->printHtml($group->getId()); ?>" disabled>
                         <tr><td><label for="iGname"><?= $this->getHtml('Name'); ?></label>
-                        <tr><td><input id="iGname" name="gname" type="text" placeholder="&#xf0c0; Guest" value="<?= htmlspecialchars($group->getName(), ENT_COMPAT, 'utf-8'); ?>">
+                        <tr><td><input id="iGname" name="gname" type="text" placeholder="&#xf0c0; Guest" value="<?= $this->printHtml($group->getName()); ?>">
                         <tr><td><label for="iGstatus"><?= $this->getHtml('Status'); ?></label>
                         <tr><td><select id="iGstatus" status="gname">
                             <?php $status = \phpOMS\Account\GroupStatus::getConstants(); foreach($status as $stat) : ?>
@@ -38,7 +38,7 @@ echo $this->getData('nav')->render(); ?>
                         <?php endforeach; ?>
                             </select>
                         <tr><td><label for="iGroupDescription"><?= $this->getHtml('Description'); ?></label>
-                        <tr><td><textarea id="iGroupDescription" name="description" placeholder="&#xf040;"><?= htmlspecialchars($group->getDescription(), ENT_COMPAT, 'utf-8'); ?></textarea>
+                        <tr><td><textarea id="iGroupDescription" name="description" placeholder="&#xf040;"><?= $this->printHtml($group->getDescription()); ?></textarea>
                         <tr><td><input type="submit" value="<?= $this->getHtml('Save', 0, 0); ?>">
                     </table>
                 </form>
diff --git a/Theme/Backend/modules-list.tpl.php b/Theme/Backend/modules-list.tpl.php
index 1202bed..ec8e9d9 100644
--- a/Theme/Backend/modules-list.tpl.php
+++ b/Theme/Backend/modules-list.tpl.php
@@ -45,9 +45,9 @@ $footerView->setResults(count($modules));
                         <?php $count = 0; foreach ($modules as $key => $module) : $count++;
                         $url = \phpOMS\Uri\UriFactory::build('{/base}/{/lang}/backend/admin/module/settings?{?}&id=' . $module['name']['internal']); ?>
                 <tr data-href="<?= $url; ?>">
-                    <td><a href="<?= $url; ?>"><?= htmlspecialchars($module['name']['internal'], ENT_COMPAT, 'utf-8'); ?></a>
-                    <td><a href="<?= $url; ?>"><?= htmlspecialchars($module['name']['external'], ENT_COMPAT, 'utf-8'); ?></a>
-                    <td><a href="<?= $url; ?>"><?= htmlspecialchars($module['version'], ENT_COMPAT, 'utf-8'); ?></a>
+                    <td><a href="<?= $url; ?>"><?= $this->printHtml($module['name']['internal']); ?></a>
+                    <td><a href="<?= $url; ?>"><?= $this->printHtml($module['name']['external']); ?></a>
+                    <td><a href="<?= $url; ?>"><?= $this->printHtml($module['version']); ?></a>
                     <td><a href="<?= $url; ?>"><?php if (in_array($module['name']['internal'], $active))
                             echo strtolower($this->getHtml('Active'));
                         elseif (in_array($module['name']['internal'], $installed))
diff --git a/Theme/Backend/modules-single.tpl.php b/Theme/Backend/modules-single.tpl.php
index 939da9e..9d8ac9a 100644
--- a/Theme/Backend/modules-single.tpl.php
+++ b/Theme/Backend/modules-single.tpl.php
@@ -25,26 +25,26 @@ $id = $this->request->getData('id') ?? 1;
 <div class="row">
     <div class="col-xs-12 col-md-4">
         <section class="box wf-100">
-            <header><h1><?= htmlspecialchars($modules[$id]['name']['external'] , ENT_COMPAT, 'utf-8'); ?></h1></header>
+            <header><h1><?= $this->printHtml($modules[$id]['name']['external'] ); ?></h1></header>
 
             <div class="inner">
                 <table class="list wf-100">
                     <tbody>
                     <tr>
                         <td><?= $this->getHtml('Name'); ?>
-                        <td><?= htmlspecialchars($modules[$id]['name']['external'], ENT_COMPAT, 'utf-8'); ?>
+                        <td><?= $this->printHtml($modules[$id]['name']['external']); ?>
                     <tr>
                         <td><?= $this->getHtml('Version'); ?>
-                        <td><?= htmlspecialchars($modules[$id]['version'] , ENT_COMPAT, 'utf-8'); ?>
+                        <td><?= $this->printHtml($modules[$id]['version'] ); ?>
                     <tr>
                         <td><?= $this->getHtml('CreatedBy'); ?>
-                        <td><?= htmlspecialchars($modules[$id]['creator']['name'] , ENT_COMPAT, 'utf-8'); ?>
+                        <td><?= $this->printHtml($modules[$id]['creator']['name'] ); ?>
                     <tr>
                         <td><?= $this->getHtml('Website'); ?>
-                        <td><?= htmlspecialchars($modules[$id]['creator']['website'] , ENT_COMPAT, 'utf-8'); ?>
+                        <td><?= $this->printHtml($modules[$id]['creator']['website'] ); ?>
                     <tr>
                         <td><?= $this->getHtml('Description'); ?>
-                        <td><?= htmlspecialchars($modules[$id]['description'] , ENT_COMPAT, 'utf-8'); ?>
+                        <td><?= $this->printHtml($modules[$id]['description'] ); ?>
                     <tr>
                         <td colspan="2">
                             <?php if (in_array($id, $active)) : ?>
diff --git a/Theme/Backend/settings-general.tpl.php b/Theme/Backend/settings-general.tpl.php
index 6c9c764..2cbeed8 100644
--- a/Theme/Backend/settings-general.tpl.php
+++ b/Theme/Backend/settings-general.tpl.php
@@ -51,9 +51,9 @@ $currencies    = \phpOMS\Localization\ISO4217Enum::getConstants();
                                 <table class="layout wf-100">
                                     <tbody>
                                         <tr><td><label for="iOname"><?= $this->getHtml('OrganizationName'); ?></label>
-                                        <tr><td><input id="iOname" name="oname" type="text" value="<?= htmlspecialchars($_oname, ENT_COMPAT, 'utf-8'); ?>" placeholder="&#xf12e; Money Bin" required>
+                                        <tr><td><input id="iOname" name="oname" type="text" value="<?= $this->printHtml($_oname); ?>" placeholder="&#xf12e; Money Bin" required>
                                         <tr><td><label for="iPassword"><?= $this->getHtml('PasswordRegex'); ?></label>
-                                        <tr><td><input id="iPassword" name="passpattern" type="text" value="<?= htmlspecialchars($_password, ENT_COMPAT, 'utf-8'); ?>" placeholder="&#xf023; ^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[$@$!%*?&;:\(\)\[\]=\{\}\+\-])[A-Za-z\d$@$!%*?&;:\(\)\[\]=\{\}\+\-]{8,}">
+                                        <tr><td><input id="iPassword" name="passpattern" type="text" value="<?= $this->printHtml($_password); ?>" placeholder="&#xf023; ^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[$@$!%*?&;:\(\)\[\]=\{\}\+\-])[A-Za-z\d$@$!%*?&;:\(\)\[\]=\{\}\+\-]{8,}">
                                         <tr><td><input type="submit" value="<?= $this->getHtml('Save', 0); ?>">
                                 </table>
                             </form>
@@ -75,25 +75,25 @@ $currencies    = \phpOMS\Localization\ISO4217Enum::getConstants();
                                     <tr><td colspan="2"><label for="iCountries"><?= $this->getHtml('Country'); ?></label>
                                     <tr><td colspan="2"><select id="iCountries" name="country">
                                                 <?php foreach($countries as $code => $country) : ?>
-                                                <option value="<?= htmlspecialchars($code, ENT_COMPAT, 'utf-8'); ?>"<?= htmlspecialchars(strtolower($code) == strtolower($_country) ? ' selected' : '', ENT_COMPAT, 'utf-8'); ?>><?= htmlspecialchars($country, ENT_COMPAT, 'utf-8'); ?>
+                                                <option value="<?= $this->printHtml($code); ?>"<?= $this->printHtml(strtolower($code) == strtolower($_country) ? ' selected' : ''); ?>><?= $this->printHtml($country); ?>
                                                     <?php endforeach; ?>
                                             </select>
                                     <tr><td colspan="2"><label for="iTimezones"><?= $this->getHtml('Timezone'); ?></label>
                                     <tr><td colspan="2"><select id="iTimezones" name="timezone">
                                                 <?php foreach($timezones as $code => $timezone) : ?>
-                                                <option value="<?= htmlspecialchars($code, ENT_COMPAT, 'utf-8'); ?>"<?= htmlspecialchars($timezone == $_timezone ? ' selected' : '', ENT_COMPAT, 'utf-8'); ?>><?= htmlspecialchars($timezone, ENT_COMPAT, 'utf-8'); ?>
+                                                <option value="<?= $this->printHtml($code); ?>"<?= $this->printHtml($timezone == $_timezone ? ' selected' : ''); ?>><?= $this->printHtml($timezone); ?>
                                                     <?php endforeach; ?>
                                             </select>
                                     <tr><td colspan="2"><label for="iTimeformats"><?= $this->getHtml('Timeformat'); ?></label>
                                     <tr><td colspan="2"><select id="iTimeformats" name="timeformat">
                                                 <?php foreach($timeformats as $code => $timeformat) : ?>
-                                                <option value="<?= htmlspecialchars($code, ENT_COMPAT, 'utf-8'); ?>"<?= htmlspecialchars(strtolower($timeformat) == strtolower($_timeformat) ? ' selected' : '', ENT_COMPAT, 'utf-8'); ?>><?= htmlspecialchars($timeformat, ENT_COMPAT, 'utf-8'); ?>
+                                                <option value="<?= $this->printHtml($code); ?>"<?= $this->printHtml(strtolower($timeformat) == strtolower($_timeformat) ? ' selected' : ''); ?>><?= $this->printHtml($timeformat); ?>
                                                     <?php endforeach; ?>
                                             </select>
                                     <tr><td colspan="2"><label for="iLanguages"><?= $this->getHtml('Language'); ?></label>
                                     <tr><td colspan="2"><select id="iLanguages" name="language">
                                                 <?php foreach($languages as $code => $language) : ?>
-                                                <option value="<?= htmlspecialchars($code, ENT_COMPAT, 'utf-8'); ?>"<?= htmlspecialchars(strtolower($code) == strtolower($_language) ? ' selected' : '', ENT_COMPAT, 'utf-8'); ?>><?= htmlspecialchars($language, ENT_COMPAT, 'utf-8'); ?>
+                                                <option value="<?= $this->printHtml($code); ?>"<?= $this->printHtml(strtolower($code) == strtolower($_language) ? ' selected' : ''); ?>><?= $this->printHtml($language); ?>
                                                     <?php endforeach; ?>
                                             </select>
                                     <tr><td colspan="2"><label for="iTemperature"><?= $this->getHtml('Temperature'); ?></label>
@@ -115,14 +115,14 @@ $currencies    = \phpOMS\Localization\ISO4217Enum::getConstants();
                                     <tr><td colspan="2"><label for="iCurrencies"><?= $this->getHtml('Currency'); ?></label>
                                 <tr><td colspan="2"><select form="fLocalization" id="iCurrencies" name="currency">
                                             <?php foreach($currencies as $code => $currency) : ?>
-                                            <option value="<?= htmlspecialchars($code, ENT_COMPAT, 'utf-8'); ?>"<?= htmlspecialchars(strtolower($code) == strtolower($_currency) ? ' selected' : '', ENT_COMPAT, 'utf-8'); ?>><?= htmlspecialchars($currency, ENT_COMPAT, 'utf-8'); ?>
+                                            <option value="<?= $this->printHtml($code); ?>"<?= $this->printHtml(strtolower($code) == strtolower($_currency) ? ' selected' : ''); ?>><?= $this->printHtml($currency); ?>
                                                 <?php endforeach; ?>
                                         </select>
                                 <tr><td colspan="2"><h2><?= $this->getHtml('Numberformat'); ?></h2>
                                 <tr><td><label for="iDecimalPoint"><?= $this->getHtml('DecimalPoint'); ?></label>
                                     <td><label for="iThousandSep"><?= $this->getHtml('ThousandsSeparator'); ?></label>
-                                <tr><td><input form="fLocalization" id="iDecimalPoint" name="decimalpoint" type="text" value="<?= htmlspecialchars($_decimal_point, ENT_COMPAT, 'utf-8'); ?>" placeholder="." required>
-                                    <td><input form="fLocalization" id="iThousandSep" name="thousandsep" type="text" value="<?= htmlspecialchars($_thousands_sep, ENT_COMPAT, 'utf-8'); ?>" placeholder="," required>
+                                <tr><td><input form="fLocalization" id="iDecimalPoint" name="decimalpoint" type="text" value="<?= $this->printHtml($_decimal_point); ?>" placeholder="." required>
+                                    <td><input form="fLocalization" id="iThousandSep" name="thousandsep" type="text" value="<?= $this->printHtml($_thousands_sep); ?>" placeholder="," required>
                             </table>
                         </form>
                     </div>