]> git.mxchange.org Git - friendica.git/blobdiff - src/Module/Install.php
Merge pull request #10040 from annando/file-permissions
[friendica.git] / src / Module / Install.php
index 21510d206e3baa225caf2e16526b45ee6b1736ce..2a9bab81ec085fbe944c11fe36274e90255db2f1 100644 (file)
@@ -26,6 +26,7 @@ use Friendica\BaseModule;
 use Friendica\Core;
 use Friendica\Core\Config\Cache;
 use Friendica\Core\Renderer;
+use Friendica\Core\Theme;
 use Friendica\DI;
 use Friendica\Network\HTTPException;
 use Friendica\Util\BasePath;
@@ -162,6 +163,16 @@ class Install extends BaseModule
                                }
 
                                self::$installer->installDatabase($configCache->get('system', 'basepath'));
+                       
+                               // install allowed themes to register theme hooks
+                               // this is same as "Reload active theme" in /admin/themes
+                               $allowed_themes = Theme::getAllowedList();
+                               $allowed_themes = array_unique($allowed_themes);
+                               foreach ($allowed_themes as $theme) {
+                                       Theme::uninstall($theme);
+                                       Theme::install($theme);
+                               }
+                               Theme::setAllowedList($allowed_themes);
 
                                break;
                }
@@ -186,9 +197,13 @@ class Install extends BaseModule
                                $output .= Renderer::replaceMacros($tpl, [
                                        '$title'       => $install_title,
                                        '$pass'        => DI::l10n()->t('System check'),
+                                       '$required'    => DI::l10n()->t('Required'),
+                                       '$requirement_not_satisfied' => DI::l10n()->t('Requirement not satisfied'),
+                                       '$optional_requirement_not_satisfied' => DI::l10n()->t('Optional requirement not satisfied'),
+                                       '$ok'          => DI::l10n()->t('OK'),
                                        '$checks'      => self::$installer->getChecks(),
                                        '$passed'      => $status,
-                                       '$see_install' => DI::l10n()->t('Please see the file "INSTALL.txt".'),
+                                       '$see_install' => DI::l10n()->t('Please see the file "doc/INSTALL.md".'),
                                        '$next'        => DI::l10n()->t('Next'),
                                        '$reload'      => DI::l10n()->t('Check again'),
                                        '$php_path'    => $php_path,
@@ -215,12 +230,12 @@ class Install extends BaseModule
                                                DI::l10n()->t('Host name'),
                                                $configCache->get('config', 'hostname'),
                                                DI::l10n()->t('Overwrite this field in case the determinated hostname isn\'t right, otherweise leave it as is.'),
-                                               'required'],
+                                               DI::l10n()->t('Required')],
                                        '$basepath'   => ['system-basepath',
                                                DI::l10n()->t("Base path to installation"),
                                                $configCache->get('system', 'basepath'),
                                                DI::l10n()->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."),
-                                               'required'],
+                                               DI::l10n()->t('Required')],
                                        '$urlpath'    => ['system-urlpath',
                                                DI::l10n()->t('Sub path of the URL'),
                                                $configCache->get('system', 'urlpath'),
@@ -239,7 +254,9 @@ class Install extends BaseModule
                                        '$info_01'    => DI::l10n()->t('In order to install Friendica we need to know how to connect to your database.'),
                                        '$info_02'    => DI::l10n()->t('Please contact your hosting provider or site administrator if you have questions about these settings.'),
                                        '$info_03'    => DI::l10n()->t('The database you specify below should already exist. If it does not, please create it before continuing.'),
-                                       'checks'      => self::$installer->getChecks(),
+                                       '$required'   => DI::l10n()->t('Required'),
+                                       '$requirement_not_satisfied' => DI::l10n()->t('Requirement not satisfied'),
+                                       '$checks'     => self::$installer->getChecks(),
                                        '$hostname'   => $configCache->get('config', 'hostname'),
                                        '$ssl_policy' => $configCache->get('system', 'ssl_policy'),
                                        '$basepath'   => $configCache->get('system', 'basepath'),
@@ -248,23 +265,23 @@ class Install extends BaseModule
                                                DI::l10n()->t('Database Server Name'),
                                                $configCache->get('database', 'hostname'),
                                                '',
-                                               'required'],
+                                               DI::l10n()->t('Required')],
                                        '$dbuser'     => ['database-username',
                                                DI::l10n()->t('Database Login Name'),
                                                $configCache->get('database', 'username'),
                                                '',
-                                               'required',
+                                               DI::l10n()->t('Required'),
                                                'autofocus'],
                                        '$dbpass'     => ['database-password',
                                                DI::l10n()->t('Database Login Password'),
                                                $configCache->get('database', 'password'),
                                                DI::l10n()->t("For security reasons the password must not be empty"),
-                                               'required'],
+                                               DI::l10n()->t('Required')],
                                        '$dbdata'     => ['database-database',
                                                DI::l10n()->t('Database Name'),
                                                $configCache->get('database', 'database'),
                                                '',
-                                               'required'],
+                                               DI::l10n()->t('Required')],
                                        '$lbl_10'     => DI::l10n()->t('Please select a default timezone for your website'),
                                        '$php_path'   => $configCache->get('config', 'php_path'),
                                        '$submit'     => DI::l10n()->t('Submit')
@@ -278,6 +295,7 @@ class Install extends BaseModule
                                $tpl    = Renderer::getMarkupTemplate('install_settings.tpl');
                                $output .= Renderer::replaceMacros($tpl, [
                                        '$title'      => $install_title,
+                                       '$required'   => DI::l10n()->t('Required'),
                                        '$checks'     => self::$installer->getChecks(),
                                        '$pass'       => DI::l10n()->t('Site settings'),
                                        '$hostname'   => $configCache->get('config', 'hostname'),
@@ -292,7 +310,7 @@ class Install extends BaseModule
                                                DI::l10n()->t('Site administrator email address'),
                                                $configCache->get('config', 'admin_email'),
                                                DI::l10n()->t('Your account email address must match this in order to use the web admin panel.'),
-                                               'required', 'autofocus', 'email'],
+                                               DI::l10n()->t('Required'), 'autofocus', 'email'],
                                        '$timezone'   => Temporal::getTimezoneField('system-default_timezone',
                                                DI::l10n()->t('Please select a default timezone for your website'),
                                                $configCache->get('system', 'default_timezone'),
@@ -318,10 +336,12 @@ class Install extends BaseModule
 
                                $tpl    = Renderer::getMarkupTemplate('install_finished.tpl');
                                $output .= Renderer::replaceMacros($tpl, [
-                                       '$title'  => $install_title,
-                                       '$checks' => self::$installer->getChecks(),
-                                       '$pass'   => DI::l10n()->t('Installation finished'),
-                                       '$text'   => $db_return_text . self::whatNext(),
+                                       '$title'    => $install_title,
+                                       '$required' => DI::l10n()->t('Required'),
+                                       '$requirement_not_satisfied' => DI::l10n()->t('Requirement not satisfied'),
+                                       '$checks'   => self::$installer->getChecks(),
+                                       '$pass'     => DI::l10n()->t('Installation finished'),
+                                       '$text'     => $db_return_text . self::whatNext(),
                                ]);
 
                                break;
@@ -342,7 +362,7 @@ class Install extends BaseModule
                return
                        DI::l10n()->t('<h1>What next</h1>')
                        . "<p>" . DI::l10n()->t('IMPORTANT: You will need to [manually] setup a scheduled task for the worker.')
-                       . DI::l10n()->t('Please see the file "INSTALL.txt".')
+                       . DI::l10n()->t('Please see the file "doc/INSTALL.md".')
                        . "</p><p>"
                        . DI::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)
                        . "</p>";