Digitalstack/myaac
2
0
Fork 0
mirror of https://github.com/slawkens/myaac.git synced 2025-11-01 00:16:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

[WIP] Refactor

Browse Source
This commit is contained in:
slawkens
2025-10-31 09:42:52 +01:00
parent 456b68a88b
commit 6500c29799
9 changed files with 27 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
system/pages/account/lost/base.php
View File

@@ -8,7 +8,7 @@ function lostAccountWriteCooldown(string $nick, int $time): void
$inSec = $time - time(); $inSec = $time - time();
$minutesLeft = floor($inSec / 60); $minutesLeft = floor($inSec / 60);
$secondsLeft = $inSec - ($minutesLeft * 60); $secondsLeft = $inSec - ($minutesLeft * 60);
$timeLeft = $minutesLeft.' minutes '.$secondsLeft.' seconds'; $timeLeft = "$minutesLeft minutes $secondsLeft seconds";
$timeRounded = ceil(setting('core.mail_lost_account_interval') / 60); $timeRounded = ceil(setting('core.mail_lost_account_interval') / 60);

10
system/pages/account/lost/check-code.php
View File

@@ -5,16 +5,16 @@ csrfProtect();
$title = 'Lost Account'; $title = 'Lost Account';
$code = isset($_REQUEST['code']) ? trim($_REQUEST['code']) : ''; $code = $_POST['code'] ?? '';
$character = isset($_REQUEST['character']) ? stripslashes(trim($_REQUEST['character'])) : ''; $character = $_POST['character'] ?? '';
if(empty($code) || empty($character)) if(empty($code) || empty($character)) {
$twig->display('account/lost/check-code.html.twig', [ $twig->display('account/lost/check-code.html.twig', [
'code' => $code, 'code' => $code,
'characters' => $character, 'characters' => $character,
]); ]);
else }
{ else {
$player = new OTS_Player(); $player = new OTS_Player();
$account = new OTS_Account(); $account = new OTS_Account();
$player->find($character); $player->find($character);

4
system/pages/account/lost/email/send-code.php
View File

@@ -7,8 +7,8 @@ require __DIR__ . '/../base.php';
$title = 'Lost Account'; $title = 'Lost Account';
$email = $_REQUEST['email']; $email = $_POST['email'] ?? '';
$nick = stripslashes($_REQUEST['nick']); $nick = $_POST['nick'] ?? '';
$player = new OTS_Player(); $player = new OTS_Player();
$account = new OTS_Account(); $account = new OTS_Account();

8
system/pages/account/lost/email/set-new-password.php
View File

@@ -5,10 +5,10 @@ csrfProtect();
$title = 'Lost Account'; $title = 'Lost Account';
$newPassword = $_REQUEST['password']; $newPassword = $_POST['password'] ?? '';
$passwordRepeat = $_REQUEST['password_repeat']; $passwordRepeat = $_POST['password_repeat'] ?? '';
$code = $_REQUEST['code']; $code = $_POST['code'] ?? '';
$character = stripslashes($_REQUEST['character']); $character = $_POST['character'] ?? '';
if(empty($code) || empty($character) || empty($newPassword) || empty($passwordRepeat)) { if(empty($code) || empty($character) || empty($newPassword) || empty($passwordRepeat)) {
$errors[] = 'Please enter code from e-mail and name of one character from account. Then press Submit.'; $errors[] = 'Please enter code from e-mail and name of one character from account. Then press Submit.';

2
system/pages/account/lost/email/step-1.php
View File

@@ -7,6 +7,8 @@ csrfProtect();
$title = 'Lost Account'; $title = 'Lost Account';
$nick = $_POST['nick'] ?? '';
if($account->isLoaded()) { if($account->isLoaded()) {
if($account->getCustomField('email_next') < time()) { if($account->getCustomField('email_next') < time()) {
$twig->display('account/lost/email.html.twig', [ $twig->display('account/lost/email.html.twig', [

2
system/pages/account/lost/recovery-key/step-1.php
View File

@@ -5,6 +5,8 @@ csrfProtect();
$title = 'Lost Account'; $title = 'Lost Account';
$nick = $_POST['nick'] ?? '';
if($account->isLoaded()) { if($account->isLoaded()) {
$account_key = $account->getCustomField('key'); $account_key = $account->getCustomField('key');

9
system/pages/account/lost/recovery-key/step-2.php
View File

@@ -5,8 +5,8 @@ csrfProtect();
$title = 'Lost Account'; $title = 'Lost Account';
$key = trim($_REQUEST['key']); $key = $_REQUEST['key'] ?? '';
$nick = stripslashes($_REQUEST['nick']); $nick = $_POST['nick'] ?? '';
$player = new OTS_Player(); $player = new OTS_Player();
$account = new OTS_Account(); $account = new OTS_Account();
@@ -32,8 +32,9 @@ if($account->isLoaded()) {
$errors[] = 'Account of this character has no recovery key!'; $errors[] = 'Account of this character has no recovery key!';
} }
} }
else else {
$errors[] = "Player or account of player <b>" . escapeHtml($nick) . "</b> doesn't exist."; $errors[] = "Player or account of player <b>" . escapeHtml($nick) . "</b> doesn't exist.";
}
if (!empty($errors)) { if (!empty($errors)) {
$twig->display('error_box.html.twig', [ $twig->display('error_box.html.twig', [

10
system/pages/account/lost/recovery-key/step-3.php
View File

@@ -5,11 +5,11 @@ csrfProtect();
$title = 'Lost Account'; $title = 'Lost Account';
$key = trim($_REQUEST['key']); $key = $_POST['key'];
$nick = stripslashes($_REQUEST['nick']); $nick = $_POST['nick'] ?? '';
$newPassword = trim($_REQUEST['password']); $newPassword = $_POST['password'] ?? '';
$passwordRepeat = trim($_REQUEST['password_repeat']); $passwordRepeat = $_POST['password_repeat'] ?? '';
$newEmail = trim($_REQUEST['email']); $newEmail = $_POST['email'] ?? '';
$player = new OTS_Player(); $player = new OTS_Player();
$account = new OTS_Account(); $account = new OTS_Account();

2
system/pages/account/lost/step-1.php
View File

@@ -5,7 +5,7 @@ csrfProtect();
$title = 'Lost Account'; $title = 'Lost Account';
$nick = stripslashes($_REQUEST['nick']); $nick = $_REQUEST['nick'] ?? '';
$player = new OTS_Player(); $player = new OTS_Player();
$account = new OTS_Account(); $account = new OTS_Account();