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

remove unnecessary language selection in login-form

Browse Source 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann
2022-10-16 15:28:30 +02:00
parent dd30ab8f93
commit 1704875cea
2 changed files with 1 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
index.php
View File

@@ -397,7 +397,6 @@ if ($action == '2fa_entercode') {
UI::view('login/login.html.twig', [ UI::view('login/login.html.twig', [
'pagetitle' => 'Login', 'pagetitle' => 'Login',
'languages' => $languages,
'lastscript' => $lastscript, 'lastscript' => $lastscript,
'lastqrystr' => $lastqrystr, 'lastqrystr' => $lastqrystr,
'upd_in_progress' => $update_in_progress, 'upd_in_progress' => $update_in_progress,
@@ -695,21 +694,10 @@ if ($action == 'resetpwd') {
function finishLogin($userinfo) function finishLogin($userinfo)
{ {
global $languages;
if (isset($userinfo['userid']) && $userinfo['userid'] != '') { if (isset($userinfo['userid']) && $userinfo['userid'] != '') {
CurrentUser::setData($userinfo); CurrentUser::setData($userinfo);
if (isset($_POST['language'])) { $language = $userinfo['def_language'] ?? Settings::Get('panel.standardlanguage');
$language = Validate::validate($_POST['language'], 'language');
if ($language == 'profile') {
$language = $userinfo['def_language'];
} elseif (!isset($languages[$language])) {
$language = Settings::Get('panel.standardlanguage');
}
} else {
$language = Settings::Get('panel.standardlanguage');
}
CurrentUser::setField('language', $language); CurrentUser::setField('language', $language);
if (isset($userinfo['theme']) && $userinfo['theme'] != '') { if (isset($userinfo['theme']) && $userinfo['theme'] != '') {

10
templates/Froxlor/login/login.html.twig
View File

@@ -36,16 +36,6 @@
<label for="password" class="col-form-label">{{ lng('login.password') }}</label> <label for="password" class="col-form-label">{{ lng('login.password') }}</label>
<input class="form-control" type="password" name="password" id="password" value="" required/> <input class="form-control" type="password" name="password" id="password" value="" required/>
</div> </div>
<div>
<label for="language" class="col-form-label">{{ lng('login.language') }}</label>
<select class="form-select" name="language" id="language" required>
<option value="profile">{{ lng('login.profile_lng') }}</option>
{% for val,lang in languages %}
<option value="{{ val }}">{{ lang|raw }}</option>
{% endfor %}
</select>
</div>
</div> </div>
<div class="card-body d-grid gap-2"> <div class="card-body d-grid gap-2">