From 8c0f047bc7d2245de378b3dfb5c794515f0f6113 Mon Sep 17 00:00:00 2001 From: Philipp Holzer Date: Fri, 12 Jul 2019 23:08:01 +0200 Subject: [PATCH] Add namespace --- src/Module/Install.php | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/src/Module/Install.php b/src/Module/Install.php index 51a63611b6..54c6141cc7 100644 --- a/src/Module/Install.php +++ b/src/Module/Install.php @@ -5,8 +5,10 @@ namespace Friendica\Module; use Friendica\App; use Friendica\BaseModule; use Friendica\Core; +use Friendica\Core\Config\Cache\ConfigCache; use Friendica\Core\L10n; use Friendica\Core\Renderer; +use Friendica\Network\HTTPException; use Friendica\Util\BasePath; use Friendica\Util\BaseURL; use Friendica\Util\Strings; @@ -50,7 +52,7 @@ class Install extends BaseModule $a = self::getApp(); if (!$a->getMode()->isInstall()) { - throw new \Friendica\Network\HTTPException\ForbiddenException(); + throw new HTTPException\ForbiddenException(); } // route: install/testrwrite @@ -58,7 +60,7 @@ class Install extends BaseModule // @TODO: Replace with parameter from router if ($a->getArgumentValue(1, '') == 'testrewrite') { // Status Code 204 means that it worked without content - throw new \Friendica\Network\HTTPException\NoContentException(); + throw new HTTPException\NoContentException(); } self::$installer = new Core\Installer(); @@ -76,7 +78,7 @@ class Install extends BaseModule public static function post() { - $a = self::getApp(); + $a = self::getApp(); $configCache = $a->getConfigCache(); switch (self::$currentWizardStep) { @@ -149,7 +151,7 @@ class Install extends BaseModule public static function content() { - $a = self::getApp(); + $a = self::getApp(); $configCache = $a->getConfigCache(); $output = ''; @@ -162,7 +164,7 @@ class Install extends BaseModule $status = self::$installer->checkEnvironment($a->getBaseURL(), $php_path); - $tpl = Renderer::getMarkupTemplate('install_checks.tpl'); + $tpl = Renderer::getMarkupTemplate('install_checks.tpl'); $output .= Renderer::replaceMacros($tpl, [ '$title' => $install_title, '$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") ]; - $tpl = Renderer::getMarkupTemplate('install_base.tpl'); + $tpl = Renderer::getMarkupTemplate('install_base.tpl'); $output .= Renderer::replaceMacros($tpl, [ '$title' => $install_title, '$pass' => L10n::t('Base settings'), @@ -212,7 +214,7 @@ class Install extends BaseModule break; case self::DATABASE_CONFIG: - $tpl = Renderer::getMarkupTemplate('install_db.tpl'); + $tpl = Renderer::getMarkupTemplate('install_db.tpl'); $output .= Renderer::replaceMacros($tpl, [ '$title' => $install_title, '$pass' => L10n::t('Database connection'), @@ -255,7 +257,7 @@ class Install extends BaseModule /* Installed langs */ $lang_choices = L10n::getAvailableLanguages(); - $tpl = Renderer::getMarkupTemplate('install_settings.tpl'); + $tpl = Renderer::getMarkupTemplate('install_settings.tpl'); $output .= Renderer::replaceMacros($tpl, [ '$title' => $install_title, '$checks' => self::$installer->getChecks(), @@ -291,12 +293,12 @@ class Install extends BaseModule $db_return_text = ""; if (count(self::$installer->getChecks()) == 0) { - $txt = '

'; - $txt .= L10n::t('Your Friendica site database has been installed.') . EOL; + $txt = '

'; + $txt .= L10n::t('Your Friendica site database has been installed.') . EOL; $db_return_text .= $txt; } - $tpl = Renderer::getMarkupTemplate('install_finished.tpl'); + $tpl = Renderer::getMarkupTemplate('install_finished.tpl'); $output .= Renderer::replaceMacros($tpl, [ '$title' => $install_title, '$checks' => self::$installer->getChecks(), @@ -323,7 +325,7 @@ class Install extends BaseModule $baseurl = $a->getBaseUrl(); return L10n::t('

What next

') - . "

".L10n::t('IMPORTANT: You will need to [manually] setup a scheduled task for the worker.') + . "

" . 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('Go to your new Friendica node registration page 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 * - * @param Core\Config\Cache\ConfigCache $configCache The current config cache + * @param ConfigCache $configCache The current config cache * @param array $post The $_POST data * @param string $cat The category of the setting * @param string $key The key of the setting * @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, Strings::escapeTags( -- 2.39.5