avoid jumping through install steps by url-manipulating; fix pre-selections of select-multiple-settings values;

Signed-off-by: Michael Kaufmann <d00p@froxlor.org>

lib/Froxlor/Install/Install.php

@@ -94,6 +94,13 @@ class Install
 		if (isset($_SESSION['installation']) && $this->currentStep == 0) {
 			unset($_SESSION['installation']);
 		}
+
+		// check for url manipulation or wrong step
+		if ((isset($_SESSION['installation']['stepCompleted']) && ($this->currentStep + 1) > ($_SESSION['installation']['stepCompleted'] ?? 0))
+			|| (!isset($_SESSION['installation']['stepCompleted']) && $this->currentStep > 0)
+		) {
+			$this->currentStep = isset($_SESSION['installation']['stepCompleted']) ? $_SESSION['installation']['stepCompleted'] + 1 : 1;
+		}
 	}
 
 	/**
@@ -115,6 +122,7 @@ class Install
 		UI::twigBuffer('/install/index.html.twig', [
 			'setup' => [
 				'step' => $this->currentStep,
+				'max_steps' => $this->maxSteps,
 			],
 			'preflight' => $this->checkRequirements(),
 			'page' => [
@@ -135,11 +143,10 @@ class Install
 	 */
 	private function handleFormData(array $formfield): void
 	{
-		// Validate user data
-		$validatedData = $this->validateRequest($formfield['sections']['step' . $this->currentStep]['fields']);
-
 		// handle current step
 		if ($this->currentStep <= $this->maxSteps) {
+			// Validate user data
+			$validatedData = $this->validateRequest($formfield['sections']['step' . $this->currentStep]['fields']);
 			// Check database connection (
 			if ($this->currentStep == 1) {
 				$this->checkDatabase($validatedData);
@@ -152,6 +159,7 @@ class Install
 			elseif ($this->currentStep == 3) {
 				$this->checkSystem($validatedData);
 			}
+			$validatedData['stepCompleted'] = ($this->currentStep < $this->maxSteps) ? $this->currentStep : ($this->maxSteps - 1);
 			// Store validated data for later use
 			$_SESSION['installation'] = array_merge($_SESSION['installation'] ?? [], $validatedData);
 		}
@@ -160,7 +168,6 @@ class Install
 		if ($this->currentStep == ($this->maxSteps - 1)) {
 			$core = new Core($_SESSION['installation']);
 			$core->doInstall();
-			// @todo no going back after this point!
 		}
 
 		// redirect user to home if the installation is done
@@ -202,13 +209,13 @@ class Install
 	private function checkRequirements(): array
 	{
 		// check whether we can read the userdata file
-		if (!@touch(dirname(__DIR__, 2).'/.~writecheck'	)) {
+		if (!@touch(dirname(__DIR__, 2) . '/.~writecheck')) {
 			// get possible owner
 			$posixusername = posix_getpwuid(posix_getuid())['name'];
 			$posixgroup = posix_getgrgid(posix_getgid())['name'];
 			$this->criticals['wrong_ownership'] = ['user' => $posixusername, 'group' => $posixgroup];
 		} else {
-			@unlink(dirname(__DIR__, 2).'/.~writecheck');
+			@unlink(dirname(__DIR__, 2) . '/.~writecheck');
 		}
 
 		// check for required extensions

lib/Froxlor/Install/Install/Core.php

@@ -377,6 +377,7 @@ class Core
 		if ($this->validatedData['use_ssl']) {
 			$this->updateSetting($upd_stmt, 1, 'system', 'use_ssl');
 			$this->updateSetting($upd_stmt, 1, 'system', 'leenabled');
+			$this->updateSetting($upd_stmt, 1, 'system', 'le_froxlor_enabled');
 		}
 		$this->updateSetting($upd_stmt, $this->validatedData['servername'], 'system', 'hostname');
 		$this->updateSetting($upd_stmt, 'en', 'panel', 'standardlanguage'); // TODO: set language

lib/Froxlor/UI/Form.php

@@ -148,6 +148,9 @@ class Form
 				case 'select':
 					$fielddata['selected'] = $fielddata['value'];
 					unset($fielddata['value']);
+					if (isset($fielddata['select_mode']) && $fielddata['select_mode'] == 'multiple') {
+						$fielddata['selected'] = array_flip(explode(",", $fielddata['selected']));
+					}
 					break;
 				case 'checkbox':
 					$fielddata['checked'] = (bool)$fielddata['value'];

lib/tablelisting/admin/tablelisting.ipsandports.php

@@ -85,8 +85,6 @@ return [
 		'visible_columns' => Listing::getVisibleColumnsForListing('ipsandports_list', [
 			'ip',
 			'port',
-			'listen',
-			'namevirtualhost',
 			'vhostcontainer',
 			'specialsettings',
 			'servername',

templates/Froxlor/install/index.html.twig

@@ -49,9 +49,13 @@
 							{{ formfields.field(id, field) }}
 						{% endfor %}
 
-						<div class="d-flex justify-content-between mt-4">
+						<div class="d-flex {% if setup.step < setup.max_steps %}justify-content-between{% else %}justify-content-end{% endif %} mt-4">
+							{% if setup.step < setup.max_steps %}
 							<a href="?step={{ setup.step - 1 }}" class="btn btn-secondary">&laquo; {{ lng('panel.back') }}</a>
 							<button type="submit" name="submit" class="btn btn-primary">{{ lng('panel.next') }} &raquo;</button>
+							{% else %}
+							<button type="submit" name="submit" class="btn btn-success">{{ lng('install.install.top') }} &raquo;</button>
+							{% endif %}
 						</div>
 					{% else %}
 						<h4 class="mb-3">{{ lng('install.dependency_check.title') }}</h4>