maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

fix potential infinite loop on errors in cli-installation; fixes #1092

Browse Source 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann
2023-01-26 15:21:38 +01:00
parent 492cd288bc
commit 0a363910d6
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/Froxlor/Cli/InstallCommand.php
View File

@@ -246,7 +246,10 @@ final class InstallCommand extends Command
} }
} catch (Exception $e) { } catch (Exception $e) {
$this->io->error($e->getMessage()); $this->io->error($e->getMessage());
return $this->showStep($step, $extended, $decoded_input); if ($this->io->confirm('Retry?', empty($decoded_input))) {
return $this->showStep($step, $extended, $decoded_input);
}
return self::FAILURE;
} }
if ($step == 3) { if ($step == 3) {
// do actual install with data from $this->formfielddata // do actual install with data from $this->formfielddata
@@ -297,7 +300,7 @@ final class InstallCommand extends Command
$json_output = []; $json_output = [];
foreach ($fields['install']['sections'] as $section => $section_fields) { foreach ($fields['install']['sections'] as $section => $section_fields) {
foreach ($section_fields['fields'] as $name => $field) { foreach ($section_fields['fields'] as $name => $field) {
if ($name == 'system' || $name == 'manual_config') { if ($name == 'system' || $name == 'manual_config' || $name == 'target_servername') {
continue; continue;
} }
if ($field['type'] == 'text' || $field['type'] == 'email') { if ($field['type'] == 'text' || $field['type'] == 'email') {