lopar/battles
lopar/battles
0
0
Fork 0
Code Issues 21 Pull Requests Releases Wiki Activity

Compare commits

base: lopar:14e8c647cec4bc63bb5ab6d6b90208764d0f8f2e
Branches Tags
lopar:master
lopar:dev
lopar:dev-arena
..
compare: lopar:92c3ea79c0e90a1b6d51c8433aaf0310762d240c
Branches Tags
lopar:dev
lopar:master
lopar:dev-arena

No commits in common. "14e8c647cec4bc63bb5ab6d6b90208764d0f8f2e" and "92c3ea79c0e90a1b6d51c8433aaf0310762d240c" have entirely different histories.
14e8c647ce ... 92c3ea79c0

4 changed files with 80 additions and 98 deletions
Show Stats Expand all files Collapse all files

6
config.php
View File

@ -4,7 +4,10 @@
* Author: Igor Barkov <lopar.4ever@gmail.com>
* Project name: Battles-Game
*/
if (empty($_SESSION['uid']) && $_SERVER['REQUEST_URI'] != "/enter.php") {
header("Location: index.php");
exit;
}
ini_set('display_errors', 'On');
error_reporting(E_ALL);
define("GAMEDOMAIN", "battles.lan");
@ -13,6 +16,7 @@ define("GAMEDOMAIN", "battles.lan");
*/
header("Cache-Control: no-store, no-cache, must-revalidate, max-age=0");
header("Cache-Control: post-check=0, pre-check=0", false);
header("Pragma: no-cache");
/**
* Классы для работы с базой данных.

32
enter.php
View File

@ -1,6 +1,5 @@
<?php
use Battles\Database\DBPDO;
use Battles\GameLogs;
use Battles\Template;
@ -10,7 +9,6 @@ define('ERROR_NO_SUCH_USER', 'Такого пользователя не сущ
define('ERROR_USER_IS_BLOCKED', 'Пользователь заблокирован!');
define('ERROR_WRONG_PASSWORD', 'Неверный пароль!');
define('ERROR_EMPTY_CREDENTIALS', 'Вы не ввели логин или пароль!');
$db = new DBPDO();
foreach ($_POST as $key => $val) { //Проверка всех значений массива POST одним махом.
$_POST[$key] = iconv(mb_detect_encoding($_POST[$key], 'auto'), 'utf-8', $val);
}
@ -21,34 +19,34 @@ $battle = $_COOKIE['battle'] ?? '';
$error = "";
if ($username && $password) {
$user_query = $db->ofetch('SELECT id, login, pass, room, block FROM users WHERE login = ?', $username);
$user_query = db::c()->query('SELECT `id`, `login` ,`pass`, `room`, `block` FROM `users` WHERE `login` = "?s"', $username)->fetch_assoc();
if (!$user_query->id) {
if (!$user_query['id']) {
$error = ERROR_NO_SUCH_USER;
} elseif ($user_query->block) {
} elseif ($user_query['block'] == 1) {
$error = ERROR_USER_IS_BLOCKED;
} elseif (password_verify($password, $user_query->pass)) {
} elseif (password_verify($password, $user_query['pass'])) {
if (!$error) {
# Проверка на мультоводство по используемому кукису.
if ($battle != null && $user_query->id != $battle) {
GameLogs::addUserLog($user_query->id,'Разные ID на входе. Возможно используются несколько аккаунтов.', 'multiaccounts');
if ($battle != null && $user_query['id'] != $battle) {
GameLogs::addUserLog($user_query['id'],'Разные ID на входе. Возможно используются несколько аккаунтов.', 'multiaccounts');
}
setcookie("battle", $user_query->id);
$_SESSION['uid'] = $user_query->id;
setcookie("uid", $user_query->id, time() + 43200, "/", GAMEDOMAIN);
setcookie("hashcode", md5($user_query->id . $user_query->pass . $username), time() + 43200, "/", GAMEDOMAIN);
setcookie("battle", $user_query['id']);
$_SESSION['uid'] = $user_query['id'];
setcookie("uid", $user_query['id'], time() + 43200, "/", GAMEDOMAIN);
setcookie("hashcode", md5($user_query['id'] . $user_query["pass"] . $user_query["login"]), time() + 43200, "/", GAMEDOMAIN);
$_SESSION['sid'] = session_id();
$onl = $db->ofetch('SELECT user_id FROM online WHERE user_id = ?', $user_query->id);
if (isset($onl->user_id)) {
$db->execute('UPDATE online SET date = ? WHERE user_id = ?', [time(), $user_query->id]);
$onl = db::c()->query('SELECT user_id FROM online WHERE user_id = "?s"', $user_query['id'])->fetch_assoc();
if (isset($onl['user_id'])) {
db::c()->query('UPDATE online SET date = ?i WHERE user_id = "?s"', time(), $user_query['id']);
} else {
$db->execute('INSERT INTO online (user_id, date, room, real_time) VALUES (?,?,?,?)', [$user_query->id, time(), $user_query->room, time()]);
db::c()->query('INSERT INTO online (user_id, date, room, real_time) VALUES (?i, ?i, ?i, ?i)', $user_query['id'], time(), $user_query['room'], time());
}
$db->execute('UPDATE users SET session_id = ?, enter_game = 1 WHERE id = ?', [session_id(), $user_query->id]);
db::c()->query('UPDATE `users` SET `session_id` = "?s", `enter_game` = ?i WHERE `id` = ?i', session_id(), 1, $user_query['id']);
header("Location: fight.php");
}
} else {

7
functions.php
View File

@ -9,13 +9,8 @@ use Battles\Travel;
use Battles\User;
require_once 'config.php';
if (empty($_SESSION['uid'])) {
header("Location: index.php");
exit;
} else {
$user = new User($_SESSION['uid']);
}
$user = new User($_SESSION['uid']);
if ($user->id && $user->block) {
exit('user blocked!');
}

133
rememberpassword.php
View File

@ -1,8 +1,4 @@
<?php
use Battles\Database\DBPDO;
use Battles\Template;
require_once("config.php");
define('OK_MAIL_SENT', 'Письмо отправлено!');
define('OK_PASSWORD_CHANGED', 'Пароль изменён!');
@ -12,90 +8,81 @@ define('ERROR_TOO_MANY_TRIES', 'Вы уже отправляли себе пис
define('ERROR_OLD_HASH', 'Ссылка устарела!');
define('ERROR_WRONG_HASH', 'Неверная ссылка!');
$login = filter_input(INPUT_POST, 'loginid', FILTER_SANITIZE_SPECIAL_CHARS);
$password = isset($_POST['psw']) ? password_hash($_POST['psw'], PASSWORD_DEFAULT) : null;
$_GET['change'] = $_GET['change'] ?? null;
$password = password_hash($_POST['psw'], PASSWORD_DEFAULT) ?? null;
$allowChange = false;
$changePassword = $_GET['change'] ?? 0;
$newPassword = $_POST['newpasswd'] ?? 0;
$hashCheck = $_POST['hashcheck'] ?? 0;
$db = new DBPDO();
$operation = new class {
private function mailSend(string $to, string $message): bool
{
$from = "=?UTF-8?B?" . base64_encode('Noreply') . "?= <noreply@" . GAMEDOMAIN . ">";
$subject = "=?UTF-8?B?" . base64_encode('Восстановление забытого пароля') . "?=";
$headers = [
'From' => $from,
'MIME-Version' => '1.0',
'Content-type' => 'text/html; charset=UTF-8',
];
function mail_send($to, $from_user, $from_email, $subject = '(No subject)', $message = '')
{
$from_user = "=?UTF-8?B?" . base64_encode($from_user) . "?=";
$subject = "=?UTF-8?B?" . base64_encode($subject) . "?=";
if (extension_loaded('tidy')) {
$cleaner = new tidy();
$message = $cleaner->repairString($message, ['show-errors' => 0, 'show-warnings' => false], 'utf8');
}
return mail($to, $subject, $message, $headers);
}
$headers = "From: $from_user <$from_email>\r\n" .
"MIME-Version: 1.0" . "\r\n" .
"Content-type: text/html; charset=UTF-8" . "\r\n";
public function sendRecoveryMail(string $to): string
{
$db = new DBPDO();
$check = $db->ofetch('SELECT email FROM users WHERE login = ?', $to);
if (!$check) {
return ERROR_WRONG_LOGIN;
}
if ($db->ofetch('SELECT 1 FROM users_recovery WHERE login = ?', $to)) {
return ERROR_TOO_MANY_TRIES;
}
$hash = bin2hex(random_bytes(8));
$db->execute('INSERT INTO users_recovery (login, hash, ip, date) VALUES (?,?,?,?)', [$to, $hash, date('Y-m-d', strtotime('+1days')), $_SERVER['REMOTE_ADDR']]);
$message = "Здравствуйте!<br><br>
Кто-то запросил восстановление пароля к вашему персонажу " . $to . ".<br><br>
Для смены пароля пройдите по
<a href='" . GAMEDOMAIN . "/rememberpassword.php?change=" . $hash . "'> данной ссылке</a>.<br><br>
Ссылка будет действовать до <em>" . date('d-M-Y', strtotime(date('Y-m-d', strtotime('+1days')))) . "</em>.
";
return self::mailSend($check->email, $message) ? OK_MAIL_SENT : ERROR_MAIL_NOT_SENT;
}
public function isAllowed($hash)
{
return DBPDO::INIT()->fetch('SELECT 1 FROM users_recovery WHERE hash = ? AND date < ?', [$hash, date('Y-m-d')]) ? true : ERROR_OLD_HASH;
}
public function setNewPassword(string $newPassword, string $hash):string
{
$db = new DBPDO();
$row = $db->ofetch('SELECT login FROM users_recovery WHERE hash = ?', $hash);
if (!$row) {
return ERROR_WRONG_HASH;
}
$newPassword = password_hash($newPassword, PASSWORD_DEFAULT);
$db->execute('UPDATE users SET pass = ? WHERE login = ?', [$newPassword, $row->login]);
$db->execute('DELETE FROM users_recovery WHERE hash = ?', $hash);
return OK_PASSWORD_CHANGED;
}
};
return mail($to, $subject, $message, $headers);
}
if ($login) {
$statusMessage = $operation->sendRecoveryMail($login);
$loginCheck = db::c()->query('SELECT email FROM users WHERE login = "?s"', $login)->fetch_assoc();
if ($loginCheck) {
$recovery = db::c()->query('SELECT 1 FROM users_recovery WHERE login = "?s"', $login)->getNumRows() ?? 0;
if (!$recovery) {
$hash = bin2hex(random_bytes(8));
$lasttime = date('Y-m-d', strtotime('+1days'));
$ip = $_SERVER['REMOTE_ADDR'];
db::c()->query('INSERT INTO users_recovery (login, hash, ip, date) VALUES ("?s", "?s", "?s", "?s")', $login, $hash, $lasttime, $ip);
$message = "Здравствуйте!<br><br>
Кто-то запросил восстановление пароля к вашему персонажу " . $login . ".<br><br>
Для смены пароля пройдите по
<a href='" . GAMEDOMAIN . "/rememberpassword.php?change=" . $hash . "'> данной ссылке</a>.<br><br>
Ссылка будет действовать до <em>" . date('d-M-Y', strtotime($lasttime)) . "</em>.
";
if (mail_send($loginCheck['email'], "Noreply", "noreply@" . GAMEDOMAIN, "Восстановление забытого пароля", $message)) {
$statusMessage = OK_MAIL_SENT;
} else {
$statusMessage = ERROR_MAIL_NOT_SENT;
}
} else {
$statusMessage = ERROR_TOO_MANY_TRIES;
}
} else {
$statusMessage = ERROR_WRONG_LOGIN;
}
}
if ($changePassword) {
if (db::c()->query('SELECT 1 FROM users_recovery WHERE `hash` = "?s" AND `date` < "?s"', $changePassword, date('Y-m-d'))->getNumRows()) {
$allowChange = true;
} else {
$statusMessage = ERROR_OLD_HASH;
}
}
if ($newPassword && $hashCheck) {
$statusMessage = $operation->setNewPassword($newPassword, $hashCheck);
$query = db::c()->query('SELECT login FROM users_recovery WHERE hash = "?s"', $hashCheck);
if ($query->getNumRows()) {
$query = $query->fetch_assoc();
$passwordHashed = password_hash($newPassword, PASSWORD_DEFAULT);
db::c()->query('UPDATE users SET pass = "?s" WHERE login = "?s"', $passwordHashed, $query['login']);
db::c()->query('DELETE FROM users_recovery WHERE hash = "?s"', $hashCheck);
$statusMessage = OK_PASSWORD_CHANGED;
} else {
$statusMessage = ERROR_WRONG_HASH;
}
}
Template::header('Восстановление пароля');
\Battles\Template::header('Восстановление пароля');
?>
<a href="/"> ← на главную</a>
<?php if (!empty($statusMessage)): ?>
<h3><?php echo $statusMessage; ?></h3>
<?php endif; ?>
<?php if ($operation->isAllowed($_GET['change']) === true): ?>
<?php if ($allowChange === true): ?>
<h1>Создайте себе новый пароль</h1>
<form method="post">
<label>
<input required name="newpasswd" placeholder="Новый пароль"> Новый пароль.
</label>
<input type="hidden" name="hashcheck" value="<?= $_GET['change'] ?>"><br>
<input required name="newpasswd" placeholder="Новый пароль">
<input type="hidden" name="hashcheck" value="<?= $changePassword ?>"><br>
<input type=submit>
</form>
<?php else: ?>
@ -104,9 +91,7 @@ Template::header('Восстановление пароля');
Письмо будет выслано на email адрес, указанный вами при регистрации.<br>
Восстанавливать пароль можно только раз в сутки.</p>
<form method="post">
<label>
<input required name="loginid" placeholder="Имя персонажа" value="<?= $login ?>"> Имя персонажа.
</label><br>
<input required name="loginid" placeholder="Имя персонажа" value="<?= $login ?>"><br>
<input type=submit>
</form>
<?php endif;