This commit is contained in:
Yuri Kuznetsov
2024-09-15 13:01:35 +03:00
parent 7d5ceb3c61
commit 9e30e60fb1
140 changed files with 359 additions and 718 deletions
+2 -4
View File
@@ -82,8 +82,7 @@ if (session_status() != \PHP_SESSION_ACTIVE) {
$installerConfig->set('cliSessionId', session_id());
$installerConfig->save();
}
else {
} else {
session_id($installerConfig->get('cliSessionId'));
}
}
@@ -92,8 +91,7 @@ ob_start();
try {
require('entry.php');
}
catch (\Throwable $e) {
} catch (\Throwable $e) {
fwrite(\STDOUT, "Error: ". $e->getMessage() .".\n");
exit;
+1 -2
View File
@@ -658,8 +658,7 @@ class Installer
!isset($paramDefs['options'])
) {
$normalizedParams[$name] = $value;
}
else if (array_key_exists('default', $paramDefs)) {
} else if (array_key_exists('default', $paramDefs)) {
$normalizedParams[$name] = $paramDefs['default'];
$GLOBALS['log']->warning(
+2 -4
View File
@@ -36,13 +36,11 @@ if (!empty($_SESSION['install']['user-name']) && !empty($_SESSION['install']['us
if (!empty($userId)) {
$result['success'] = true;
}
else {
} else {
$result['success'] = false;
$result['errorMsg'] = 'Cannot create user';
}
}
else {
} else {
$result['success'] = false;
$result['errorMsg'] = 'Cannot create user';
}
+2 -4
View File
@@ -68,13 +68,11 @@ if (!empty($_SESSION['install'])) {
$res = $installer->savePreferences($preferences);
if (!empty($res)) {
$result['success'] = true;
}
else {
} else {
$result['success'] = false;
$result['errorMsg'] = 'Cannot save preferences';
}
}
else {
} else {
$result['success'] = false;
$result['errorMsg'] = 'Cannot save preferences';
}
+1 -2
View File
@@ -52,8 +52,7 @@ if (!empty($_SESSION['install'])) {
$res = $installer->savePreferences($preferences);
if (!empty($res)) {
$result['success'] = true;
}
else {
} else {
$result['success'] = false;
$result['errorMsg'] = 'Cannot save preferences';
}
+1 -2
View File
@@ -36,8 +36,7 @@ $fields = array(
foreach ($fields as $fieldName => $field) {
if (isset($_SESSION['install'][$fieldName])) {
$fields[$fieldName]['value'] = $_SESSION['install'][$fieldName];
}
else {
} else {
$fields[$fieldName]['value'] = (isset($fields[$fieldName]['default']))? $fields[$fieldName]['default'] : '';
}
}
+1 -2
View File
@@ -38,8 +38,7 @@ $fields = array(
foreach ($fields as $fieldName => $field) {
if (isset($_SESSION['install'][$fieldName])) {
$fields[$fieldName]['value'] = $_SESSION['install'][$fieldName];
}
else {
} else {
$fields[$fieldName]['value'] = (isset($fields[$fieldName]['default']))? $fields[$fieldName]['default'] : '';
}
}