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

install-finish-magic

Browse Source 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann
2022-08-20 13:44:44 +02:00
parent 07094f231a
commit 3ee04a6e75
9 changed files with 66 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/Froxlor/UI/Panel/UI.php
View File

@@ -163,11 +163,14 @@ class UI
self::$install_mode = $install_mode;
// init twig template engine
$loader = new FilesystemLoader(Froxlor::getInstallDir() . '/templates/');
self::$twig = new Environment($loader, [
'debug' => true,
'cache' => Froxlor::getInstallDir() . '/cache',
'auto_reload' => true
]);
$twig_params = [
'auto_reload' => true,
'debug' => false,
];
if (is_writable(Froxlor::getInstallDir() . '/cache')) {
$twig_params['cache'] = Froxlor::getInstallDir() . '/cache';
}
self::$twig = new Environment($loader, $twig_params);
self::$twig->addExtension(new DebugExtension());
self::$twig->addExtension(new CustomReflection());
self::$twig->addExtension(new FroxlorTwig());

6
lib/formfields/install/formfield.install.php
View File

@@ -231,7 +231,11 @@ return [
'type' => 'checkbox',
'value' => '1',
'checked' => old('manual_config', '0', 'installation'),
]
],
'target_servername' => [
'type' => 'hidden',
'value' => $_SESSION['installation']['servername'] ?? "",
],
]
]
]