oldkid/friendica
1
0
Fork 0
mirror of https://git.sekbaer.de/Friendica/friendica.git synced 2025-06-16 20:05:14 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Refactor Installer due new BaseURL logic

Browse source
This commit is contained in:
Philipp 2023-02-18 20:43:49 +01:00
parent 96e12be26b
commit dbb7022ca5
No known key found for this signature in database
GPG key ID: 24A7501396EB5432
8 changed files with 39 additions and 75 deletions
Download patch file Download diff file Expand all files Collapse all files

2
view/templates/install_checks.tpl → view/templates/install/01_checks.tpl
View file

@ -1,7 +1,7 @@
<h1><img width="32" height="32" src="{{$baseurl}}/images/friendica.svg"> {{$title}}</h1>
<h2>{{$pass}}</h2>
<form action="{{$baseurl}}/index.php?pagename=install" method="post">
<form action="{{$baseurl}}/install" method="post">
<table>
{{foreach $checks as $check}}
<tr><td>{{$check.title nofilter}} </td><td>

6
view/templates/install_base.tpl → view/templates/install/02_base_config.tpl
View file

@ -12,13 +12,9 @@
<input type="hidden" name="config-php_path" value="{{$php_path}}" />
<input type="hidden" name="pass" value="3" />
{{include file="field_select.tpl" field=$ssl_policy}}
<br />
{{include file="field_input.tpl" field=$hostname}}
<br />
{{include file="field_input.tpl" field=$basepath}}
<br />
{{include file="field_input.tpl" field=$urlpath}}
{{include file="field_input.tpl" field=$system_url}}
<input id="install-submit" type="submit" name="submit" value="{{$submit}}" />

4
view/templates/install_db.tpl → view/templates/install/03_database_config.tpl
View file

@ -22,10 +22,8 @@
<form id="install-form" action="{{$baseurl}}/install" method="post">
<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="system-url" value="{{$system_url}}" />
<input type="hidden" name="pass" value="4" />
{{include file="field_input.tpl" field=$dbhost}}

4
view/templates/install_settings.tpl → view/templates/install/04_site_settings.tpl
View file

@ -7,10 +7,8 @@
<form id="install-form" action="{{$baseurl}}/install" method="post">
<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="system-url" value="{{$system_url}}" />
<input type="hidden" name="database-hostname" value="{{$dbhost}}" />
<input type="hidden" name="database-username" value="{{$dbuser}}" />
<input type="hidden" name="database-password" value="{{$dbpass}}" />

0
view/templates/install_finished.tpl → view/templates/install/05_finished.tpl
View file

5
view/templates/local.config.tpl → view/templates/install/local.config.tpl
View file

@ -24,14 +24,11 @@ return [
'php_path' => '{{$phpath|escape:'quotes' nofilter}}',
'admin_email' => '{{$adminmail|escape:'quotes' nofilter}}',
'sitename' => 'Friendica Social Network',
'hostname' => '{{$hostname|escape:'quotes' nofilter}}',
'register_policy' => \Friendica\Module\Register::OPEN,
'max_import_size' => 200000,
],
'system' => [
'urlpath' => '{{$urlpath|escape:'quotes' nofilter}}',
'url' => '{{$baseurl|escape:'quotes' nofilter}}',
'ssl_policy' => {{$sslpolicy|escape:'quotes' nofilter}},
'url' => '{{$system_url|escape:'quotes' nofilter}}',
'basepath' => '{{$basepath|escape:'quotes' nofilter}}',
'default_timezone' => '{{$timezone|escape:'quotes' nofilter}}',
'language' => '{{$language|escape:'quotes' nofilter}}',