Update doignore() in main.js to match new Item\Ignore return type

[friendica.git] / src / Module / Install.php

diff --git a/src/Module/Install.php b/src/Module/Install.php
index 54c6141cc725fcda67362dabab8284aa674ee5ba..71547ad51e4778250fcf84ad2fbc43224fd31cf5 100644 (file)
--- a/src/Module/Install.php
+++ b/src/Module/Install.php
@@ -10,7 +10,6 @@ use Friendica\Core\L10n;
 use Friendica\Core\Renderer;
 use Friendica\Network\HTTPException;
 use Friendica\Util\BasePath;
-use Friendica\Util\BaseURL;
 use Friendica\Util\Strings;
 use Friendica\Util\Temporal;
 
@@ -47,7 +46,7 @@ class Install extends BaseModule
         */
        private static $installer;
 
-       public static function init()
+       public static function init(array $parameters = [])
        {
                $a = self::getApp();
 
@@ -67,16 +66,17 @@ class Install extends BaseModule
 
                // get basic installation information and save them to the config cache
                $configCache = $a->getConfigCache();
-               self::$installer->setUpCache($configCache, BasePath::create($a->getBasePath(), $_SERVER));
+               $basePath = new BasePath($a->getBasePath());
+               self::$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'] = $a->getBaseURL() . '/view/install/style.css';
 
-               self::$currentWizardStep = defaults($_POST, 'pass', self::SYSTEM_CHECK);
+               self::$currentWizardStep = ($_POST['pass'] ?? '') ?: self::SYSTEM_CHECK;
        }
 
-       public static function post()
+       public static function post(array $parameters = [])
        {
                $a           = self::getApp();
                $configCache = $a->getConfigCache();
@@ -110,7 +110,7 @@ class Install extends BaseModule
                                self::checkSetting($configCache, $_POST, 'database', 'database', '');
 
                                // If we cannot connect to the database, return to the previous step
-                               if (!self::$installer->checkDB($configCache, $a->getProfiler())) {
+                               if (!self::$installer->checkDB($a->getDBA())) {
                                        self::$currentWizardStep = self::DATABASE_CONFIG;
                                }
 
@@ -134,7 +134,7 @@ class Install extends BaseModule
                                self::checkSetting($configCache, $_POST, 'config', 'admin_email', '');
 
                                // If we cannot connect to the database, return to the Database config wizard
-                               if (!self::$installer->checkDB($configCache, $a->getProfiler())) {
+                               if (!self::$installer->checkDB($a->getDBA())) {
                                        self::$currentWizardStep = self::DATABASE_CONFIG;
                                        return;
                                }
@@ -149,7 +149,7 @@ class Install extends BaseModule
                }
        }
 
-       public static function content()
+       public static function content(array $parameters = [])
        {
                $a           = self::getApp();
                $configCache = $a->getConfigCache();
@@ -179,9 +179,9 @@ class Install extends BaseModule
 
                        case self::BASE_CONFIG:
                                $ssl_choices = [
-                                       BaseURL::SSL_POLICY_NONE     => L10n::t("No SSL policy, links will track page SSL state"),
-                                       BaseURL::SSL_POLICY_FULL     => L10n::t("Force all links to use SSL"),
-                                       BaseURL::SSL_POLICY_SELFSIGN => L10n::t("Self-signed certificate, use SSL for local links only \x28discouraged\x29")
+                                       App\BaseURL::SSL_POLICY_NONE     => L10n::t("No SSL policy, links will track page SSL state"),
+                                       App\BaseURL::SSL_POLICY_FULL     => L10n::t("Force all links to use SSL"),
+                                       App\BaseURL::SSL_POLICY_SELFSIGN => L10n::t("Self-signed certificate, use SSL for local links only \x28discouraged\x29")
                                ];
 
                                $tpl    = Renderer::getMarkupTemplate('install_base.tpl');
@@ -345,8 +345,8 @@ class Install extends BaseModule
        {
                $configCache->set($cat, $key,
                        Strings::escapeTags(
-                               trim(defaults($post, sprintf('%s-%s', $cat, $key),
-                                               (!isset($default) ? $configCache->get($cat, $key) : $default))
+                               trim(($post[sprintf('%s-%s', $cat, $key)] ?? '') ?:
+                                               ($default ?? $configCache->get($cat, $key))
                                )
                        )
                );