supernova-ws / SuperNova

includes/classes/DBStatic/DBStaticQue.php

Spacing +1 added lines, -1 removed lines

@@ -38,7 +38,7 @@
     if ($que_type == QUE_RESEARCH || $planet_id === null) {
       $query[] = "`que_planet_id` IS NULL";
     } elseif ($planet_id) {
-      $query[] = "(`que_planet_id` = {$planet_id}" . ($que_type ? '' : ' OR que_planet_id IS NULL') . ")";
+      $query[] = "(`que_planet_id` = {$planet_id}".($que_type ? '' : ' OR que_planet_id IS NULL').")";
     }
     if ($que_type) {
       $query[] = "`que_type` = {$que_type}";

includes/classes/DBStatic/DBStaticUser.php

Spacing +7 added lines, -7 removed lines

@@ -38,7 +38,7 @@ 
    */
   // TODO - remove or use something else
   public static function renderNameAndCoordinates($playerArray) {
-    return "{$playerArray['username']} " . uni_render_coordinates($playerArray);
+    return "{$playerArray['username']} ".uni_render_coordinates($playerArray);
   }
 
   /**
@@ -115,7 +115,7 @@ 
    * @return int
    */
   public static function db_user_count($online = false) {
-    $iterator = static::playerSelectIterator('COUNT(`id`)', '', false, '', ($online ? '`onlinetime` > ' . (SN_TIME_NOW - classSupernova::$config->game_users_online_timeout) : ''));
+    $iterator = static::playerSelectIterator('COUNT(`id`)', '', false, '', ($online ? '`onlinetime` > '.(SN_TIME_NOW - classSupernova::$config->game_users_online_timeout) : ''));
 
     return intval(classSupernova::$db->getDbIteratorFirstValue($iterator));
   }
@@ -128,7 +128,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);
@@ -145,7 +145,7 @@ 
         `{{users}}`
       WHERE
         `user_as_ally` IS NULL
-        AND `user_bot` = " . USER_BOT_PLAYER . "
+        AND `user_bot` = " . USER_BOT_PLAYER."
         AND `user_birthday` IS NOT NULL
         AND (`user_birthday_celebrated` IS NULL OR DATE_ADD(`user_birthday_celebrated`, INTERVAL 1 YEAR) < CURRENT_DATE)
       HAVING
@@ -166,8 +166,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);
@@ -243,7 +243,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); // В кэш-юзер так же заполнять индексы

Doc Comments +9 added lines, -3 removed lines

@@ -40,6 +40,7 @@ 
   }
 
   /**
+   * @param string $fields
    * @return DbResultIterator
    */
   protected static function playerSelectIterator($fields, $orderBy = '', $forUpdate = false, $groupHaving = '', $where = '', $limit = '') {
@@ -134,6 +135,9 @@ 
     return $result;
   }
 
+  /**
+   * @param integer $config_user_birthday_range
+   */
   public static function db_user_list_to_celebrate($config_user_birthday_range) {
     $query = "SELECT
         `id`, `username`, `user_birthday`, `user_birthday_celebrated`,
@@ -213,6 +217,9 @@ 
     return $user_list;
   }
 
+  /**
+   * @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))) {
@@ -266,7 +273,6 @@ 
 
   /**
    * @param       $user_id
-   * @param array $set
    * @param array $adjust
    *
    * @return array|bool|mysqli_result|null
@@ -283,8 +289,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>

includes/includes/upd_helpers.php

Spacing +5 added lines, -5 removed lines

@@ -15,10 +15,10 @@ 
   // classSupernova::$db->sn_db_connect();
   if (!(strpos($query, '{{') === false)) {
     foreach ($update_tables as $tableName => $cork) {
-      $query = str_replace("{{{$tableName}}}", classSupernova::$db->db_prefix . $tableName, $query);
+      $query = str_replace("{{{$tableName}}}", classSupernova::$db->db_prefix.$tableName, $query);
     }
   }
-  !($result = classSupernova::$db->db_sql_query($query)) ? die('Query error for ' . $query . ': ' . classSupernova::$db->db_error()) : false;
+  !($result = classSupernova::$db->db_sql_query($query)) ? die('Query error for '.$query.': '.classSupernova::$db->db_error()) : false;
 
   return $result;
 }
@@ -85,7 +85,7 @@ 
   global $update_tables, $update_indexes, $update_indexes_full, $update_foreigns;
 
   $tableName = $prefixed ? str_replace(classSupernova::$config->db_prefix, '', $prefix_table_name) : $prefix_table_name;
-  $prefix_table_name = $prefixed ? $prefix_table_name : classSupernova::$config->db_prefix . $prefix_table_name;
+  $prefix_table_name = $prefixed ? $prefix_table_name : classSupernova::$config->db_prefix.$prefix_table_name;
 
   upd_unset_table_info($tableName);
 
@@ -100,7 +100,7 @@ 
     $update_indexes_full[$tableName][$r1['Key_name']][$r1['Column_name']] = $r1;
   }
 
-  $q1 = upd_do_query("SELECT * FROM `information_schema`.`KEY_COLUMN_USAGE` WHERE `TABLE_SCHEMA` = '" . db_escape(classSupernova::$db_name) . "' AND TABLE_NAME = '{$prefix_table_name}' AND REFERENCED_TABLE_NAME is not null;", true);
+  $q1 = upd_do_query("SELECT * FROM `information_schema`.`KEY_COLUMN_USAGE` WHERE `TABLE_SCHEMA` = '".db_escape(classSupernova::$db_name)."' AND TABLE_NAME = '{$prefix_table_name}' AND REFERENCED_TABLE_NAME is not null;", true);
   while ($r1 = db_fetch($q1)) {
     $table_referenced = str_replace(classSupernova::$config->db_prefix, '', $r1['REFERENCED_TABLE_NAME']);
 
@@ -160,7 +160,7 @@ 
     $result = upd_do_query("CREATE TABLE IF NOT EXISTS `{$db_prefix}{$table_name}` {$declaration}");
     $error = classSupernova::$db->db_error();
     if ($error) {
-      die("Creating error for table `{$table_name}`: {$error}<br />" . dump($declaration));
+      die("Creating error for table `{$table_name}`: {$error}<br />".dump($declaration));
     }
     upd_do_query('set foreign_key_checks = 1;', true);
     upd_load_table_info($table_name, false);

includes/classes/V2Unit/V2UnitList.php

Indentation -4 removed lines

@@ -14,10 +14,6 @@
        $unit_obj = new V2Unit()->load($unit_row);
         $this->attach($unit_obj, $unit_obj->dbId);
      }
-
-
-
-
      *
      */
   }

Doc Comments +1 added lines

@@ -18,6 +18,7 @@
   protected $unitBySnId;
 
   /**
+   * @param integer $locationType
    */
   public function load($locationType, $locationId) {
 

Spacing +3 added lines, -3 removed lines

@@ -21,15 +21,15 @@
    */
   public function load($locationType, $locationId) {
 
-    if(!($unitRows = DBStaticUnit::db_get_unit_list_by_location(0, $locationType, $locationId))) {
+    if (!($unitRows = DBStaticUnit::db_get_unit_list_by_location(0, $locationType, $locationId))) {
       return null;
     }
 
     $model = \classSupernova::$gc->unitModel;
-    foreach($unitRows as $dbId => $unitRow) {
+    foreach ($unitRows as $dbId => $unitRow) {
       $unit = $model->fromArray($unitRow);
       $this->attach($unit);
-      if($unit->snId) {
+      if ($unit->snId) {
         $this->unitBySnId[$unit->snId] = $unit;
       }
     }

includes/classes/V2Fleet/V2FleetModel.php

Spacing +8 added lines, -8 removed lines

@@ -83,19 +83,19 @@
   public function importVector(V2FleetContainer $that, array &$row, $propertyName, $fieldName) {
     $prefix = $propertyName == 'vectorDeparture' ? 'fleet_start_' : 'fleet_end_';
     $that->$propertyName = new Vector(
-      $row[$prefix . 'galaxy'],
-      $row[$prefix . 'system'],
-      $row[$prefix . 'planet'],
-      $row[$prefix . 'type']
+      $row[$prefix.'galaxy'],
+      $row[$prefix.'system'],
+      $row[$prefix.'planet'],
+      $row[$prefix.'type']
     );
   }
 
   public function exportVector(V2FleetContainer $that, array &$row, $propertyName, $fieldName) {
     $prefix = $propertyName == 'vectorDeparture' ? 'fleet_start_' : 'fleet_end_';
-    $row[$prefix . 'galaxy'] = $that->$propertyName->galaxy;
-    $row[$prefix . 'system'] = $that->$propertyName->system;
-    $row[$prefix . 'planet'] = $that->$propertyName->planet;
-    $row[$prefix . 'type'] = $that->$propertyName->type;
+    $row[$prefix.'galaxy'] = $that->$propertyName->galaxy;
+    $row[$prefix.'system'] = $that->$propertyName->system;
+    $row[$prefix.'planet'] = $that->$propertyName->planet;
+    $row[$prefix.'type'] = $that->$propertyName->type;
   }
 
   /**

includes/classes/Common/IndexedObjectStorage.php

Spacing +1 added lines, -1 removed lines

@@ -41,7 +41,7 @@
 
     // Checking if index free. NULL index is always free
     if (isset($this->index[$data])) {
-      throw new \Exception('Duplicate index [' . $data . '] in ' . __CLASS__);
+      throw new \Exception('Duplicate index ['.$data.'] in '.__CLASS__);
     }
 
     if ($data !== null) {