From 989bfb53b1b86690864d8a71d3eb578bcb340ab0 Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <hypolite@mrpetovan.com>
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 @@
 <form  action="{{$baseurl}}/index.php?q=install" method="post">
 <table>
 {{foreach $checks as $check}}
-	<tr><td>{{$check.title}} </td><td>
+	<tr><td>{{$check.title nofilter}} </td><td>
 	{{if $check.status}}
 		<img src="{{$baseurl}}/view/install/green.png" alt="Ok">
 	{{else}}
@@ -17,7 +17,7 @@
 	</td><td>{{if $check.required}}(required){{/if}}</td></tr>
 	{{if $check.help}}
 	<tr><td class="help" colspan="3">
-		<blockquote>{{$check.help}}</blockquote>
+		<blockquote>{{$check.help nofilter}}</blockquote>
 		{{if $check.error_msg}}
 		<div class="error_header"><b>{{$check.error_msg.head}}</br><a href="{{$check.error_msg.url}}">{{$check.error_msg.url}}</a></b></div>
 		<blockquote>{{$check.error_msg.msg}}</blockquote>
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 @@
-
-
 <h1><img src="{{$baseurl}}/images/friendica-32.png"> {{$title}}</h1>
 <h2>{{$pass}}</h2>
 
-
 <p>
-{{$info_01}}<br>
-{{$info_02}}<br>
-{{$info_03}}
+	{{$info_01}}<br>
+	{{$info_02}}<br>
+	{{$info_03}}
 </p>
 
 <table>
@@ -21,16 +18,14 @@
 
 <form id="install-form" action="{{$baseurl}}/install" method="post">
 
-<input type="hidden" name="phpath" value="{{$phpath}}" />
-<input type="hidden" name="pass" value="3" />
+	<input type="hidden" name="phpath" value="{{$phpath}}" />
+	<input type="hidden" name="pass" value="3" />
 
-{{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}}
 
-
-<input id="install-submit" type="submit" name="submit" value="{{$submit}}" />
+	<input id="install-submit" type="submit" name="submit" value="{{$submit}}" />
 
 </form>
-
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 @@
-
-
 <h1><img src="{{$baseurl}}/images/friendica-32.png"> {{$title}}</h1>
 <h2>{{$pass}}</h2>
 
-
 {{foreach $checks as $check}}
 <img src="{{$baseurl}}/view/install/red.png" alt="Requirement not satisfied">
-{{$check.title}}
-<textarea rows="24" cols="80">{{$check.help}}</textarea>
+{{$check.title nofilter}}
+<textarea rows="24" cols="80">{{$check.help nofilter}}</textarea>
 {{/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 @@
 <input type="hidden" name="pass" value="4" />
 
 {{include file="field_input.tpl" field=$adminmail}}
-{{$timezone}}
+{{$timezone nofilter}}
 {{include file="field_select.tpl" field=$language}}
 
 <input id="install-submit" type="submit" name="submit" value="{{$submit}}" />