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

minor textual adjustments; add non-session-based csrf-token for js/axios as it is configured to append it to the http-request

Browse Source 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann
2023-11-27 16:42:15 +01:00
parent 4f79d7cf4b
commit e1e7555cce
6 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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

2
lib/init.php
View File

@@ -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));
}

2
templates/Froxlor/footer.html.twig
View File

@@ -8,7 +8,7 @@
{{ call_static('\\Froxlor\\Froxlor', 'getFullVersion') }}
{% endif %}
{% endif %}
&copy; 2009-{{ "now"|date("Y") }} by <a href="https://www.froxlor.org/" rel="external" target="_blank">the Froxlor Team</a><br>
&copy; 2009-{{ "now"|date("Y") }} by <a href="https://www.froxlor.org/" rel="external" target="_blank">the froxlor team</a><br>
{% if install_mode is not defined %}
{% if (get_setting('panel.imprint_url') != '') %}<a href="{{ get_setting('panel.imprint_url') }}" target="_blank" class="footer-link">{{ lng('imprint') }}</a>{% endif %}
{% if (get_setting('panel.terms_url') != '') %}<a href="{{ get_setting('panel.terms_url') }}" target="_blank" class="footer-link">{{ lng('terms') }}</a>{% endif %}

4
templates/Froxlor/misc/configurehint.html.twig
View File

@@ -6,8 +6,8 @@
<div class="row gx-0 rounded shadow bg-primary text-white mt-5">
<div class="col p-5 rounded-start">
<h2 class="card-title">Welcome to Froxlor</h2>
<p class="lead mt-5">It seems that Froxlor has not been installed yet.</p>
<h2 class="card-title">Welcome to froxlor</h2>
<p class="lead mt-5">It seems that froxlor has not been installed yet.</p>
<p class="lead">Click on the button below to start the installation.</p>
</div>

2
templates/Froxlor/misc/phprequirementfailed.html.twig
View File

@@ -35,7 +35,7 @@
<footer class="pý-5 text-center">
<span>
<img src="{{ basehref }}templates/Froxlor/assets/img/logo_grey.png" alt="Froxlor" />
&copy; 2009-{{ current_year }} by <a href="https://www.froxlor.org/" rel="external">the Froxlor Team</a>
&copy; 2009-{{ current_year }} by <a href="https://www.froxlor.org/" rel="external">the froxlor team</a>
</span>
</footer>
</div>

2
templates/Froxlor/misc/vendormissinghint.html.twig
View File

@@ -35,7 +35,7 @@
<footer class="py-5 text-center">
<span>
<img src="{{ basehref }}templates/Froxlor/assets/img/logo_grey.png" alt="Froxlor" />
&copy; 2009-{{ current_year }} by <a href="https://www.froxlor.org/" rel="external">the Froxlor Team</a>
&copy; 2009-{{ current_year }} by <a href="https://www.froxlor.org/" rel="external">the froxlor team</a>
</span>
</footer>
</div>