Регистратура объединяется со вкладкой кланы. #54. Closes #56.

_incl_data/class/User.php

@@ -1276,18 +1276,19 @@ class User
         return $plid;
     }
 
-    public function microLogin2(array $userInfo): string
+    private function microLogin2(array $userInfo): string
     {
         $result = '';
         if ($userInfo['align'] > 0) {
             $result .= '<img src=' . Config::img() . '/i/align/align' . $userInfo['align'] . '.gif>';
         }
         if ($userInfo['clan'] > 0) {
-            $clanName = Db::getValue('select name_mini from clan where id = ?', [$userInfo['clan']]);
-            $result .= '<img src=' . Config::img() . '/i/clan/' . $clanName . '.gif>';
+            $result .= '<img src=' . Images::getSrc($userInfo['clan']) . ' alt="'. $userInfo['clanName'] .'">';
         }
         $result .= '<strong>' . $userInfo['login'] . '</strong>[' . $userInfo['level'] . ']';
-        $result .= '<a target=_blank href=/info/' . $userInfo['id'] . ' ><img src=' . Config::img() . '/i/inf_capitalcity.gif alt=""></a>';
+        if ($userInfo['login'] !== '<em>невидимка</em>') {
+            $result .= '<a target=_blank href=/info/' . $userInfo['id'] . ' ><img src=' . Config::img() . '/i/inf_capitalcity.gif alt=""></a>';
+        }
         return $result;
     }
 
@@ -1298,33 +1299,17 @@ class User
         } else {
             $inf = Db::getRow(
                 'select
-                users.id,
-                invis,
-                users.align,
-                align2,
-                clan,
-                cityreg,
-                login,
-                users.level,
-                c.name_mini
-            from users left join clan as c on c.id = users.clan
-            where users.id = ?',
-                [$id]
+                        users.id,
+                        if(invis = 1 or invis < unix_timestamp(), login, ?) as login,
+                        if(invis = 1 or invis < unix_timestamp(), users.align, 0) as align,
+                        if(status > 0, clan, 0) as clan,
+                        if(invis = 1 or invis < unix_timestamp(), users.level, ?) as level,
+                        if(status > 0, clan.name, ?) as clanName
+                    from users left join clan on clan.id = users.clan and status > 0 where users.id = ?',
+                ['<em>невидимка</em>', '??', '', $id]
             );
         }
-        $r = '';
-        if (
-            isset($inf['id']) &&
-            (
-                ($inf['invis'] < time() && $inf['invis'] !== 1) ||
-                ($this->info['id'] == $inf['id'] && $nnz === 1)
-            )
-        ) {
-            $r = $this->microLogin2($inf);
-        } else {
-            $r = '<strong><i>Невидимка</i></strong> [??]';
-        }
-        return $r;
+        return isset($inf['id']) ? $this->microLogin2($inf) : '';
     }
 
     public function testHome(): array