Merge pull request #7785 from nupplaphil/bug/7676-is_file_warning

[friendica.git] / view / templates / install_settings.tpl

diff --git a/view/templates/install_settings.tpl b/view/templates/install_settings.tpl
index 8d6823f11414f4902d83fb85200dc9506f36284b..e17ef2456b9f1539fa5ef03ce96ee51cf046eeec 100644 (file)
--- a/view/templates/install_settings.tpl
+++ b/view/templates/install_settings.tpl
@@ -4,23 +4,24 @@
 <h2>{{$pass}}</h2>
 
 
-{{if $status}}
-<h3 class="error-message">{{$status}}</h3>
-{{/if}}
-
 <form id="install-form" action="{{$baseurl}}/install" method="post">
 
-<input type="hidden" name="phpath" value="{{$phpath|escape:'html'}}" />
-<input type="hidden" name="dbhost" value="{{$dbhost|escape:'html'}}" />
-<input type="hidden" name="dbuser" value="{{$dbuser|escape:'html'}}" />
-<input type="hidden" name="dbpass" value="{{$dbpass|escape:'html'}}" />
-<input type="hidden" name="dbdata" value="{{$dbdata|escape:'html'}}" />
-<input type="hidden" name="pass" value="4" />
-
-{{include file="field_input.tpl" field=$adminmail}}
-{{$timezone}}
-
-<input id="install-submit" type="submit" name="submit" value="{{$submit|escape:'html'}}" /> 
+<input type="hidden" name="config-php_path" value="{{$php_path}}" />
+<input type="hidden" name="config-hostname" value="{{$hostname}}" />
+<input type="hidden" name="system-ssl_policy" value="{{$ssl_policy}}" />
+<input type="hidden" name="system-basepath" value="{{$basepath}}" />
+<input type="hidden" name="system-urlpath" value="{{$urlpath}}" />
+<input type="hidden" name="database-hostname" value="{{$dbhost}}" />
+<input type="hidden" name="database-username" value="{{$dbuser}}" />
+<input type="hidden" name="database-password" value="{{$dbpass}}" />
+<input type="hidden" name="database-database" value="{{$dbdata}}" />
+<input type="hidden" name="pass" value="5" />
+
+{{include file="field_input.tpl" field=$adminmail}} <br />
+{{$timezone nofilter}} <br />
+{{include file="field_select.tpl" field=$language}}
+
+<input id="install-submit" type="submit" name="submit" value="{{$submit}}" />
 
 </form>