From 7456eeb737130bde9f15a44fa3fd62e1578ce18b Mon Sep 17 00:00:00 2001
From: Kristian Feldsam <feldsam@gmail.com>
Date: Tue, 19 Oct 2021 10:39:22 +0200
Subject: [PATCH] [Web] ui texts - disabled escaping
Signed-off-by: Kristian Feldsam <feldsam@gmail.com>
---
data/web/templates/admin/tab-config-customize.twig | 8 ++++----
data/web/templates/base.twig | 4 ++--
data/web/templates/index.twig | 8 ++++----
3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/data/web/templates/admin/tab-config-customize.twig b/data/web/templates/admin/tab-config-customize.twig
index 3aea344b..fe1ccb7c 100644
--- a/data/web/templates/admin/tab-config-customize.twig
+++ b/data/web/templates/admin/tab-config-customize.twig
@@ -65,19 +65,19 @@
<form class="form" data-id="uitexts" role="form" method="post">
<div class="form-group">
<label for="uitests_title_name">{{ lang.admin.title_name }}:</label>
- <input type="text" class="form-control" id="uitests_title_name" name="title_name" placeholder="mailcow UI" value="{{ ui_texts.title_name }}">
+ <input type="text" class="form-control" id="uitests_title_name" name="title_name" placeholder="mailcow UI" value="{{ ui_texts.title_name|raw }}">
</div>
<div class="form-group">
<label for="uitests_main_name">{{ lang.admin.main_name }}:</label>
- <input type="text" class="form-control" id="uitests_main_name" name="main_name" placeholder="mailcow UI" value="{{ ui_texts.main_name }}">
+ <input type="text" class="form-control" id="uitests_main_name" name="main_name" placeholder="mailcow UI" value="{{ ui_texts.main_name|raw }}">
</div>
<div class="form-group">
<label for="uitests_apps_name">{{ lang.admin.apps_name }}:</label>
- <input type="text" class="form-control" id="uitests_apps_name" name="apps_name" placeholder="{{ lang.header.apps }}" value="{{ ui_texts.apps_name }}">
+ <input type="text" class="form-control" id="uitests_apps_name" name="apps_name" placeholder="{{ lang.header.apps }}" value="{{ ui_texts.apps_name|raw }}">
</div>
<div class="form-group">
<label for="help_text">{{ lang.admin.help_text }}:</label>
- <textarea class="form-control" id="help_text" name="help_text" rows="7">{{ ui_texts.help_text }}</textarea>
+ <textarea class="form-control" id="help_text" name="help_text" rows="7">{{ ui_texts.help_text|raw }}</textarea>
</div>
<hr>
<div class="form-group">
diff --git a/data/web/templates/base.twig b/data/web/templates/base.twig
index b70230ad..4243f6ac 100644
--- a/data/web/templates/base.twig
+++ b/data/web/templates/base.twig
@@ -6,7 +6,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=0">
<meta name="theme-color" content="#F5D76E"/>
<meta http-equiv="Referrer-Policy" content="same-origin">
- <title>{{ ui_texts.title_name }}</title>
+ <title>{{ ui_texts.title_name|raw }}</title>
<link rel="stylesheet" href="{{ css_path }}">
{% if theme != 'lumen' %}
@@ -66,7 +66,7 @@
<li><a href data-toggle="modal" data-container="sogo-mailcow" data-target="#RestartContainer"><i class="bi bi-arrow-repeat"></i> {{ lang.header.restart_sogo }}</a></li>
{% endif %}
<li class="dropdown">
- <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false"><i class="bi bi-link-45deg"></i> {{ ui_texts.apps_name }} <span class="caret"></span></a>
+ <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false"><i class="bi bi-link-45deg"></i> {{ ui_texts.apps_name|raw }} <span class="caret"></span></a>
<ul class="dropdown-menu" role="menu">
{% for app in mailcow_apps %}
{% if not skip_sogo or not is_uri('SOGo', app.link) %}
diff --git a/data/web/templates/index.twig b/data/web/templates/index.twig
index ec7dcc8c..0f2abe12 100644
--- a/data/web/templates/index.twig
+++ b/data/web/templates/index.twig
@@ -12,7 +12,7 @@
{% if ui_texts.ui_announcement_text and ui_texts.ui_announcement_active %}
<div class="alert alert-{{ ui_texts.ui_announcement_type }} rot-enc ui-announcement-alert">{{ ui_texts.ui_announcement_text|rot13 }}</div>
{% endif %}
- <legend>{% if oauth2_request %}{{ lang.oauth2.authorize_app }}{% else %}{{ ui_texts.main_name }}{% endif %}</legend>
+ <legend>{% if oauth2_request %}{{ lang.oauth2.authorize_app }}{% else %}{{ ui_texts.main_name|raw }}{% endif %}</legend>
{% if is_mobileconfig %}
<div class="alert alert-info">{{ lang.login.mobileconfig_info }}</div>
{% endif %}
@@ -65,7 +65,7 @@
{% endif %}
<div id="fido2-alerts"></div>
{% if not oauth2_request %}
- <legend><i class="bi bi-link-45deg"></i> {{ ui_texts.apps_name }}</legend>
+ <legend><i class="bi bi-link-45deg"></i> {{ ui_texts.apps_name|raw }}</legend>
<div class="apps">
{% for app in mailcow_apps %}
{% if not skip_sogo or not is_uri('SOGo', app.link) %}
@@ -97,9 +97,9 @@
{% if ui_texts.help_text %}
<p>{{ ui_texts.help_text|raw }}</p>
{% else %}
- <p><span style="border-bottom: 1px dotted #999;">{{ ui_texts.main_name }}</span></p>
+ <p><span style="border-bottom: 1px dotted #999;">{{ ui_texts.main_name|raw }}</span></p>
<p>{{ lang.start.mailcow_panel_detail|raw }}</p>
- <p><span style="border-bottom: 1px dotted #999;">{{ ui_texts.apps_name }}</span></p>
+ <p><span style="border-bottom: 1px dotted #999;">{{ ui_texts.apps_name|raw }}</span></p>
<p>{{ lang.start.mailcow_apps_detail|raw }}</p>
{% endif %}
</div>