tobias/friendica
1
0
Fork 0
Code Pull requests Activity

Add namespace

Browse source
This commit is contained in:
Philipp Holzer 2019-07-12 23:08:01 +02:00
parent a30200083a
commit 8c0f047bc7
No known key found for this signature in database
GPG key ID: D8365C3D36B77D90
1 changed files with 16 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/Module/Install.php
View file

@ -5,8 +5,10 @@ namespace Friendica\Module;
use Friendica\App; use Friendica\App;
use Friendica\BaseModule; use Friendica\BaseModule;
use Friendica\Core; use Friendica\Core;
use Friendica\Core\Config\Cache\ConfigCache;
use Friendica\Core\L10n; use Friendica\Core\L10n;
use Friendica\Core\Renderer; use Friendica\Core\Renderer;
use Friendica\Network\HTTPException;
use Friendica\Util\BasePath; use Friendica\Util\BasePath;
use Friendica\Util\BaseURL; use Friendica\Util\BaseURL;
use Friendica\Util\Strings; use Friendica\Util\Strings;
@ -50,7 +52,7 @@ class Install extends BaseModule
$a = self::getApp(); $a = self::getApp();
if (!$a->getMode()->isInstall()) { if (!$a->getMode()->isInstall()) {
throw new \Friendica\Network\HTTPException\ForbiddenException(); throw new HTTPException\ForbiddenException();
} }
// route: install/testrwrite // route: install/testrwrite
@ -58,7 +60,7 @@ class Install extends BaseModule
// @TODO: Replace with parameter from router // @TODO: Replace with parameter from router
if ($a->getArgumentValue(1, '') == 'testrewrite') { if ($a->getArgumentValue(1, '') == 'testrewrite') {
// Status Code 204 means that it worked without content // Status Code 204 means that it worked without content
throw new \Friendica\Network\HTTPException\NoContentException(); throw new HTTPException\NoContentException();
} }
self::$installer = new Core\Installer(); self::$installer = new Core\Installer();
@ -76,7 +78,7 @@ class Install extends BaseModule
public static function post() public static function post()
{ {
$a = self::getApp(); $a = self::getApp();
$configCache = $a->getConfigCache(); $configCache = $a->getConfigCache();
switch (self::$currentWizardStep) { switch (self::$currentWizardStep) {
@ -149,7 +151,7 @@ class Install extends BaseModule
public static function content() public static function content()
{ {
$a = self::getApp(); $a = self::getApp();
$configCache = $a->getConfigCache(); $configCache = $a->getConfigCache();
$output = ''; $output = '';
@ -162,7 +164,7 @@ class Install extends BaseModule
$status = self::$installer->checkEnvironment($a->getBaseURL(), $php_path); $status = self::$installer->checkEnvironment($a->getBaseURL(), $php_path);
$tpl = Renderer::getMarkupTemplate('install_checks.tpl'); $tpl = Renderer::getMarkupTemplate('install_checks.tpl');
$output .= Renderer::replaceMacros($tpl, [ $output .= Renderer::replaceMacros($tpl, [
'$title' => $install_title, '$title' => $install_title,
'$pass' => L10n::t('System check'), '$pass' => L10n::t('System check'),
@ -182,7 +184,7 @@ class Install extends BaseModule
BaseURL::SSL_POLICY_SELFSIGN => L10n::t("Self-signed certificate, use SSL for local links only \x28discouraged\x29") BaseURL::SSL_POLICY_SELFSIGN => L10n::t("Self-signed certificate, use SSL for local links only \x28discouraged\x29")
]; ];
$tpl = Renderer::getMarkupTemplate('install_base.tpl'); $tpl = Renderer::getMarkupTemplate('install_base.tpl');
$output .= Renderer::replaceMacros($tpl, [ $output .= Renderer::replaceMacros($tpl, [
'$title' => $install_title, '$title' => $install_title,
'$pass' => L10n::t('Base settings'), '$pass' => L10n::t('Base settings'),
@ -212,7 +214,7 @@ class Install extends BaseModule
break; break;
case self::DATABASE_CONFIG: case self::DATABASE_CONFIG:
$tpl = Renderer::getMarkupTemplate('install_db.tpl'); $tpl = Renderer::getMarkupTemplate('install_db.tpl');
$output .= Renderer::replaceMacros($tpl, [ $output .= Renderer::replaceMacros($tpl, [
'$title' => $install_title, '$title' => $install_title,
'$pass' => L10n::t('Database connection'), '$pass' => L10n::t('Database connection'),
@ -255,7 +257,7 @@ class Install extends BaseModule
/* Installed langs */ /* Installed langs */
$lang_choices = L10n::getAvailableLanguages(); $lang_choices = L10n::getAvailableLanguages();
$tpl = Renderer::getMarkupTemplate('install_settings.tpl'); $tpl = Renderer::getMarkupTemplate('install_settings.tpl');
$output .= Renderer::replaceMacros($tpl, [ $output .= Renderer::replaceMacros($tpl, [
'$title' => $install_title, '$title' => $install_title,
'$checks' => self::$installer->getChecks(), '$checks' => self::$installer->getChecks(),
@ -291,12 +293,12 @@ class Install extends BaseModule
$db_return_text = ""; $db_return_text = "";
if (count(self::$installer->getChecks()) == 0) { if (count(self::$installer->getChecks()) == 0) {
$txt = '<p style="font-size: 130%;">'; $txt = '<p style="font-size: 130%;">';
$txt .= L10n::t('Your Friendica site database has been installed.') . EOL; $txt .= L10n::t('Your Friendica site database has been installed.') . EOL;
$db_return_text .= $txt; $db_return_text .= $txt;
} }
$tpl = Renderer::getMarkupTemplate('install_finished.tpl'); $tpl = Renderer::getMarkupTemplate('install_finished.tpl');
$output .= Renderer::replaceMacros($tpl, [ $output .= Renderer::replaceMacros($tpl, [
'$title' => $install_title, '$title' => $install_title,
'$checks' => self::$installer->getChecks(), '$checks' => self::$installer->getChecks(),
@ -323,7 +325,7 @@ class Install extends BaseModule
$baseurl = $a->getBaseUrl(); $baseurl = $a->getBaseUrl();
return return
L10n::t('<h1>What next</h1>') L10n::t('<h1>What next</h1>')
. "<p>".L10n::t('IMPORTANT: You will need to [manually] setup a scheduled task for the worker.') . "<p>" . L10n::t('IMPORTANT: You will need to [manually] setup a scheduled task for the worker.')
. L10n::t('Please see the file "INSTALL.txt".') . L10n::t('Please see the file "INSTALL.txt".')
. "</p><p>" . "</p><p>"
. L10n::t('Go to your new Friendica node <a href="%s/register">registration page</a> and register as new user. Remember to use the same email you have entered as administrator email. This will allow you to enter the site admin panel.', $baseurl) . L10n::t('Go to your new Friendica node <a href="%s/register">registration page</a> and register as new user. Remember to use the same email you have entered as administrator email. This will allow you to enter the site admin panel.', $baseurl)
@ -333,13 +335,13 @@ class Install extends BaseModule
/** /**
* Checks the $_POST settings and updates the config Cache for it * Checks the $_POST settings and updates the config Cache for it
* *
* @param Core\Config\Cache\ConfigCache $configCache The current config cache * @param ConfigCache $configCache The current config cache
* @param array $post The $_POST data * @param array $post The $_POST data
* @param string $cat The category of the setting * @param string $cat The category of the setting
* @param string $key The key of the setting * @param string $key The key of the setting
* @param null|string $default The default value * @param null|string $default The default value
*/ */
private static function checkSetting(Core\Config\Cache\ConfigCache $configCache, array $post, $cat, $key, $default = null) private static function checkSetting(ConfigCache $configCache, array $post, $cat, $key, $default = null)
{ {
$configCache->set($cat, $key, $configCache->set($cat, $key,
Strings::escapeTags( Strings::escapeTags(