From 347d9edf72b3dfc15d2468a8282bf78bcf982c1a Mon Sep 17 00:00:00 2001
From: Ulrich Block <ulblock@gmx.de>
Date: Sun, 18 May 2014 13:50:14 +0200
Subject: [PATCH] #17 partial

---
 web/statuscheck.php          | 6 +-----
 web/stuff/user/init_user.php | 2 +-
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/web/statuscheck.php b/web/statuscheck.php
index 9976ab7b..397c728f 100644
--- a/web/statuscheck.php
+++ b/web/statuscheck.php
@@ -206,11 +206,7 @@ if (!isset($ip) or $ui->escaped('SERVER_ADDR', 'server') == $ip or in_array($ip,
             // without the gameq value we cannot query. So this results need to be sorted out.
             if (!in_array($row['gameq'], array('', null, false))) {
 
-                if (in_array($row['gameq'], array('cube2', 'ut', 'ut2004', 'ut3', 'mta')))  {
-                    $checkAtIPPort = $row['serverip'] . ':' . $row['port2'];
-                } else {
-                    $checkAtIPPort = $row['serverip'] . ':' . $row['port'];
-                }
+                $checkAtIPPort = (in_array($row['gameq'], array('cube2', 'ut', 'ut2004', 'ut3', 'mta'))) ?  $row['serverip'] . ':' . $row['port2'] : $row['serverip'] . ':' . $row['port'];
 
                 $serverBatchArray[] = array('id' => $row['id'], 'type' => $row['gameq'], 'host' => $checkAtIPPort);
                 $i++;
diff --git a/web/stuff/user/init_user.php b/web/stuff/user/init_user.php
index 278deb24..6c2559c1 100644
--- a/web/stuff/user/init_user.php
+++ b/web/stuff/user/init_user.php
@@ -75,7 +75,7 @@ if (isset($_SESSION['sID'])) {
     }
 
     $gscount = count($substituteAccess['gs']);
-    $vhostcount = count($substituteAccess['ws']);
+    $vhostcount = count($substituteAccess['wv']);
     $voicecount = count($substituteAccess['vo']);
     $tsdnscount = count($substituteAccess['vd']);
     $dbcount = count($substituteAccess['db']);