From 04d6646508e84f03de9338a5d5d7861605e694f6 Mon Sep 17 00:00:00 2001
From: lopar <lopar.4ever@gmail.com>
Date: Fri, 21 Jun 2019 21:43:56 +0300
Subject: [PATCH] more fixes

---
 zayavka.php | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/zayavka.php b/zayavka.php
index 2682a90..5bcd2ca 100644
--- a/zayavka.php
+++ b/zayavka.php
@@ -9,6 +9,9 @@ if ($user['battle'] != 0) {
     header('Location: fbattle.php');
     die();
 }
+
+$level = filter_input(INPUT_REQUEST, 'level');
+
 db::c()->query('LOCK TABLES `bots` WRITE, `battle` WRITE, `logs` WRITE, `users` WRITE, `inventory` WRITE, `zayavka` WRITE, `effects` WRITE, `online` WRITE');
 
 if ((input::check('do') == "clear") AND $user['admin'] == 1) {
@@ -690,17 +693,17 @@ if ($_POST['open']) {
         <TR>
             <TD class=m width=40>&nbsp;<B><?php if ($user['room'] != 101) echo 'Бои:'; else echo 'Разделы:'; ?></B></TD>
             <?php //FIXME Убрать этот адов пиздец, когда одни и те же ссылки ведут в разные места и называются по разному. Или нормально понять зачем это. ?>
-            <TD class=<?= (input::check('level') == 'begin') ? "s" : "m" ?>><?php if ($user['room'] != 101) echo("<A HREF=\"zayavka.php?level=begin&".mt_rand()."\">Новичков</A></TD>"); else echo 'Зал Славы Тьмы</TD>' ?>
-            <TD class=<?= (input::check('level') == 'fiz') ? "s" : "m" ?>><?php if ($user['room'] != 101) echo("<A HREF=\"zayavka.php?level=fiz&".mt_rand()."\">Физические</A></TD>"); else echo 'Зал Славы Света</TD>' ?>
-            <TD class=<?= (input::check('level') == 'dgv') ? "s" : "m" ?>><?php if ($user['room'] != 101) echo("<A HREF=\"zayavka.php?level=dgv&".mt_rand()."\">Договорные</A></TD>"); else echo 'Квесты</TD>' ?>
-            <TD class=<?= (input::check('level') == 'group') ? "s" : "m" ?>><A HREF="zayavka.php?level=group&<?= mt_rand() ?>">
+            <TD class=<?= ($level == 'begin') ? "s" : "m" ?>><?php if ($user['room'] != 101) echo("<A HREF=\"zayavka.php?level=begin&".mt_rand()."\">Новичков</A></TD>"); else echo 'Зал Славы Тьмы</TD>' ?>
+            <TD class=<?= ($level == 'fiz') ? "s" : "m" ?>><?php if ($user['room'] != 101) echo("<A HREF=\"zayavka.php?level=fiz&".mt_rand()."\">Физические</A></TD>"); else echo 'Зал Славы Света</TD>' ?>
+            <TD class=<?= ($level == 'dgv') ? "s" : "m" ?>><?php if ($user['room'] != 101) echo("<A HREF=\"zayavka.php?level=dgv&".mt_rand()."\">Договорные</A></TD>"); else echo 'Квесты</TD>' ?>
+            <TD class=<?= ($level == 'group') ? "s" : "m" ?>><A HREF="zayavka.php?level=group&<?= mt_rand() ?>">
                     <?php if ($user['room'] != 101) {
                         echo 'Групповые';
                     } else {
                         echo '<span style="color:red; font-weight: bold;">Тьма vs Свет</span>';
                     }; ?>
                 </A></TD>
-            <TD class=<?= (input::check('level') == 'haos') ? "s" : "m" ?>><?php if ($user['room'] != 101) echo("<A HREF=\"zayavka.php?level=haos&".mt_rand()."\">Хаотичные</A></TD>"); else echo 'В разработке</TD>' ?>
+            <TD class=<?= ($level == 'haos') ? "s" : "m" ?>><?php if ($user['room'] != 101) echo("<A HREF=\"zayavka.php?level=haos&".mt_rand()."\">Хаотичные</A></TD>"); else echo 'В разработке</TD>' ?>
             <TD class=<?= (input::check('tklogs') == '1') ? "s" : "m" ?>><A HREF="zayavka.php?tklogs=1&<?= mt_rand() ?>">Текущие</A>
             </TD>
             <TD class=<?= (!is_null($_REQUEST['logs'])) ? "s" : "m" ?>><A HREF="zayavka.php?logs=<?= date("d.m.y") ?>&<?= mt_rand() ?>">Завершенные</A></TD>
@@ -1205,7 +1208,7 @@ if ($_POST['open']) {
             }
 
 
-            if ($_REQUEST['level'] == 'haos') {
+            if ($level == 'haos') {
                 if ($user['level'] < 2) {
                     die("<BR><BR><BR><CENTER><B>Хаотичные бои доступны с 2 уровня.</b></CENTER>");
                 }
@@ -1261,8 +1264,8 @@ if ($_POST['open']) {
 
             if ($_REQUEST['tklogs'] != null) {
                 $t1 = floor(time() - 900);
-                $data = mysql_query("SELECT * FROM `battle` WHERE `win` = '3' AND `to1` > '" . $t1 . "' AND `to2` > '" . $t1 . "' ORDER by `id` ASC");
-                while ($row = @mysql_fetch_array($data)) {
+                $data = db::c()->query('SELECT * FROM `battle` WHERE `win` = 3 AND `to1` > ?i AND `to2` > ?i ORDER BY `id` ASC', $t1, $t1);
+                while ($row = $data->fetch_assoc()) {
                     echo "<span class=date>{$row['date']}</span>";
                     $z = explode(";", $row['t1']);
                     foreach ($z as $k => $v) {
@@ -1283,7 +1286,7 @@ if ($_POST['open']) {
                 }
             }
 
-            if ($_REQUEST['logs'] != null) {
+            if (!is_null($_REQUEST['logs'])) {
                 echo '<TABLE width=100% cellspacing=0 cellpadding=0><TR>
 		<TD valign=top>&nbsp;<A HREF="zayavka.php?logs=' .
                     date("d.m.y", mktime(0, 0, 0, substr($_REQUEST['logs'], 3, 2), substr($_REQUEST['logs'], 0, 2) - 1, "20" . substr($_REQUEST['logs'], 6, 2)))