Digitalstack/myaac
2
0
Fork 0
mirror of https://github.com/slawkens/myaac.git synced 2025-04-29 10:49:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

Support for accounts.id when there is no accounts.name and accounts.number

Browse Source
This commit is contained in:
slawkens 2024-12-19 21:52:05 +01:00
parent ea5e1d4192
commit 023f1dc598
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
install/index.php
View File

@ -125,18 +125,7 @@ else if($step == 'finish') {
} }
// account check // account check
if(isset($_SESSION['var_account'])) { if(isset($_SESSION['var_account_id'])) {
if(empty($_SESSION['var_account'])) {
$errors[] = $locale['step_admin_account_error_empty'];
}
else if(!Validator::accountName($_SESSION['var_account'])) {
$errors[] = $locale['step_admin_account_error_format'];
}
else if(strtoupper($_SESSION['var_account']) == strtoupper($password)) {
$errors[] = $locale['step_admin_account_error_same'];
}
}
else if(isset($_SESSION['var_account_id'])) {
if(empty($_SESSION['var_account_id'])) { if(empty($_SESSION['var_account_id'])) {
$errors[] = $locale['step_admin_account_id_error_empty']; $errors[] = $locale['step_admin_account_id_error_empty'];
} }
@ -147,6 +136,17 @@ else if($step == 'finish') {
$errors[] = $locale['step_admin_account_id_error_same']; $errors[] = $locale['step_admin_account_id_error_same'];
} }
} }
else if(isset($_SESSION['var_account'])) {
if(empty($_SESSION['var_account'])) {
$errors[] = $locale['step_admin_account_error_empty'];
}
else if(!Validator::accountName($_SESSION['var_account'])) {
$errors[] = $locale['step_admin_account_error_format'];
}
else if(strtoupper($_SESSION['var_account']) == strtoupper($password)) {
$errors[] = $locale['step_admin_account_error_same'];
}
}
// password check // password check
if(empty($password)) { if(empty($password)) {

2
system/templates/install.admin.html.twig
View File

@ -9,7 +9,7 @@
<form action="{{ constant('BASE_URL') }}install/" method="post" autocomplete="off"> <form action="{{ constant('BASE_URL') }}install/" method="post" autocomplete="off">
<input type="hidden" name="step" id="step" value="finish" /> <input type="hidden" name="step" id="step" value="finish" />
{% set values = ['email', 'account', 'password', 'password_confirm'] %} {% set values = ['email', account, 'password', 'password_confirm'] %}
{% if hasTablePlayers %} {% if hasTablePlayers %}
{% set values = values|merge(['player_name']) %} {% set values = values|merge(['player_name']) %}