diff options
Diffstat (limited to 'cli/do-install.php')
| -rwxr-xr-x | cli/do-install.php | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/cli/do-install.php b/cli/do-install.php index 8591f2299..cab4b1462 100755 --- a/cli/do-install.php +++ b/cli/do-install.php @@ -100,7 +100,7 @@ $config = [ $customConfigPath = DATA_PATH . '/config.custom.php'; if (file_exists($customConfigPath)) { $customConfig = include($customConfigPath); - if (is_array($customConfig)) { + if (is_array($customConfig) && is_array_keys_string($customConfig)) { $config = array_merge($customConfig, $config); } } @@ -132,8 +132,14 @@ if ((!empty($config['base_url'])) && is_string($config['base_url']) && Minz_Requ $config['pubsubhubbub_enabled'] = true; } +if (!is_array($config['db'])) { + $config['db'] = []; +} $config['db'] = array_merge($config['db'], array_filter($dbValues, static fn($value) => $value !== null)); +if (!is_string($config['db']['type'] ?? null)) { + $config['db']['type'] = ''; +} performRequirementCheck($config['db']['type']); if (file_put_contents(join_path(DATA_PATH, 'config.php'), @@ -162,9 +168,12 @@ try { if (!$ok) { @unlink(join_path(DATA_PATH, 'config.php')); - fail('FreshRSS database error: ' . (empty($_SESSION['bd_error']) ? 'Unknown error' : $_SESSION['bd_error'])); + fail('FreshRSS database error: ' . (is_string($_SESSION['bd_error'] ?? null) ? $_SESSION['bd_error'] : 'Unknown error')); } +if (!is_string($config['default_user'] ?? null)) { + fail('FreshRSS default user not set!'); +} echo 'ℹ️ Remember to create the default user: ', $config['default_user'], "\t", './cli/create-user.php --user ', $config['default_user'], " --password 'password' --more-options\n"; |