From 989bfb53b1b86690864d8a71d3eb578bcb340ab0 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Fri, 21 Dec 2018 00:05:31 -0500 Subject: [PATCH] Fix install escaping --- view/templates/install_checks.tpl | 4 ++-- view/templates/install_db.tpl | 25 ++++++++++--------------- view/templates/install_finished.tpl | 9 +++------ view/templates/install_settings.tpl | 2 +- 4 files changed, 16 insertions(+), 24 deletions(-) diff --git a/view/templates/install_checks.tpl b/view/templates/install_checks.tpl index cdb562f3a..151b78dec 100644 --- a/view/templates/install_checks.tpl +++ b/view/templates/install_checks.tpl @@ -4,7 +4,7 @@
{{foreach $checks as $check}} - {{if $check.help}}
{{$check.title}} +
{{$check.title nofilter}} {{if $check.status}} Ok {{else}} @@ -17,7 +17,7 @@ {{if $check.required}}(required){{/if}}
-
{{$check.help}}
+
{{$check.help nofilter}}
{{if $check.error_msg}}
{{$check.error_msg.head}}
{{$check.error_msg.url}}
{{$check.error_msg.msg}}
diff --git a/view/templates/install_db.tpl b/view/templates/install_db.tpl index 67250abf0..a4fa43024 100644 --- a/view/templates/install_db.tpl +++ b/view/templates/install_db.tpl @@ -1,13 +1,10 @@ - -

{{$title}}

{{$pass}}

-

-{{$info_01}}
-{{$info_02}}
-{{$info_03}} + {{$info_01}}
+ {{$info_02}}
+ {{$info_03}}

@@ -21,16 +18,14 @@ - - + + -{{include file="field_input.tpl" field=$dbhost}} -{{include file="field_input.tpl" field=$dbuser}} -{{include file="field_password.tpl" field=$dbpass}} -{{include file="field_input.tpl" field=$dbdata}} + {{include file="field_input.tpl" field=$dbhost}} + {{include file="field_input.tpl" field=$dbuser}} + {{include file="field_password.tpl" field=$dbpass}} + {{include file="field_input.tpl" field=$dbdata}} - - + - diff --git a/view/templates/install_finished.tpl b/view/templates/install_finished.tpl index 5c8d765e3..8e643b7a1 100644 --- a/view/templates/install_finished.tpl +++ b/view/templates/install_finished.tpl @@ -1,13 +1,10 @@ - -

{{$title}}

{{$pass}}

- {{foreach $checks as $check}} Requirement not satisfied -{{$check.title}} - +{{$check.title nofilter}} + {{/foreach}} -{{$text}} +{{$text nofilter}} diff --git a/view/templates/install_settings.tpl b/view/templates/install_settings.tpl index fca11a042..a7e4886ae 100644 --- a/view/templates/install_settings.tpl +++ b/view/templates/install_settings.tpl @@ -14,7 +14,7 @@ {{include file="field_input.tpl" field=$adminmail}} -{{$timezone}} +{{$timezone nofilter}} {{include file="field_select.tpl" field=$language}}