nupplaPhil/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix install escaping

Browse source
This commit is contained in:
Hypolite Petovan 2018-12-21 00:05:31 -05:00
parent 1c58363696
commit 989bfb53b1
4 changed files with 16 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
view/templates/install_checks.tpl
View file

@ -4,7 +4,7 @@
<form action="{{$baseurl}}/index.php?q=install" method="post"> <form action="{{$baseurl}}/index.php?q=install" method="post">
<table> <table>
{{foreach $checks as $check}} {{foreach $checks as $check}}
<tr><td>{{$check.title}} </td><td> <tr><td>{{$check.title nofilter}} </td><td>
{{if $check.status}} {{if $check.status}}
<img src="{{$baseurl}}/view/install/green.png" alt="Ok"> <img src="{{$baseurl}}/view/install/green.png" alt="Ok">
{{else}} {{else}}
@ -17,7 +17,7 @@
</td><td>{{if $check.required}}(required){{/if}}</td></tr> </td><td>{{if $check.required}}(required){{/if}}</td></tr>
{{if $check.help}} {{if $check.help}}
<tr><td class="help" colspan="3"> <tr><td class="help" colspan="3">
<blockquote>{{$check.help}}</blockquote> <blockquote>{{$check.help nofilter}}</blockquote>
{{if $check.error_msg}} {{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> <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> <blockquote>{{$check.error_msg.msg}}</blockquote>

25
view/templates/install_db.tpl
View file

@ -1,13 +1,10 @@
<h1><img src="{{$baseurl}}/images/friendica-32.png"> {{$title}}</h1> <h1><img src="{{$baseurl}}/images/friendica-32.png"> {{$title}}</h1>
<h2>{{$pass}}</h2> <h2>{{$pass}}</h2>
<p> <p>
{{$info_01}}<br> {{$info_01}}<br>
{{$info_02}}<br> {{$info_02}}<br>
{{$info_03}} {{$info_03}}
</p> </p>
<table> <table>
@ -21,16 +18,14 @@
<form id="install-form" action="{{$baseurl}}/install" method="post"> <form id="install-form" action="{{$baseurl}}/install" method="post">
<input type="hidden" name="phpath" value="{{$phpath}}" /> <input type="hidden" name="phpath" value="{{$phpath}}" />
<input type="hidden" name="pass" value="3" /> <input type="hidden" name="pass" value="3" />
{{include file="field_input.tpl" field=$dbhost}} {{include file="field_input.tpl" field=$dbhost}}
{{include file="field_input.tpl" field=$dbuser}} {{include file="field_input.tpl" field=$dbuser}}
{{include file="field_password.tpl" field=$dbpass}} {{include file="field_password.tpl" field=$dbpass}}
{{include file="field_input.tpl" field=$dbdata}} {{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> </form>

9
view/templates/install_finished.tpl
View file

@ -1,13 +1,10 @@
<h1><img src="{{$baseurl}}/images/friendica-32.png"> {{$title}}</h1> <h1><img src="{{$baseurl}}/images/friendica-32.png"> {{$title}}</h1>
<h2>{{$pass}}</h2> <h2>{{$pass}}</h2>
{{foreach $checks as $check}} {{foreach $checks as $check}}
<img src="{{$baseurl}}/view/install/red.png" alt="Requirement not satisfied"> <img src="{{$baseurl}}/view/install/red.png" alt="Requirement not satisfied">
{{$check.title}} {{$check.title nofilter}}
<textarea rows="24" cols="80">{{$check.help}}</textarea> <textarea rows="24" cols="80">{{$check.help nofilter}}</textarea>
{{/foreach}} {{/foreach}}
{{$text}} {{$text nofilter}}

2
view/templates/install_settings.tpl
View file

@ -14,7 +14,7 @@
<input type="hidden" name="pass" value="4" /> <input type="hidden" name="pass" value="4" />
{{include file="field_input.tpl" field=$adminmail}} {{include file="field_input.tpl" field=$adminmail}}
{{$timezone}} {{$timezone nofilter}}
{{include file="field_select.tpl" field=$language}} {{include file="field_select.tpl" field=$language}}
<input id="install-submit" type="submit" name="submit" value="{{$submit}}" /> <input id="install-submit" type="submit" name="submit" value="{{$submit}}" />