fix view function in init and update dirname level in install

This commit is contained in:
envoyr
2022-04-28 16:57:35 +02:00
parent 5d08d5235d
commit da89315a10
2 changed files with 3 additions and 10 deletions

View File

@@ -34,8 +34,8 @@ class Install
public string $requiredVersion = '7.4.0';
public array $requiredExtensions = ['libxml', 'zip'];
public array $suggestedExtensions = ['curl'];
public array $suggestions;
public array $criticals;
public array $suggestions = [];
public array $criticals = [];
public function __construct()
{
@@ -76,7 +76,7 @@ class Install
public function handle()
{
$formfield = require dirname(__DIR__) . '/lib/formfields/install/formfield.install.php';
$formfield = require dirname(__DIR__, 3) . '/lib/formfields/install/formfield.install.php';
// init twig
UI::initTwig(true);

View File

@@ -26,13 +26,6 @@
// define default theme for configurehint, etc.
$_deftheme = 'Froxlor';
function view($template, $attributes)
{
$view = file_get_contents(dirname(__DIR__) . '/templates/' . $template);
return str_replace(array_keys($attributes), array_values($attributes), $view);
}
// validate correct php version
if (version_compare("7.4.0", PHP_VERSION, ">=")) {
die(view($_deftheme . '/misc/phprequirementfailed.html.twig', [