From f668e9c122448b3455a2f1a65eee287fea3101da Mon Sep 17 00:00:00 2001
From: lopar <lopar.4ever@gmail.com>
Date: Tue, 27 Oct 2020 18:53:35 +0200
Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=BE=D0=BF=D1=80=D0=B0=D0=B2=D0=B8?=
 =?UTF-8?q?=D0=BB=20=D0=BA=D0=BD=D0=BE=D0=BF=D0=BA=D1=83=20=D0=B2=D1=8B?=
 =?UTF-8?q?=D1=85=D0=BE=D0=B4=D0=B0=20=D0=B8,=20=D0=B2=D0=BD=D0=B5=D0=B7?=
 =?UTF-8?q?=D0=B0=D0=BF=D0=BD=D0=BE,=20=D0=BF=D0=BE=D0=BB=D1=84=D0=B0?=
 =?UTF-8?q?=D0=B9=D0=BB=D0=B0.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 post.php | 38 +++++++++++++-------------------------
 1 file changed, 13 insertions(+), 25 deletions(-)

diff --git a/post.php b/post.php
index 524fc67..d8e5c5b 100644
--- a/post.php
+++ b/post.php
@@ -15,22 +15,18 @@ if ($user->battle) {
     header('location: fbattle.php');
     exit;
 }
-$changeReceiver = $_GET['change'] ?? 0;
-if ($changeReceiver) {
+if ($_GET['change'] ?? 0) {
     unset($_SESSION['receiverName']);
 }
-$razdelId = $_GET['razdel'] ?? 0;
 $_SESSION['receiverName'] = $_POST['receiverName'] ?? '';
 $receiverId = null;
 $queryItems = null;
+$statusMessage = null;
 
 if ($_SESSION['receiverName']) {
     $receiver = db::c()->query('SELECT `id`, `level`, `login` FROM `users` WHERE `login` = "?s"', $_SESSION['receiverName'])->fetch_assoc();
     if (!$receiver['id']) {
-        err('Персонажа не существует!');
-        unset($_SESSION['receiverName']);
-    } elseif ($receiver['level'] < 4) {
-        err('Персонажей ниже 4-го уровня не обслуживаем!');
+        $statusMessage = 'Персонажа не существует!';
         unset($_SESSION['receiverName']);
     } else {
         $receiverId = $receiver['id'];
@@ -51,27 +47,20 @@ if ($_SESSION['receiverName']) {
         }
 
         if ($submit == 'sendItem' && $sendItemId && $user->money) {
-            $res = db::c()->query('SELECT `id`,`name` FROM `inventory` WHERE `owner` = ?i AND `id` = ?i AND `dressed` = 0 AND `setsale` = 0 AND `present` = "?s" AND `artefact` = 0', $_SESSION['uid'], $sendItemId, null)->fetch_assoc();
-            if (!$res['id']) {
+            $res = db::c()->query('SELECT name FROM inventory WHERE owner_id = ?i AND item_id = ?i AND dressed_slot = 0 AND on_sale = 0', $user->id, $sendItemId)->fetch_assoc();
+            if (!$res) {
                 $statusMessage = "Предмет не найден в рюкзаке.";
             } else {
                 $user->money -= 1;
                 Bank::setWalletMoney($user->money, $user->id);
-                db::c()->query('UPDATE `inventory` SET `owner` = ?i WHERE `id`= ?i AND `owner`= ?i', $receiverId, $sendItemId, $_SESSION['uid']);
-                //TODO: Добавить логи и статистику.
+                db::c()->query('UPDATE `inventory` SET owner_id = ?i WHERE item_id= ?i AND owner_id = ?i', $receiverId, $sendItemId, $_SESSION['uid']);
+                //TODO: #9
                 $statusMessage = 'Предмет "' . $res['name'] . '" передан персонажу ' . $receiverId;
                 db::c()->query('INSERT INTO `telegraph` (`receiver`,`text`) VALUES (?i,"?s")', $receiverId, 'Почтовый перевод: ' . $res['name'] . ' от персонажа ' . $user['login'] . '.');
             }
         }
-        $queryItems = db::c()->query('SELECT `inventory`.*,
-       `magic`.`name` AS `magic_name`,
-       `magic`.`chanse` AS `magic_chanse`,
-       `magic`.`time` AS `magic_time`,
-       `magic`.`file` AS `magic_file`,
-       `magic`.`targeted` AS `magic_targeted`,
-       `magic`.`needcharge` AS `magic_needcharge`,
-       `magic`.`img` AS `magic_img` FROM `inventory` LEFT JOIN `magic` ON `magic` = `magic`.`id` WHERE `owner` = ?i AND `dressed` = 0 AND `setsale` = 0 AND `present` = "?s" AND `artefact` = 0 ORDER BY `update` DESC', $_SESSION['uid'], null);
-        $iteminfo = [];
+
+        $queryItems = db::c()->query('SELECT * FROM inventory WHERE dressed_slot = 0 AND on_sale = 0 AND owner_id = ?i', $user->id);
         while ($row = $queryItems->fetch_assoc()) {
             $iteminfo[] = new InventoryItem($row);
         }
@@ -79,14 +68,13 @@ if ($_SESSION['receiverName']) {
 }
 Template::header('Почта');
 ?>
-    <script src="js/main.js"></script>
 <div style="float: right">
-    <button onclick="hrefToFrame('city.php?cp')">Вернуться</button>
+    <button onclick="top.frames['gameframe'].location = 'city.php?cp'">Вернуться</button>
 </div>
 <h1>Почта</h1>
-<div style="text-align: center;"><?php if (isset($statusMessage)) err($statusMessage); ?></div>
+<div style="text-align: center;"><span class="error"><?= $statusMessage ?></span></div>
 <legend>Услуги почты платные: 1 кредит.</legend>
-<?php if ($_SESSION['receiverName']): ?>
+<?php if ($_SESSION['receiverName'] ?? ''): ?>
     Получатель: <?= Nick::id($receiverId)->full() ?>
     <a href="?change">Сменить</a>
     <table width=100%>
@@ -136,4 +124,4 @@ Template::header('Почта');
     <form method="post">
         <input name='receiverName' placeholder="Логин получателя"> <input type=submit value='Применить'>
     </form>
-<?php endif ?>
+<?php endif ?>
\ No newline at end of file