diff --git a/lib/Froxlor/Install/Install.php b/lib/Froxlor/Install/Install.php index 7899f9cf..0e295b71 100644 --- a/lib/Froxlor/Install/Install.php +++ b/lib/Froxlor/Install/Install.php @@ -27,6 +27,7 @@ namespace Froxlor\Install; use Exception; use Froxlor\Config\ConfigParser; +use Froxlor\Froxlor; use Froxlor\Install\Install\Core; use Froxlor\System\IPTools; use Froxlor\UI\Panel\UI; @@ -133,6 +134,7 @@ class Install 'section' => $this->formfield['install']['sections']['step' . $this->currentStep] ?? [], 'error' => $error ?? null, 'extended' => $this->extendedView, + 'csrf_token' => Froxlor::genSessionId(20), ]); // output view diff --git a/lib/init.php b/lib/init.php index bd062959..1e4cf507 100644 --- a/lib/init.php +++ b/lib/init.php @@ -376,4 +376,6 @@ if (CurrentUser::hasSession()) { 'samesite' => 'Strict' ]; setcookie(session_name(), $_COOKIE[session_name()], $cookie_params); +} else { + UI::twig()->addGlobal('csrf_token', Froxlor::genSessionId(20)); } diff --git a/templates/Froxlor/footer.html.twig b/templates/Froxlor/footer.html.twig index cab63716..55084192 100644 --- a/templates/Froxlor/footer.html.twig +++ b/templates/Froxlor/footer.html.twig @@ -8,7 +8,7 @@ {{ call_static('\\Froxlor\\Froxlor', 'getFullVersion') }} {% endif %} {% endif %} - © 2009-{{ "now"|date("Y") }} by the Froxlor Team
+ © 2009-{{ "now"|date("Y") }} by the froxlor team
{% if install_mode is not defined %} {% if (get_setting('panel.imprint_url') != '') %}{{ lng('imprint') }}{% endif %} {% if (get_setting('panel.terms_url') != '') %}{{ lng('terms') }}{% endif %} diff --git a/templates/Froxlor/misc/configurehint.html.twig b/templates/Froxlor/misc/configurehint.html.twig index 26e695b2..c2016053 100644 --- a/templates/Froxlor/misc/configurehint.html.twig +++ b/templates/Froxlor/misc/configurehint.html.twig @@ -6,8 +6,8 @@
-

Welcome to Froxlor

-

It seems that Froxlor has not been installed yet.

+

Welcome to froxlor

+

It seems that froxlor has not been installed yet.

Click on the button below to start the installation.

diff --git a/templates/Froxlor/misc/phprequirementfailed.html.twig b/templates/Froxlor/misc/phprequirementfailed.html.twig index 030160ae..1ff56890 100644 --- a/templates/Froxlor/misc/phprequirementfailed.html.twig +++ b/templates/Froxlor/misc/phprequirementfailed.html.twig @@ -35,7 +35,7 @@
diff --git a/templates/Froxlor/misc/vendormissinghint.html.twig b/templates/Froxlor/misc/vendormissinghint.html.twig index 7e210e71..018e055d 100644 --- a/templates/Froxlor/misc/vendormissinghint.html.twig +++ b/templates/Froxlor/misc/vendormissinghint.html.twig @@ -35,7 +35,7 @@