Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-02-01 06:19:48 +00:00
Code Issues Projects Releases Packages Wiki Activity

Make PHP-CS happy

Browse source
This commit is contained in:
Philipp 2025-01-05 22:53:00 +01:00 • committed by Hypolite Petovan
parent f53292cb11
commit ae8450f4fb
2 changed files with 66 additions and 64 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

102
src/Module/Install.php
View file

@ -179,20 +179,20 @@ class Install extends BaseModule
$status = $this->installer->checkEnvironment($this->baseUrl, $php_path); $status = $this->installer->checkEnvironment($this->baseUrl, $php_path);
$tpl = Renderer::getMarkupTemplate('install/01_checks.tpl'); $tpl = Renderer::getMarkupTemplate('install/01_checks.tpl');
$output .= Renderer::replaceMacros($tpl, [ $output .= Renderer::replaceMacros($tpl, [
'$title' => $install_title, '$title' => $install_title,
'$pass' => $this->t('System check'), '$pass' => $this->t('System check'),
'$required' => $this->t('Required'), '$required' => $this->t('Required'),
'$requirement_not_satisfied' => $this->t('Requirement not satisfied'), '$requirement_not_satisfied' => $this->t('Requirement not satisfied'),
'$optional_requirement_not_satisfied' => $this->t('Optional requirement not satisfied'), '$optional_requirement_not_satisfied' => $this->t('Optional requirement not satisfied'),
'$ok' => $this->t('OK'), '$ok' => $this->t('OK'),
'$checks' => $this->installer->getChecks(), '$checks' => $this->installer->getChecks(),
'$passed' => $status, '$passed' => $status,
'$see_install' => $this->t('Please see the file "doc/INSTALL.md".'), '$see_install' => $this->t('Please see the file "doc/INSTALL.md".'),
'$next' => $this->t('Next'), '$next' => $this->t('Next'),
'$reload' => $this->t('Check again'), '$reload' => $this->t('Check again'),
'$php_path' => $php_path, '$php_path' => $php_path,
]); ]);
break; break;
@ -201,62 +201,62 @@ class Install extends BaseModule
new Uri($this->configCache->get('system', 'url')) : new Uri($this->configCache->get('system', 'url')) :
$this->baseUrl; $this->baseUrl;
$tpl = Renderer::getMarkupTemplate('install/02_base_config.tpl'); $tpl = Renderer::getMarkupTemplate('install/02_base_config.tpl');
$output .= Renderer::replaceMacros($tpl, [ $output .= Renderer::replaceMacros($tpl, [
'$title' => $install_title, '$title' => $install_title,
'$pass' => $this->t('Base settings'), '$pass' => $this->t('Base settings'),
'$basepath' => ['system-basepath', '$basepath' => ['system-basepath',
$this->t("Base path to installation"), $this->t("Base path to installation"),
$this->configCache->get('system', 'basepath'), $this->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("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')], $this->t('Required')],
'$system_url' => ['system-url', '$system_url' => ['system-url',
$this->t('The Friendica system URL'), $this->t('The Friendica system URL'),
(string)$baseUrl, (string)$baseUrl,
$this->t("Overwrite this field in case the system URL determination isn't right, otherwise leave it as is."), $this->t("Overwrite this field in case the system URL determination isn't right, otherwise leave it as is."),
$this->t('Required')], $this->t('Required')],
'$php_path' => $this->configCache->get('config', 'php_path'), '$php_path' => $this->configCache->get('config', 'php_path'),
'$submit' => $this->t('Submit'), '$submit' => $this->t('Submit'),
]); ]);
break; break;
case self::DATABASE_CONFIG: case self::DATABASE_CONFIG:
$tpl = Renderer::getMarkupTemplate('install/03_database_config.tpl'); $tpl = Renderer::getMarkupTemplate('install/03_database_config.tpl');
$output .= Renderer::replaceMacros($tpl, [ $output .= Renderer::replaceMacros($tpl, [
'$title' => $install_title, '$title' => $install_title,
'$pass' => $this->t('Database connection'), '$pass' => $this->t('Database connection'),
'$info_01' => $this->t('In order to install Friendica we need to know how to connect to your database.'), '$info_01' => $this->t('In order to install Friendica we need to know how to connect to your database.'),
'$info_02' => $this->t('Please contact your hosting provider or site administrator if you have questions about these settings.'), '$info_02' => $this->t('Please contact your hosting provider or site administrator if you have questions about these settings.'),
'$info_03' => $this->t('The database you specify below should already exist. If it does not, please create it before continuing.'), '$info_03' => $this->t('The database you specify below should already exist. If it does not, please create it before continuing.'),
'$required' => $this->t('Required'), '$required' => $this->t('Required'),
'$requirement_not_satisfied' => $this->t('Requirement not satisfied'), '$requirement_not_satisfied' => $this->t('Requirement not satisfied'),
'$checks' => $this->installer->getChecks(), '$checks' => $this->installer->getChecks(),
'$basepath' => $this->configCache->get('system', 'basepath'), '$basepath' => $this->configCache->get('system', 'basepath'),
'$system_url' => $this->configCache->get('system', 'url'), '$system_url' => $this->configCache->get('system', 'url'),
'$dbhost' => ['database-hostname', '$dbhost' => ['database-hostname',
$this->t('Database Server Name'), $this->t('Database Server Name'),
$this->configCache->get('database', 'hostname'), $this->configCache->get('database', 'hostname'),
'', '',
$this->t('Required')], $this->t('Required')],
'$dbuser' => ['database-username', '$dbuser' => ['database-username',
$this->t('Database Login Name'), $this->t('Database Login Name'),
$this->configCache->get('database', 'username'), $this->configCache->get('database', 'username'),
'', '',
$this->t('Required'), $this->t('Required'),
'autofocus'], 'autofocus'],
'$dbpass' => ['database-password', '$dbpass' => ['database-password',
$this->t('Database Login Password'), $this->t('Database Login Password'),
$this->configCache->get('database', 'password'), $this->configCache->get('database', 'password'),
$this->t("For security reasons the password must not be empty"), $this->t("For security reasons the password must not be empty"),
$this->t('Required')], $this->t('Required')],
'$dbdata' => ['database-database', '$dbdata' => ['database-database',
$this->t('Database Name'), $this->t('Database Name'),
$this->configCache->get('database', 'database'), $this->configCache->get('database', 'database'),
'', '',
$this->t('Required')], $this->t('Required')],
'$lbl_10' => $this->t('Please select a default timezone for your website'), '$lbl_10' => $this->t('Please select a default timezone for your website'),
'$php_path' => $this->configCache->get('config', 'php_path'), '$php_path' => $this->configCache->get('config', 'php_path'),
'$submit' => $this->t('Submit') '$submit' => $this->t('Submit')
]); ]);
break; break;
@ -264,7 +264,7 @@ class Install extends BaseModule
/* Installed langs */ /* Installed langs */
$lang_choices = $this->l10n->getAvailableLanguages(); $lang_choices = $this->l10n->getAvailableLanguages();
$tpl = Renderer::getMarkupTemplate('install/04_site_settings.tpl'); $tpl = Renderer::getMarkupTemplate('install/04_site_settings.tpl');
$output .= Renderer::replaceMacros($tpl, [ $output .= Renderer::replaceMacros($tpl, [
'$title' => $install_title, '$title' => $install_title,
'$required' => $this->t('Required'), '$required' => $this->t('Required'),
@ -281,17 +281,19 @@ class Install extends BaseModule
$this->configCache->get('config', 'admin_email'), $this->configCache->get('config', 'admin_email'),
$this->t('Your account email address must match this in order to use the web admin panel.'), $this->t('Your account email address must match this in order to use the web admin panel.'),
$this->t('Required'), 'autofocus', 'email'], $this->t('Required'), 'autofocus', 'email'],
'$timezone' => Temporal::getTimezoneField('system-default_timezone', '$timezone' => Temporal::getTimezoneField(
'system-default_timezone',
$this->t('Please select a default timezone for your website'), $this->t('Please select a default timezone for your website'),
$this->configCache->get('system', 'default_timezone'), $this->configCache->get('system', 'default_timezone'),
''), ''
'$language' => ['system-language', ),
'$language' => ['system-language',
$this->t('System Language:'), $this->t('System Language:'),
$this->configCache->get('system', 'language'), $this->configCache->get('system', 'language'),
$this->t('Set the default language for your Friendica installation interface and to send emails.'), $this->t('Set the default language for your Friendica installation interface and to send emails.'),
$lang_choices], $lang_choices],
'$php_path' => $this->configCache->get('config', 'php_path'), '$php_path' => $this->configCache->get('config', 'php_path'),
'$submit' => $this->t('Submit') '$submit' => $this->t('Submit')
]); ]);
break; break;
@ -299,19 +301,19 @@ class Install extends BaseModule
$db_return_text = ""; $db_return_text = "";
if (count($this->installer->getChecks()) == 0) { if (count($this->installer->getChecks()) == 0) {
$txt = '<p style="font-size: 130%;">'; $txt = '<p style="font-size: 130%;">';
$txt .= $this->t('Your Friendica site database has been installed.') . '<br />'; $txt .= $this->t('Your Friendica site database has been installed.') . '<br />';
$db_return_text .= $txt; $db_return_text .= $txt;
} }
$tpl = Renderer::getMarkupTemplate('install/05_finished.tpl'); $tpl = Renderer::getMarkupTemplate('install/05_finished.tpl');
$output .= Renderer::replaceMacros($tpl, [ $output .= Renderer::replaceMacros($tpl, [
'$title' => $install_title, '$title' => $install_title,
'$required' => $this->t('Required'), '$required' => $this->t('Required'),
'$requirement_not_satisfied' => $this->t('Requirement not satisfied'), '$requirement_not_satisfied' => $this->t('Requirement not satisfied'),
'$checks' => $this->installer->getChecks(), '$checks' => $this->installer->getChecks(),
'$pass' => $this->t('Installation finished'), '$pass' => $this->t('Installation finished'),
'$text' => $db_return_text . $this->whatNext(), '$text' => $db_return_text . $this->whatNext(),
]); ]);
break; break;

28
src/Module/Settings/TwoFactor/AppSpecific.php
View file

@ -38,7 +38,7 @@ class AppSpecific extends BaseSettings
{ {
parent::__construct($session, $page, $l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters); parent::__construct($session, $page, $l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
$this->pConfig = $pConfig; $this->pConfig = $pConfig;
$this->systemMessages = $systemMessages; $this->systemMessages = $systemMessages;
if (!$this->session->getLocalUserId()) { if (!$this->session->getLocalUserId()) {
@ -81,7 +81,7 @@ class AppSpecific extends BaseSettings
} }
break; break;
case 'revoke_all' : case 'revoke_all':
AppSpecificPassword::deleteAllForUser($this->session->getLocalUserId()); AppSpecificPassword::deleteAllForUser($this->session->getLocalUserId());
$this->systemMessages->addInfo($this->t('App-specific passwords successfully revoked.')); $this->systemMessages->addInfo($this->t('App-specific passwords successfully revoked.'));
$this->baseUrl->redirect('settings/2fa/app_specific?t=' . self::getFormSecurityToken('settings_2fa_password')); $this->baseUrl->redirect('settings/2fa/app_specific?t=' . self::getFormSecurityToken('settings_2fa_password'));
@ -114,22 +114,22 @@ class AppSpecific extends BaseSettings
'$form_security_token' => self::getFormSecurityToken('settings_2fa_app_specific'), '$form_security_token' => self::getFormSecurityToken('settings_2fa_app_specific'),
'$password_security_token' => self::getFormSecurityToken('settings_2fa_password'), '$password_security_token' => self::getFormSecurityToken('settings_2fa_password'),
'$title' => $this->t('Two-factor app-specific passwords'), '$title' => $this->t('Two-factor app-specific passwords'),
'$help_label' => $this->t('Help'), '$help_label' => $this->t('Help'),
'$message' => $this->t('<p>App-specific passwords are randomly generated passwords used instead your regular password to authenticate your account on third-party applications that don\'t support two-factor authentication.</p>'), '$message' => $this->t('<p>App-specific passwords are randomly generated passwords used instead your regular password to authenticate your account on third-party applications that don\'t support two-factor authentication.</p>'),
'$generated_message' => $this->t('Make sure to copy your new app-specific password now. You won’t be able to see it again!'), '$generated_message' => $this->t('Make sure to copy your new app-specific password now. You won’t be able to see it again!'),
'$generated_app_specific_password' => $this->appSpecificPassword, '$generated_app_specific_password' => $this->appSpecificPassword,
'$description_label' => $this->t('Description'), '$description_label' => $this->t('Description'),
'$last_used_label' => $this->t('Last Used'), '$last_used_label' => $this->t('Last Used'),
'$revoke_label' => $this->t('Revoke'), '$revoke_label' => $this->t('Revoke'),
'$revoke_all_label' => $this->t('Revoke All'), '$revoke_all_label' => $this->t('Revoke All'),
'$app_specific_passwords' => $appSpecificPasswords, '$app_specific_passwords' => $appSpecificPasswords,
'$generate_message' => $this->t('When you generate a new app-specific password, you must use it right away, it will be shown to you once after you generate it.'), '$generate_message' => $this->t('When you generate a new app-specific password, you must use it right away, it will be shown to you once after you generate it.'),
'$generate_title' => $this->t('Generate new app-specific password'), '$generate_title' => $this->t('Generate new app-specific password'),
'$description_placeholder_label' => $this->t('Friendiqa on my Fairphone 2...'), '$description_placeholder_label' => $this->t('Friendiqa on my Fairphone 2...'),
'$generate_label' => $this->t('Generate'), '$generate_label' => $this->t('Generate'),
]); ]);
} }
} }