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

added more fields and defaults

Browse Source
This commit is contained in:
envoyr
2022-05-01 18:27:00 +02:00
parent fb8143991c
commit 82ea54863d
3 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/Froxlor/Install/Install.php
View File

@@ -42,9 +42,15 @@ class Install
public array $suggestions = [];
public array $criticals = [];
public array $loadedExtensions;
// TODO: add more os
public array $supportedOS = [
'focal' => 'Ubuntu 20.04 LTS (Focal Fossa)'
];
public array $webserverBackend = [
'php-fpm' => 'PHP-FPM',
'fcgid' => 'FCGID',
'none' => 'None',
];
public function __construct()
{
@@ -126,7 +132,7 @@ class Install
// also handle completion of installation if it's the step before the last step
if ($this->currentStep == ($this->maxSteps -1)) {
$core = new \Froxlor\Install\Install\Core($_SESSION['installation']);
$core = new Core($_SESSION['installation']);
$core->doInstall();
}

4
lib/Froxlor/Install/Install/Core.php
View File

@@ -30,6 +30,7 @@ use Froxlor\Config\ConfigParser;
use Froxlor\FileDir;
use Froxlor\Froxlor;
use Froxlor\PhpHelper;
use Froxlor\System\Crypt;
use PDO;
use PDOException;
use PDOStatement;
@@ -503,9 +504,8 @@ class Core
// last but not least create the main admin
$ins_data = [
'loginname' => $this->validatedData['admin_user'],
/* use system default crypt */
'password' => password_hash($this->validatedData['admin_pass'], PASSWORD_DEFAULT),
'email' => 'admin@' . $this->validatedData['servername'],
'email' => $this->validatedData['admin_email'],
'deflang' => 'en' // TODO: set lanuage
];
$ins_stmt = $db_user->prepare("