mirror of
				https://github.com/slawkens/myaac.git
				synced 2025-10-31 16:06:24 +01:00 
			
		
		
		
	[WIP] Refactor
This commit is contained in:
		| @@ -8,7 +8,7 @@ function lostAccountWriteCooldown(string $nick, int $time): void | ||||
| 	$inSec = $time - time(); | ||||
| 	$minutesLeft = floor($inSec / 60); | ||||
| 	$secondsLeft = $inSec - ($minutesLeft * 60); | ||||
| 	$timeLeft = $minutesLeft.' minutes '.$secondsLeft.' seconds'; | ||||
| 	$timeLeft = "$minutesLeft minutes $secondsLeft seconds"; | ||||
|  | ||||
| 	$timeRounded = ceil(setting('core.mail_lost_account_interval') / 60); | ||||
|  | ||||
|   | ||||
| @@ -5,16 +5,16 @@ csrfProtect(); | ||||
|  | ||||
| $title = 'Lost Account'; | ||||
|  | ||||
| $code = isset($_REQUEST['code']) ? trim($_REQUEST['code']) : ''; | ||||
| $character = isset($_REQUEST['character']) ? stripslashes(trim($_REQUEST['character'])) : ''; | ||||
| $code = $_POST['code'] ?? ''; | ||||
| $character = $_POST['character'] ?? ''; | ||||
|  | ||||
| if(empty($code) || empty($character)) | ||||
| if(empty($code) || empty($character)) { | ||||
| 	$twig->display('account/lost/check-code.html.twig', [ | ||||
| 		'code' => $code, | ||||
| 		'characters' => $character, | ||||
| 	]); | ||||
| else | ||||
| { | ||||
| } | ||||
| else { | ||||
| 	$player = new OTS_Player(); | ||||
| 	$account = new OTS_Account(); | ||||
| 	$player->find($character); | ||||
|   | ||||
| @@ -7,8 +7,8 @@ require __DIR__ . '/../base.php'; | ||||
|  | ||||
| $title = 'Lost Account'; | ||||
|  | ||||
| $email = $_REQUEST['email']; | ||||
| $nick = stripslashes($_REQUEST['nick']); | ||||
| $email = $_POST['email'] ?? ''; | ||||
| $nick = $_POST['nick'] ?? ''; | ||||
|  | ||||
| $player = new OTS_Player(); | ||||
| $account = new OTS_Account(); | ||||
|   | ||||
| @@ -5,10 +5,10 @@ csrfProtect(); | ||||
|  | ||||
| $title = 'Lost Account'; | ||||
|  | ||||
| $newPassword = $_REQUEST['password']; | ||||
| $passwordRepeat = $_REQUEST['password_repeat']; | ||||
| $code = $_REQUEST['code']; | ||||
| $character = stripslashes($_REQUEST['character']); | ||||
| $newPassword = $_POST['password'] ?? ''; | ||||
| $passwordRepeat = $_POST['password_repeat'] ?? ''; | ||||
| $code = $_POST['code'] ?? ''; | ||||
| $character = $_POST['character'] ?? ''; | ||||
|  | ||||
| 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.'; | ||||
|   | ||||
| @@ -7,6 +7,8 @@ csrfProtect(); | ||||
|  | ||||
| $title = 'Lost Account'; | ||||
|  | ||||
| $nick = $_POST['nick'] ?? ''; | ||||
|  | ||||
| if($account->isLoaded()) { | ||||
| 	if($account->getCustomField('email_next') < time()) { | ||||
| 		$twig->display('account/lost/email.html.twig', [ | ||||
|   | ||||
| @@ -5,6 +5,8 @@ csrfProtect(); | ||||
|  | ||||
| $title = 'Lost Account'; | ||||
|  | ||||
| $nick = $_POST['nick'] ?? ''; | ||||
|  | ||||
| if($account->isLoaded()) { | ||||
| 	$account_key = $account->getCustomField('key'); | ||||
|  | ||||
|   | ||||
| @@ -5,8 +5,8 @@ csrfProtect(); | ||||
|  | ||||
| $title = 'Lost Account'; | ||||
|  | ||||
| $key = trim($_REQUEST['key']); | ||||
| $nick = stripslashes($_REQUEST['nick']); | ||||
| $key = $_REQUEST['key'] ?? ''; | ||||
| $nick = $_POST['nick'] ?? ''; | ||||
|  | ||||
| $player = new OTS_Player(); | ||||
| $account = new OTS_Account(); | ||||
| @@ -32,8 +32,9 @@ if($account->isLoaded()) { | ||||
| 		$errors[] = 'Account of this character has no recovery key!'; | ||||
| 	} | ||||
| } | ||||
| else | ||||
| 	$errors[] =  "Player or account of player <b>" . escapeHtml($nick) . "</b> doesn't exist."; | ||||
| else { | ||||
| 	$errors[] = "Player or account of player <b>" . escapeHtml($nick) . "</b> doesn't exist."; | ||||
| } | ||||
|  | ||||
| if (!empty($errors)) { | ||||
| 	$twig->display('error_box.html.twig', [ | ||||
|   | ||||
| @@ -5,11 +5,11 @@ csrfProtect(); | ||||
|  | ||||
| $title = 'Lost Account'; | ||||
|  | ||||
| $key = trim($_REQUEST['key']); | ||||
| $nick = stripslashes($_REQUEST['nick']); | ||||
| $newPassword = trim($_REQUEST['password']); | ||||
| $passwordRepeat = trim($_REQUEST['password_repeat']); | ||||
| $newEmail = trim($_REQUEST['email']); | ||||
| $key = $_POST['key']; | ||||
| $nick = $_POST['nick'] ?? ''; | ||||
| $newPassword = $_POST['password'] ?? ''; | ||||
| $passwordRepeat = $_POST['password_repeat'] ?? ''; | ||||
| $newEmail = $_POST['email'] ?? ''; | ||||
|  | ||||
| $player = new OTS_Player(); | ||||
| $account = new OTS_Account(); | ||||
|   | ||||
| @@ -5,7 +5,7 @@ csrfProtect(); | ||||
|  | ||||
| $title = 'Lost Account'; | ||||
|  | ||||
| $nick = stripslashes($_REQUEST['nick']); | ||||
| $nick = $_REQUEST['nick'] ?? ''; | ||||
|  | ||||
| $player = new OTS_Player(); | ||||
| $account = new OTS_Account(); | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 slawkens
					slawkens