From c69ec70c387519b0c57a359e801868e7453b2996 Mon Sep 17 00:00:00 2001
From: "Igor Barkov [iwork]" <lopar.4ever@gmail.com>
Date: Thu, 1 Nov 2018 14:25:00 +0200
Subject: [PATCH] Deleted `deal` from `users` table. Code cleanup.

---
 ch.php | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/ch.php b/ch.php
index ffddd4f..9fc438c 100644
--- a/ch.php
+++ b/ch.php
@@ -40,8 +40,7 @@ if (isset($_GET['online']) && $_GET['online'] != null) {
             `o`.`date`, 
             `u`.`invis`, 
             (SELECT `id` FROM `effects` WHERE `type` = 2 AND `owner` = `u`.`id` LIMIT 1) AS `slp`, 
-            (SELECT `id` FROM `effects` WHERE (`type` = 11 OR `type` = 12 OR `type` = 13  OR `type` = 14) AND `owner` = `u`.`id` LIMIT 1) AS `trv`, 
-            `deal` 
+            (SELECT `id` FROM `effects` WHERE (`type` = 11 OR `type` = 12 OR `type` = 13  OR `type` = 14) AND `owner` = `u`.`id` LIMIT 1) AS `trv` 
           FROM 
             `online` AS `o`, 
             `users` AS `u` 
@@ -81,8 +80,7 @@ if (isset($_GET['online']) && $_GET['online'] != null) {
             `o`.`date`, 
             `u`.`invis`, 
             (SELECT `id` FROM `effects` WHERE `type` = 2 AND `owner` = `u`.`id` LIMIT 1) AS `slp`, 
-            (SELECT `id` FROM `effects` WHERE (`type` = 11 OR `type` = 12 OR `type` = 13  OR `type` = 14) AND `owner` = `u`.`id` LIMIT 1) AS `trv`, 
-            `deal` 
+            (SELECT `id` FROM `effects` WHERE (`type` = 11 OR `type` = 12 OR `type` = 13  OR `type` = 14) AND `owner` = `u`.`id` LIMIT 1) AS `trv` 
           FROM 
             `online` AS `o`, 
             `users` AS `u` 
@@ -112,8 +110,7 @@ if (isset($_GET['online']) && $_GET['online'] != null) {
             `o`.`date`, 
             `u`.`invis`, 
             (SELECT `id` FROM `effects` WHERE `type` = 2 AND `owner` = `u`.`id` LIMIT 1) AS `slp`, 
-            (SELECT `id` FROM `effects` WHERE (`type` = 11 OR `type` = 12 OR `type` = 13  OR `type` = 14) AND `owner` = `u`.`id` LIMIT 1) AS `trv`, 
-            `deal` 
+            (SELECT `id` FROM `effects` WHERE (`type` = 11 OR `type` = 12 OR `type` = 13  OR `type` = 14) AND `owner` = `u`.`id` LIMIT 1) AS `trv` 
           FROM 
             `online` AS `o`, 
             `users` AS `u` 
@@ -266,7 +263,7 @@ if (isset($_GET['online']) && $_GET['online'] != null) {
                                 $aa = preg_replace("/sell ", "", $aa);
                                 $act_line = " <span onmouseover=\"fastshow(\'$aa\')\" onmouseout=\"hideshow()\"><b><small>{$act[0]}</small></b></span> ";
                             } else $act_line = '';
-                            echo 'w(\'', $row['login'], '\',', $row['id'], ',', $in_battle, ',\'', $row['align'], '\',\'' . ClanImage($row['klan']) . '\', \'' . $act_line . '\',\'', $row['level'], '\',\'', $row['slp'], '\',\'', $row['trv'], '\',\'', (int)$row['deal'], '\',\'', $row['login2'], '\');';
+                            echo 'w(\'', $row['login'], '\',', $row['id'], ',', $in_battle, ',\'', $row['align'], '\',\'' . ClanImage($row['klan']) . '\', \'' . $act_line . '\',\'', $row['level'], '\',\'', $row['slp'], '\',\'', $row['trv'], '\',\'', '\',\'', $row['login2'], '\');';
                         }
                     }
                     ?>
@@ -433,7 +430,7 @@ if (isset($_GET['online']) && $_GET['online'] != null) {
     if (strpos($_GET['text'], "private") !== FALSE && $user['level'] < 1) {
         preg_match_all("/\[(.*)\]/U", $_GET['text'], $matches);
         for ($ii = 0; $ii < count($matches[1]); $ii++) {
-            $dde = db::c()->query("SELECT `id` FROM `users` WHERE (`deal` = 1 OR (`align`>1 AND `align`<2)) AND `login` = '" . trim($matches[1][$ii]) . "' LIMIT 1 ;")->fetch_assoc();
+            $dde = db::c()->query("SELECT `id` FROM `users` WHERE ((`align`>1 AND `align`<2)) AND `login` = '" . trim($matches[1][$ii]) . "' LIMIT 1 ;")->fetch_assoc();
             if (!$dde['id']) {
                 exit();
             }