supernova-ws / SuperNova

includes/classes/classConfig.php

Unused Use Statements -1 removed lines

@@ -1,5 +1,4 @@
 <?php
-use DBStatic\DBStaticUser;
 
 /**
  *

includes/classes/DbQueryConstructor.php

Doc Comments -2 removed lines

@@ -444,7 +444,6 @@ 
   }
 
   /**
-   * @param bool $skip_query_check
    *
    * @return array
    */
@@ -455,7 +454,6 @@ 
   }
 
   /**
-   * @param bool $skip_query_check
    *
    * @return mixed|null
    */

includes/classes/DBStatic/DBStaticNews.php

Doc Comments +2 added lines, -2 removed lines

@@ -50,8 +50,8 @@
 
   /**
    * @param template $template
-   * @param          $query_where
-   * @param          $query_limit
+   * @param          string $query_where
+   * @param          integer $query_limit
    *
    * @return array|bool|mysqli_result|null
    */

includes/classes/DBStatic/DBStaticUser.php

Doc Comments +5 added lines, -3 removed lines

@@ -215,6 +215,9 @@ 
   }
 
 
+  /**
+   * @param string $username_unsafe
+   */
   public static function db_user_by_username($username_unsafe, $for_update = false, $fields = '*', $player = null, $like = false) {
     // TODO Проверить, кстати - а везде ли нужно выбирать юзеров или где-то все-таки ищутся Альянсы ?
     if (!($username_unsafe = trim($username_unsafe))) {
@@ -269,7 +272,6 @@ 
 
   /**
    * @param       $user_id
-   * @param array $set
    * @param array $adjust
    *
    * @return array|bool|mysqli_result|null
@@ -286,8 +288,8 @@ 
    *    <p>array - запись пользователя с установленным полем ['id']</p>
    * @param bool      $for_update @deprecated
    * @param string    $fields @deprecated список полей или '*'/'' для всех полей
-   * @param null      $player
-   * @param bool|null $player Признак выбора записи пользователь типа "игрок"
+   * @param boolean      $player
+   * @param boolean $player Признак выбора записи пользователь типа "игрок"
    *    <p>null - Можно выбрать запись любого типа</p>
    *    <p>true - Выбирается только запись типа "игрок"</p>
    *    <p>false - Выбирается только запись типа "альянс"</p>

Spacing +9 added lines, -9 removed lines

@@ -26,7 +26,7 @@ 
       WHERE 
         `user_as_ally` IS NULL 
         AND 
-        `user_bot` = " . USER_BOT_PLAYER . " 
+        `user_bot` = " . USER_BOT_PLAYER." 
       ORDER BY `id` DESC 
       LIMIT 1"
     ;
@@ -52,7 +52,7 @@ 
       WHERE 
         `user_as_ally` IS NULL 
         AND 
-        `user_bot` = " . USER_BOT_PLAYER . " 
+        `user_bot` = " . USER_BOT_PLAYER." 
       ORDER BY `id`";
     $result = classSupernova::$db->doSelectIterator($query);
 
@@ -70,7 +70,7 @@ 
    * @return DbResultIterator
    */
   public static function db_user_list_non_bots() {
-    $query = "SELECT `id` FROM `{{users}}` WHERE `user_as_ally` IS NULL AND `user_bot` = " . USER_BOT_PLAYER . " FOR UPDATE;";
+    $query = "SELECT `id` FROM `{{users}}` WHERE `user_as_ally` IS NULL AND `user_bot` = ".USER_BOT_PLAYER." FOR UPDATE;";
     $result = classSupernova::$db->doSelectIterator($query);
 
 //    $query =
@@ -88,8 +88,8 @@ 
     $query =
       "SELECT 1 
       FROM `{{users}}` 
-      WHERE `id` = " . idval($user['id']) .
-      (!empty($planet['id_owner']) ? ' OR `id` = ' . idval($planet['id_owner']) : '') .
+      WHERE `id` = " . idval($user['id']).
+      (!empty($planet['id_owner']) ? ' OR `id` = '.idval($planet['id_owner']) : '').
       " FOR UPDATE";
 
     classSupernova::$db->doSelect($query);
@@ -106,7 +106,7 @@ 
       FROM `{{users}}` 
       WHERE 
         `user_as_ally` IS NULL" .
-      ($online ? ' AND `onlinetime` > ' . (SN_TIME_NOW - classSupernova::$config->game_users_online_timeout) : '')
+      ($online ? ' AND `onlinetime` > '.(SN_TIME_NOW - classSupernova::$config->game_users_online_timeout) : '')
     ));
   }
 
@@ -118,7 +118,7 @@ 
           LEFT JOIN
               {{referrals}} as r on r.id_partner = u.id
       WHERE " .
-        ($online ? "`onlinetime` >= " . intval(SN_TIME_NOW - classSupernova::$config->game_users_online_timeout) : 'user_as_ally IS NULL') .
+        ($online ? "`onlinetime` >= ".intval(SN_TIME_NOW - classSupernova::$config->game_users_online_timeout) : 'user_as_ally IS NULL').
       " GROUP BY u.id
       ORDER BY user_as_ally, {$sort} ASC";
     $result = classSupernova::$db->doSelectIterator($query);
@@ -244,7 +244,7 @@ 
       $username_safe = db_escape($like ? strtolower($username_unsafe) : $username_unsafe); // тут на самом деле strtolower() лишняя, но пусть будет
 
       $user = classSupernova::$db->doSelectFetch(
-        "SELECT * FROM {{users}} WHERE `username` " . ($like ? 'LIKE' : '=') . " '{$username_safe}'"
+        "SELECT * FROM {{users}} WHERE `username` ".($like ? 'LIKE' : '=')." '{$username_safe}'"
         . " FOR UPDATE"
       );
       classSupernova::$gc->snCache->cache_set(LOC_USER, $user); // В кэш-юзер так же заполнять индексы
@@ -335,7 +335,7 @@ 
    * @param array $playerArray
    */
   public static function renderNameAndCoordinates($playerArray) {
-    return "{$playerArray['username']} " . uni_render_coordinates($playerArray);
+    return "{$playerArray['username']} ".uni_render_coordinates($playerArray);
   }
 
   /**

admin/adm_user_analyze.php

Spacing +3 added lines, -3 removed lines

@@ -12,7 +12,7 @@ 
 define('INSTALL', false);
 define('IN_ADMIN', true);
 
-require('../common.' . substr(strrchr(__FILE__, '.'), 1));
+require('../common.'.substr(strrchr(__FILE__, '.'), 1));
 
 if ($user['authlevel'] < 3) {
   AdminMessage(classLocale::$lang['adm_err_denied']);
@@ -101,11 +101,11 @@ 
 print("<td>Last online</td>");
 print("</tr>");
 foreach ($session_list as $user_id => $value) {
-  $user_record = classSupernova::$db->doSelect("SELECT * FROM `{{users}}` WHERE `id` = " . idval($user_id));
+  $user_record = classSupernova::$db->doSelect("SELECT * FROM `{{users}}` WHERE `id` = ".idval($user_id));
   foreach ($value as $interval_data) {
     print("<tr>");
     print("<td>{$user_id}</td><td>{$user_record['username']}</td><td>{$interval_data[0]}</td><td>{$interval_data[1]}</td><td>{$interval_data[2]}</td>");
-    print("<td>" . date(FMT_DATE_TIME_SQL, $user_record['onlinetime']) . "</td>");
+    print("<td>".date(FMT_DATE_TIME_SQL, $user_record['onlinetime'])."</td>");
     print("</tr>");
   }
 }

includes/classes/DBStatic/DBStaticPlanet.php

Spacing +6 added lines, -7 removed lines

@@ -65,11 +65,10 @@ 
   }
 
   public static function db_planet_by_vector($vector, $prefix = '', $for_update = false, $fields = '*') {
-    $galaxy = isset($vector[$prefix . 'galaxy']) ? intval($vector[$prefix . 'galaxy']) : 0;
-    $system = isset($vector[$prefix . 'system']) ? intval($vector[$prefix . 'system']) : 0;
-    $planet = isset($vector[$prefix . 'planet']) ? intval($vector[$prefix . 'planet']) : 0;
-    $planet_type = isset($vector[$prefix . 'planet_type']) ? intval($vector[$prefix . 'planet_type']) :
-      (isset($vector[$prefix . 'type']) ? intval($vector[$prefix . 'type']) : 0);
+    $galaxy = isset($vector[$prefix.'galaxy']) ? intval($vector[$prefix.'galaxy']) : 0;
+    $system = isset($vector[$prefix.'system']) ? intval($vector[$prefix.'system']) : 0;
+    $planet = isset($vector[$prefix.'planet']) ? intval($vector[$prefix.'planet']) : 0;
+    $planet_type = isset($vector[$prefix.'planet_type']) ? intval($vector[$prefix.'planet_type']) : (isset($vector[$prefix.'type']) ? intval($vector[$prefix.'type']) : 0);
     $planet_type = $planet_type == PT_DEBRIS ? PT_PLANET : $planet_type;
 
     return DBStaticPlanet::db_planet_by_gspt_safe($galaxy, $system, $planet, $planet_type, $for_update, $fields);
@@ -120,7 +119,7 @@ 
     }
 
     return classSupernova::$gc->cacheOperator->db_get_record_list(LOC_PLANET,
-      "`planet_type` = " . PT_MOON . " AND `id_owner` = {$user_id} AND `id` != {$this_moon_id}");
+      "`planet_type` = ".PT_MOON." AND `id_owner` = {$user_id} AND `id` != {$this_moon_id}");
   }
 
   public static function db_planet_list_in_system($galaxy, $system) {
@@ -146,7 +145,7 @@ 
     );
     $order_by = classSupernova::$user_options[PLAYER_OPTION_PLANET_SORT];
     empty($sort_orders[$order_by]) ? $order_by = SORT_ID : false;
-    $order_by = $sort_orders[$order_by] . ' ' . (classSupernova::$user_options[PLAYER_OPTION_PLANET_SORT_INVERSE] == SORT_ASCENDING ? 'ASC' : 'DESC');
+    $order_by = $sort_orders[$order_by].' '.(classSupernova::$user_options[PLAYER_OPTION_PLANET_SORT_INVERSE] == SORT_ASCENDING ? 'ASC' : 'DESC');
 
     // Compilating query
     return classSupernova::$gc->cacheOperator->db_get_record_list(LOC_PLANET,