Fix install escaping

diff --git a/view/templates/install_checks.tpl b/view/templates/install_checks.tpl
index cdb562f3a460e1600e6b838c748b2811f675f5cc..151b78dec206fc1163890b8a68e3406af8fb0d25 100644 (file)
--- 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 67250abf0bac6535e5e8bb4c6fd46b4c0e4e9a2b..a4fa430247a34e828f7a26ec7e1e8a97a67042ad 100644 (file)
--- 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 5c8d765e314d7d1e45c9549c10ed0aea8cc311c1..8e643b7a1b8a1669a564201ae1484130f176f964 100644 (file)
--- 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 fca11a042593782fc2c956da4577dabbc5882c6e..a7e4886ae7f178c44d8a9dae14279d1644b8faa0 100644 (file)
--- 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}}" />