refactor and custom user entities

_incl_data/class/User.php

@@ -596,6 +596,7 @@ class User
 
         $user = !empty($_SESSION['uid']) ? $_SESSION['uid'] : $_COOKIE['login'];
         $this->info = self::getInfo($user);
+
         unset($user);
 
         Database::init(); // для всяких mysql_*
@@ -1097,6 +1098,14 @@ class User
             left join room on users.room = room.id
         where users.' . $cell . ' = ?';
         $result = Db::getRow($query, [$user]);
+
+        $temp = Conversion::dataStringToArray($result['stats']);
+
+        $result['testStats'] = new User\UserStats(
+            $temp
+        );
+        $result['testStats2'] = new \User\UserCalculatedStats($result['testStats']);
+
         return $result ?: [];
     }
 
@@ -2014,7 +2023,7 @@ class User
                 Db::sql(
                     "insert into users (align, login, level, pass, city, cityreg, name, sex, timereg, obraz, bot_id, inTurnir) values (?,?,?,uuid(),'Неведомые земли','Неведомые земли',?,?,?,?,?,?)",
                     [
-                        $clon['align'],
+                        $clon['align'] ?? 0,
                         $clon['login'],
                         $clon['level'],
                         $clon['login'],
@@ -2022,7 +2031,7 @@ class User
                         $clon['time_reg'],
                         $clon['obraz'],
                         $id,
-                        $clon['inTurnir'],
+                        $clon['inTurnir'] ?? 0,
                     ]
                 );