diff --git a/install/froxlor.sql b/install/froxlor.sql index 5be76c53..b8dd9643 100644 --- a/install/froxlor.sql +++ b/install/froxlor.sql @@ -658,7 +658,7 @@ opcache.validate_timestamps'), ('system', 'hsts_preload', '0'), ('system', 'leregistered', '0'), ('system', 'leaccount', ''), - ('system', 'nssextrausers', '0'), + ('system', 'nssextrausers', '1'), ('system', 'le_domain_dnscheck', '1'), ('system', 'ssl_protocols', 'TLSv1.2'), ('system', 'tlsv13_cipher_list', ''), diff --git a/install/lib/class.FroxlorInstall.php b/install/lib/class.FroxlorInstall.php index 8469718d..7b0b5b31 100644 --- a/install/lib/class.FroxlorInstall.php +++ b/install/lib/class.FroxlorInstall.php @@ -984,6 +984,9 @@ class FroxlorInstall foreach ($distros as $_distribution) { $dist = new \Froxlor\Config\ConfigParser($_distribution); $dist_display = $dist->distributionName . " " . $dist->distributionCodename . " (" . $dist->distributionVersion . ")"; + if ($dist->deprecated) { + $dist_display .= " [deprecated]"; + } $distributions_select_data[] = [ 'label' => $dist_display, 'value' => str_replace(".xml", "", strtolower(basename($_distribution))), diff --git a/lib/Froxlor/Ajax/Ajax.php b/lib/Froxlor/Ajax/Ajax.php index 0bea38b1..4c8e0b19 100644 --- a/lib/Froxlor/Ajax/Ajax.php +++ b/lib/Froxlor/Ajax/Ajax.php @@ -116,6 +116,8 @@ class Ajax return $this->resetTablelisting(); case 'editapikey': return $this->editApiKey(); + case 'getConfigDetails': + return $this->getConfigDetails(); default: return $this->errorResponse('Action not found!'); } @@ -317,4 +319,15 @@ class Ajax )); return $this->jsonResponse(['allowed_from' => $allowed_from, 'valid_until' => $valid_until]); } + + private function getConfigDetails() + { + $distro = isset($_POST['distro,']) ? $_POST['distro,'] : ""; + $section = isset($_POST['section']) ? $_POST['section'] : ""; + $daemon = isset($_POST['daemon']) ? $_POST['daemon'] : ""; + + // @todo + + return $this->jsonResponse(['title' => 'TODO', 'content' => '