From c071d2d293ec97ecb374e5703390b50ed557fb89 Mon Sep 17 00:00:00 2001
From: Ivor Barhansky <me@lopar.space>
Date: Tue, 10 Jan 2023 20:58:20 +0200
Subject: [PATCH] remove deprecated method sys_see()

---
 _incl_data/class/User.php | 23 +++++------------------
 jx/battle/refresh.php     |  2 +-
 jx/battle/refresh1.php    |  2 +-
 jx/battle/refresh2.php    |  2 +-
 jx/battle/refresh_bot.php |  2 +-
 jx/battle/refresh_vip.php |  2 +-
 6 files changed, 10 insertions(+), 23 deletions(-)

diff --git a/_incl_data/class/User.php b/_incl_data/class/User.php
index 8ecc612f..2b9810bf 100644
--- a/_incl_data/class/User.php
+++ b/_incl_data/class/User.php
@@ -607,17 +607,13 @@ class User
         if (!$type) {
             if (($this->info['align'] > 0 || $this->info['clan'] > 0 || $this->info['level'] > 12) && $this->info['align'] != 2) {
                 $r = ($this->info['level'] - 6) * 0.04;
-                if (date('m') >= 6 || date('m') <= 8) {
-                    $r = round($r * 2, 2);
-                } elseif (date('w') == 0 || date('w') == 6) {
+                if (date('m') >= 6 || date('m') <= 8 || date('w') == 0 || date('w') == 6) {
                     $r = round($r * 2, 2);
                 }
                 $r = $r . ' ЕКР.';
             } else {
                 $r = $this->info['level'];
-                if (date('m') >= 6 || date('m') <= 8) {
-                    $r = round($r * 2, 2);
-                } elseif (date('w') == 0 || date('w') == 6) {
+                if (date('m') >= 6 || date('m') <= 8 || date('w') == 0 || date('w') == 6) {
                     $r = round($r * 2, 2);
                 }
                 $r = $r . ' КР.';
@@ -625,17 +621,13 @@ class User
         } else {
             if (($this->info['align'] > 0 || $this->info['clan'] > 0 || $this->info['level'] > 12) && $this->info['align'] != 2) {
                 $r = ($this->info['level'] - 6) * 0.04;
-                if (date('m') >= 6 || date('m') <= 8) {
-                    $r = round($r * 2, 2);
-                } elseif (date('w') == 0 || date('w') == 6) {
+                if (date('m') >= 6 || date('m') <= 8 || date('w') == 0 || date('w') == 6) {
                     $r = round($r * 2, 2);
                 }
                 $r = [2, $r];
             } else {
                 $r = $this->info['level'];
-                if (date('m') >= 6 || date('m') <= 8) {
-                    $r = round($r * 2, 2);
-                } elseif (date('w') == 0 || date('w') == 6) {
+                if (date('m') >= 6 || date('m') <= 8 || date('w') == 0 || date('w') == 6) {
                     $r = round($r * 2, 2);
                 }
                 $r = [1, $r];
@@ -903,12 +895,6 @@ class User
         return $e;
     }
 
-    /**@deprecated do nothing */
-    public function sys_see($type): string
-    {
-        return '';
-    }
-
     public static function start(): User
     {
         if (!isset(self::$flag_one)) {
@@ -10311,6 +10297,7 @@ LIMIT 1'
                 }
 
                 if ($u['admin'] > 0) {
+
                     mysql_query(
                         'UPDATE `stats` SET
 						`tactic1` = 25,
diff --git a/jx/battle/refresh.php b/jx/battle/refresh.php
index e0a6ebef..9e2c3609 100644
--- a/jx/battle/refresh.php
+++ b/jx/battle/refresh.php
@@ -236,7 +236,7 @@ if (($_SERVER['HTTP_X_REQUESTED_WITH'] == 'XMLHttpRequest' || isset($CRON_CORE))
                 $i++;
             }
             $atk1 = 0;
-            $rsys = $u->sys_see(0);
+            $rsys = '';
             if ($rsys != '') {
                 $js .= $rsys;
             }
diff --git a/jx/battle/refresh1.php b/jx/battle/refresh1.php
index 6507b522..ef23bc9c 100644
--- a/jx/battle/refresh1.php
+++ b/jx/battle/refresh1.php
@@ -188,7 +188,7 @@
 						$i++;
 					}
 				$atk1 = 0;
-				if(!isset($CRON_CORE)) {$rsys = $u->sys_see(0);}
+				if(!isset($CRON_CORE)) {$rsys = '';}
 				if($rsys != '') {
 					$js .= $rsys;
 				}
diff --git a/jx/battle/refresh2.php b/jx/battle/refresh2.php
index ad8e184b..2527d84a 100644
--- a/jx/battle/refresh2.php
+++ b/jx/battle/refresh2.php
@@ -183,7 +183,7 @@
 						$i++;
 					}
 				$atk1 = 0;
-				if(!isset($CRON_CORE)) {$rsys = $u->sys_see(0);}
+				if(!isset($CRON_CORE)) {$rsys = '';}
 				if($rsys != '') {
 					$js .= $rsys;
 				}
diff --git a/jx/battle/refresh_bot.php b/jx/battle/refresh_bot.php
index 20dbb2e6..0d471523 100644
--- a/jx/battle/refresh_bot.php
+++ b/jx/battle/refresh_bot.php
@@ -215,7 +215,7 @@ if (isset($CRON_CORE) && (isset($_POST['atack'], $_POST['block']) || (isset($_PO
                 $i++;
             }
             $atk1 = 0;
-            $rsys = $u->sys_see(0);
+            $rsys = '';
             if ($rsys != '') {
                 $js .= $rsys;
             }
diff --git a/jx/battle/refresh_vip.php b/jx/battle/refresh_vip.php
index bb1874e3..7532ed7c 100644
--- a/jx/battle/refresh_vip.php
+++ b/jx/battle/refresh_vip.php
@@ -220,7 +220,7 @@ if ($_SERVER['HTTP_X_REQUESTED_WITH'] == 'XMLHttpRequest' || isset($CRON_CORE))
                 }
                 $atk1 = 0;
                 if (!isset($CRON_CORE)) {
-                    $rsys = $u->sys_see(0);
+                    $rsys = '';
                 }
                 if ($rsys != '') {
                     $js .= $rsys;