{
$basepath = $configCache->get('system', 'basepath');
- $tpl = Renderer::getMarkupTemplate('local.config.tpl');
+ $tpl = Renderer::getMarkupTemplate('install/local.config.tpl');
$txt = Renderer::replaceMacros($tpl, [
- '$dbhost' => $configCache->get('database', 'hostname'),
- '$dbuser' => $configCache->get('database', 'username'),
- '$dbpass' => $configCache->get('database', 'password'),
- '$dbdata' => $configCache->get('database', 'database'),
-
- '$phpath' => $configCache->get('config', 'php_path'),
- '$adminmail' => $configCache->get('config', 'admin_email'),
- '$hostname' => $configCache->get('config', 'hostname'),
-
- '$urlpath' => $configCache->get('system', 'urlpath'),
- '$baseurl' => $configCache->get('system', 'url'),
- '$sslpolicy' => $configCache->get('system', 'ssl_policy'),
- '$basepath' => $basepath,
- '$timezone' => $configCache->get('system', 'default_timezone'),
- '$language' => $configCache->get('system', 'language'),
+ '$dbhost' => $configCache->get('database', 'hostname'),
+ '$dbuser' => $configCache->get('database', 'username'),
+ '$dbpass' => $configCache->get('database', 'password'),
+ '$dbdata' => $configCache->get('database', 'database'),
+
+ '$phpath' => $configCache->get('config', 'php_path'),
+ '$adminmail' => $configCache->get('config', 'admin_email'),
+
+ '$system_url' => $configCache->get('system', 'url'),
+ '$basepath' => $basepath,
+ '$timezone' => $configCache->get('system', 'default_timezone'),
+ '$language' => $configCache->get('system', 'language'),
]);
$result = file_put_contents($basepath . DIRECTORY_SEPARATOR . 'config' . DIRECTORY_SEPARATOR . 'local.config.php', $txt);
use Friendica\Util\Profiler;
use Friendica\Util\Temporal;
use Psr\Log\LoggerInterface;
+use GuzzleHttp\Psr7\Uri;
class Install extends BaseModule
{
/** @var App\Mode */
protected $mode;
- public function __construct(App $app, App\Mode $mode, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, Core\Installer $installer, array $server, array $parameters = [])
+ public function __construct(App $app, BasePath $basePath, App\Mode $mode, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, Core\Installer $installer, array $server, array $parameters = [])
{
parent::__construct($l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
// get basic installation information and save them to the config cache
$configCache = $this->app->getConfigCache();
- $basePath = new BasePath($this->app->getBasePath());
$this->installer->setUpCache($configCache, $basePath->getPath());
// We overwrite current theme css, because during install we may not have a working mod_rewrite
// so we may not have a css at all. Here we set a static css file for the install procedure pages
- Renderer::$theme['stylesheet'] = $this->baseUrl->get() . '/view/install/style.css';
+ Renderer::$theme['stylesheet'] = $this->baseUrl . '/view/install/style.css';
$this->currentWizardStep = ($_POST['pass'] ?? '') ?: self::SYSTEM_CHECK;
}
case self::DATABASE_CONFIG:
$this->checkSetting($configCache, $_POST, 'config', 'php_path');
- $this->checkSetting($configCache, $_POST, 'config', 'hostname');
- $this->checkSetting($configCache, $_POST, 'system', 'ssl_policy');
$this->checkSetting($configCache, $_POST, 'system', 'basepath');
- $this->checkSetting($configCache, $_POST, 'system', 'urlpath');
+ $this->checkSetting($configCache, $_POST, 'system', 'url');
break;
case self::SITE_SETTINGS:
$this->checkSetting($configCache, $_POST, 'config', 'php_path');
- $this->checkSetting($configCache, $_POST, 'config', 'hostname');
- $this->checkSetting($configCache, $_POST, 'system', 'ssl_policy');
$this->checkSetting($configCache, $_POST, 'system', 'basepath');
- $this->checkSetting($configCache, $_POST, 'system', 'urlpath');
+ $this->checkSetting($configCache, $_POST, 'system', 'url');
$this->checkSetting($configCache, $_POST, 'database', 'hostname', Core\Installer::DEFAULT_HOST);
$this->checkSetting($configCache, $_POST, 'database', 'username', '');
case self::FINISHED:
$this->checkSetting($configCache, $_POST, 'config', 'php_path');
- $this->checkSetting($configCache, $_POST, 'config', 'hostname');
- $this->checkSetting($configCache, $_POST, 'system', 'ssl_policy');
$this->checkSetting($configCache, $_POST, 'system', 'basepath');
- $this->checkSetting($configCache, $_POST, 'system', 'urlpath');
+ $this->checkSetting($configCache, $_POST, 'system', 'url');
$this->checkSetting($configCache, $_POST, 'database', 'hostname', Core\Installer::DEFAULT_HOST);
$this->checkSetting($configCache, $_POST, 'database', 'username', '');
case self::SYSTEM_CHECK:
$php_path = $configCache->get('config', 'php_path');
- $status = $this->installer->checkEnvironment($this->baseUrl->get(), $php_path);
+ $status = $this->installer->checkEnvironment($this->baseUrl, $php_path);
- $tpl = Renderer::getMarkupTemplate('install_checks.tpl');
+ $tpl = Renderer::getMarkupTemplate('install/01_checks.tpl');
$output .= Renderer::replaceMacros($tpl, [
'$title' => $install_title,
'$pass' => $this->t('System check'),
break;
case self::BASE_CONFIG:
- $ssl_choices = [
- App\BaseURL::SSL_POLICY_NONE => $this->t("No SSL policy, links will track page SSL state"),
- App\BaseURL::SSL_POLICY_FULL => $this->t("Force all links to use SSL"),
- App\BaseURL::SSL_POLICY_SELFSIGN => $this->t("Self-signed certificate, use SSL for local links only \x28discouraged\x29")
- ];
+ $baseUrl = $configCache->get('system', 'url') ?
+ new Uri($configCache->get('system', 'url')) :
+ $this->baseUrl;
- $tpl = Renderer::getMarkupTemplate('install_base.tpl');
+ $tpl = Renderer::getMarkupTemplate('install/02_base_config.tpl');
$output .= Renderer::replaceMacros($tpl, [
'$title' => $install_title,
'$pass' => $this->t('Base settings'),
- '$ssl_policy' => ['system-ssl_policy',
- $this->t("SSL link policy"),
- $configCache->get('system', 'ssl_policy'),
- $this->t("Determines whether generated links should be forced to use SSL"),
- $ssl_choices],
- '$hostname' => ['config-hostname',
- $this->t('Host name'),
- $configCache->get('config', 'hostname'),
- $this->t('Overwrite this field in case the determinated hostname isn\'t right, otherweise leave it as is.'),
- $this->t('Required')],
'$basepath' => ['system-basepath',
$this->t("Base path to installation"),
$configCache->get('system', 'basepath'),
$this->t("If the system cannot detect the correct path to your installation, enter the correct path here. This setting should only be set if you are using a restricted system and symbolic links to your webroot."),
$this->t('Required')],
- '$urlpath' => ['system-urlpath',
- $this->t('Sub path of the URL'),
- $configCache->get('system', 'urlpath'),
- $this->t('Overwrite this field in case the sub path determination isn\'t right, otherwise leave it as is. Leaving this field blank means the installation is at the base URL without sub path.'),
- ''],
+ '$system_url' => ['system-url',
+ $this->t('The Friendica system URL'),
+ (string)$baseUrl,
+ $this->t('Overwrite this field in case the system URL determination isn\'t right, otherwise leave it as is.'),
+ $this->t('Required')],
'$php_path' => $configCache->get('config', 'php_path'),
'$submit' => $this->t('Submit'),
]);
break;
case self::DATABASE_CONFIG:
- $tpl = Renderer::getMarkupTemplate('install_db.tpl');
+ $tpl = Renderer::getMarkupTemplate('install/03_database_config.tpl');
$output .= Renderer::replaceMacros($tpl, [
'$title' => $install_title,
'$pass' => $this->t('Database connection'),
'$required' => $this->t('Required'),
'$requirement_not_satisfied' => $this->t('Requirement not satisfied'),
'$checks' => $this->installer->getChecks(),
- '$hostname' => $configCache->get('config', 'hostname'),
- '$ssl_policy' => $configCache->get('system', 'ssl_policy'),
'$basepath' => $configCache->get('system', 'basepath'),
- '$urlpath' => $configCache->get('system', 'urlpath'),
+ '$system_url' => $configCache->get('system', 'url'),
'$dbhost' => ['database-hostname',
$this->t('Database Server Name'),
$configCache->get('database', 'hostname'),
/* Installed langs */
$lang_choices = $this->l10n->getAvailableLanguages();
- $tpl = Renderer::getMarkupTemplate('install_settings.tpl');
+ $tpl = Renderer::getMarkupTemplate('install/04_site_settings.tpl');
$output .= Renderer::replaceMacros($tpl, [
'$title' => $install_title,
'$required' => $this->t('Required'),
'$checks' => $this->installer->getChecks(),
'$pass' => $this->t('Site settings'),
- '$hostname' => $configCache->get('config', 'hostname'),
- '$ssl_policy' => $configCache->get('system', 'ssl_policy'),
'$basepath' => $configCache->get('system', 'basepath'),
- '$urlpath' => $configCache->get('system', 'urlpath'),
+ '$system_url' => $configCache->get('system', 'url'),
'$dbhost' => $configCache->get('database', 'hostname'),
'$dbuser' => $configCache->get('database', 'username'),
'$dbpass' => $configCache->get('database', 'password'),
$db_return_text .= $txt;
}
- $tpl = Renderer::getMarkupTemplate('install_finished.tpl');
+ $tpl = Renderer::getMarkupTemplate('install/05_finished.tpl');
$output .= Renderer::replaceMacros($tpl, [
'$title' => $install_title,
'$required' => $this->t('Required'),
*/
private function whatNext(): string
{
- $baseurl = $this->baseUrl->get();
+ $baseurl = $this->baseUrl;
return
$this->t('<h1>What next</h1>')
. "<p>" . $this->t('IMPORTANT: You will need to [manually] setup a scheduled task for the worker.')
--- /dev/null
+
+<h1><img width="32" height="32" src="{{$baseurl}}/images/friendica.svg"> {{$title}}</h1>
+<h2>{{$pass}}</h2>
+<form action="{{$baseurl}}/install" method="post">
+<table>
+{{foreach $checks as $check}}
+ <tr><td>{{$check.title nofilter}} </td><td>
+ {{if $check.status}}
+ <img src="{{$baseurl}}/view/install/green.png" alt="{{$ok}}">
+ {{else}}
+ {{if $check.required}}
+ <img src="{{$baseurl}}/view/install/red.png" alt="{{$requirement_not_satisfied}}">
+ {{else}}
+ <img src="{{$baseurl}}/view/install/yellow.png" alt="{{$optional_requirement_not_satisfied}}">
+ {{/if}}
+ {{/if}}
+ </td><td>{{if $check.required}}{{$required}}{{/if}}</td></tr>
+ {{if $check.help}}
+ <tr><td class="help" colspan="3">
+ <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>
+ {{/if}}
+ </td></tr>
+ {{/if}}
+{{/foreach}}
+</table>
+
+{{if $phpath}}
+ <input type="hidden" name="config-php_path" value="{{$php_path}}">
+{{/if}}
+
+{{if $passed}}
+ <input type="hidden" name="pass" value="2">
+ <input type="submit" value="{{$next}}">
+{{else}}
+ <input type="hidden" name="pass" value="1">
+ <input type="submit" value="{{$reload}}">
+{{/if}}
+</form>
--- /dev/null
+<h1><img width="32" height="32" src="{{$baseurl}}/images/friendica.svg"> {{$title}}</h1>
+<h2>{{$pass}}</h2>
+
+<p>
+ {{$info_01}}<br>
+ {{$info_02}}<br>
+ {{$info_03}}
+</p>
+
+<form id="install-form" action="{{$baseurl}}/install" method="post">
+
+ <input type="hidden" name="config-php_path" value="{{$php_path}}" />
+ <input type="hidden" name="pass" value="3" />
+
+ {{include file="field_input.tpl" field=$basepath}}
+ <br />
+ {{include file="field_input.tpl" field=$system_url}}
+
+ <input id="install-submit" type="submit" name="submit" value="{{$submit}}" />
+
+</form>
--- /dev/null
+<h1><img width="32" height="32" src="{{$baseurl}}/images/friendica.svg"> {{$title}}</h1>
+<h2>{{$pass}}</h2>
+
+<p>
+ {{$info_01}}<br>
+ {{$info_02}}<br>
+ {{$info_03}}
+</p>
+
+<table>
+ {{foreach $checks as $check}}
+ <tr>
+ <td>{{$check.title}} </td>
+ <td>
+ {{if ! $check.status}}
+ <img src="{{$baseurl}}/view/install/red.png" alt="{{$requirement_not_satisfied}}">
+ {{/if}}
+ </td>
+ {{/foreach}}
+</table>
+
+<form id="install-form" action="{{$baseurl}}/install" method="post">
+
+ <input type="hidden" name="config-php_path" value="{{$php_path}}" />
+ <input type="hidden" name="system-basepath" value="{{$basepath}}" />
+ <input type="hidden" name="system-url" value="{{$system_url}}" />
+ <input type="hidden" name="pass" value="4" />
+
+ {{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}}" />
+
+</form>
--- /dev/null
+
+
+<h1><img width="32" height="32" src="{{$baseurl}}/images/friendica.svg"> {{$title}}</h1>
+<h2>{{$pass}}</h2>
+
+
+<form id="install-form" action="{{$baseurl}}/install" method="post">
+
+<input type="hidden" name="config-php_path" value="{{$php_path}}" />
+<input type="hidden" name="system-basepath" value="{{$basepath}}" />
+<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}}" />
+<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>
+
--- /dev/null
+<h1><img width="32" height="32" src="{{$baseurl}}/images/friendica.svg"> {{$title}}</h1>
+<h2>{{$pass}}</h2>
+
+{{foreach $checks as $check}}
+<img src="{{$baseurl}}/view/install/red.png" alt="{{$requirement_not_satisfied}}">
+{{$check.title nofilter}}
+<textarea rows="24" cols="80">{{$check.help nofilter}}</textarea>
+{{/foreach}}
+
+{{$text nofilter}}
--- /dev/null
+<?php
+
+// Local configuration
+
+// If you're unsure about what any of the config keys below do, please check the static/defaults.config.php for detailed
+// documentation of their data type and behavior.
+
+return [
+ 'database' => [
+ 'hostname' => '{{$dbhost|escape:'quotes' nofilter}}',
+ 'username' => '{{$dbuser|escape:'quotes' nofilter}}',
+ 'password' => '{{$dbpass|escape:'quotes' nofilter}}',
+ 'database' => '{{$dbdata|escape:'quotes' nofilter}}',
+ 'charset' => 'utf8mb4',
+ ],
+
+ // ****************************************************************
+ // The configuration below will be overruled by the admin panel.
+ // Changes made below will only have an effect if the database does
+ // not contain any configuration for the friendica system.
+ // ****************************************************************
+
+ 'config' => [
+ 'php_path' => '{{$phpath|escape:'quotes' nofilter}}',
+ 'admin_email' => '{{$adminmail|escape:'quotes' nofilter}}',
+ 'sitename' => 'Friendica Social Network',
+ 'register_policy' => \Friendica\Module\Register::OPEN,
+ 'max_import_size' => 200000,
+ ],
+ 'system' => [
+ 'url' => '{{$system_url|escape:'quotes' nofilter}}',
+ 'basepath' => '{{$basepath|escape:'quotes' nofilter}}',
+ 'default_timezone' => '{{$timezone|escape:'quotes' nofilter}}',
+ 'language' => '{{$language|escape:'quotes' nofilter}}',
+ ],
+];
+++ /dev/null
-<h1><img width="32" height="32" src="{{$baseurl}}/images/friendica.svg"> {{$title}}</h1>
-<h2>{{$pass}}</h2>
-
-<p>
- {{$info_01}}<br>
- {{$info_02}}<br>
- {{$info_03}}
-</p>
-
-<form id="install-form" action="{{$baseurl}}/install" method="post">
-
- <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}}
-
- <input id="install-submit" type="submit" name="submit" value="{{$submit}}" />
-
-</form>
+++ /dev/null
-
-<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">
-<table>
-{{foreach $checks as $check}}
- <tr><td>{{$check.title nofilter}} </td><td>
- {{if $check.status}}
- <img src="{{$baseurl}}/view/install/green.png" alt="{{$ok}}">
- {{else}}
- {{if $check.required}}
- <img src="{{$baseurl}}/view/install/red.png" alt="{{$requirement_not_satisfied}}">
- {{else}}
- <img src="{{$baseurl}}/view/install/yellow.png" alt="{{$optional_requirement_not_satisfied}}">
- {{/if}}
- {{/if}}
- </td><td>{{if $check.required}}{{$required}}{{/if}}</td></tr>
- {{if $check.help}}
- <tr><td class="help" colspan="3">
- <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>
- {{/if}}
- </td></tr>
- {{/if}}
-{{/foreach}}
-</table>
-
-{{if $phpath}}
- <input type="hidden" name="config-php_path" value="{{$php_path}}">
-{{/if}}
-
-{{if $passed}}
- <input type="hidden" name="pass" value="2">
- <input type="submit" value="{{$next}}">
-{{else}}
- <input type="hidden" name="pass" value="1">
- <input type="submit" value="{{$reload}}">
-{{/if}}
-</form>
+++ /dev/null
-<h1><img width="32" height="32" src="{{$baseurl}}/images/friendica.svg"> {{$title}}</h1>
-<h2>{{$pass}}</h2>
-
-<p>
- {{$info_01}}<br>
- {{$info_02}}<br>
- {{$info_03}}
-</p>
-
-<table>
- {{foreach $checks as $check}}
- <tr>
- <td>{{$check.title}} </td>
- <td>
- {{if ! $check.status}}
- <img src="{{$baseurl}}/view/install/red.png" alt="{{$requirement_not_satisfied}}">
- {{/if}}
- </td>
- {{/foreach}}
-</table>
-
-<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="pass" value="4" />
-
- {{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}}" />
-
-</form>
+++ /dev/null
-<h1><img width="32" height="32" src="{{$baseurl}}/images/friendica.svg"> {{$title}}</h1>
-<h2>{{$pass}}</h2>
-
-{{foreach $checks as $check}}
-<img src="{{$baseurl}}/view/install/red.png" alt="{{$requirement_not_satisfied}}">
-{{$check.title nofilter}}
-<textarea rows="24" cols="80">{{$check.help nofilter}}</textarea>
-{{/foreach}}
-
-{{$text nofilter}}
+++ /dev/null
-
-
-<h1><img width="32" height="32" src="{{$baseurl}}/images/friendica.svg"> {{$title}}</h1>
-<h2>{{$pass}}</h2>
-
-
-<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="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>
-
+++ /dev/null
-<?php
-
-// Local configuration
-
-// If you're unsure about what any of the config keys below do, please check the static/defaults.config.php for detailed
-// documentation of their data type and behavior.
-
-return [
- 'database' => [
- 'hostname' => '{{$dbhost|escape:'quotes' nofilter}}',
- 'username' => '{{$dbuser|escape:'quotes' nofilter}}',
- 'password' => '{{$dbpass|escape:'quotes' nofilter}}',
- 'database' => '{{$dbdata|escape:'quotes' nofilter}}',
- 'charset' => 'utf8mb4',
- ],
-
- // ****************************************************************
- // The configuration below will be overruled by the admin panel.
- // Changes made below will only have an effect if the database does
- // not contain any configuration for the friendica system.
- // ****************************************************************
-
- 'config' => [
- '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}},
- 'basepath' => '{{$basepath|escape:'quotes' nofilter}}',
- 'default_timezone' => '{{$timezone|escape:'quotes' nofilter}}',
- 'language' => '{{$language|escape:'quotes' nofilter}}',
- ],
-];
projects / friendica.git / commitdiff