supernova-ws / SuperNova

includes/classes/DBStaticUnit.php

Spacing +16 added lines, -16 removed lines

@@ -24,7 +24,7 @@ 
     }
 
     if (SnCache::isUnitLocatorNotSet($location_type, $location_id)) {
-      $got_data = classSupernova::$gc->cacheOperator->db_get_record_list(LOC_UNIT, "unit_location_type = {$location_type} AND unit_location_id = {$location_id} AND " . DBStaticUnit::db_unit_time_restrictions());
+      $got_data = classSupernova::$gc->cacheOperator->db_get_record_list(LOC_UNIT, "unit_location_type = {$location_type} AND unit_location_id = {$location_id} AND ".DBStaticUnit::db_unit_time_restrictions());
       if (!empty($got_data) && is_array($got_data)) {
         foreach ($got_data as $unit_id => $unit_data) {
           SnCache::setUnitLocatorByLocationAndIDs($location_type, $location_id, $unit_data);
@@ -59,9 +59,9 @@ 
 
   public static function db_unit_count_by_user_and_type_and_snid($user_id, $unit_type = 0, $unit_snid = 0) {
     $query = classSupernova::$db->doSelect(
-      "SELECT unit_snid, sum(unit_level) as `qty`  FROM {{unit}} WHERE `unit_player_id` = {$user_id} " .
-      ($unit_type ? "AND `unit_type` = {$unit_type} " : '') .
-      ($unit_snid ? "AND `unit_snid` = {$unit_snid} " : '') .
+      "SELECT unit_snid, sum(unit_level) as `qty`  FROM {{unit}} WHERE `unit_player_id` = {$user_id} ".
+      ($unit_type ? "AND `unit_type` = {$unit_type} " : '').
+      ($unit_snid ? "AND `unit_snid` = {$unit_snid} " : '').
       'GROUP BY `unit_snid`'
     );
     $result = array();
@@ -81,8 +81,8 @@ 
     WHERE
       f.fleet_owner = {$user_id} AND
       (f.fleet_start_planet_id = {$location_id} OR f.fleet_end_planet_id = {$location_id})
-      AND u.unit_snid = {$unit_snid} AND u.`unit_location_type` = " . LOC_FLEET . " AND " . self::db_unit_time_restrictions() .
-      " LIMIT 1" .
+      AND u.unit_snid = {$unit_snid} AND u.`unit_location_type` = ".LOC_FLEET." AND ".self::db_unit_time_restrictions().
+      " LIMIT 1".
       ($for_update ? ' FOR UPDATE' : ''));
   }
 
@@ -90,7 +90,7 @@ 
   public static function db_unit_list_laboratories($user_id) {
     return classSupernova::$db->doSelect("SELECT DISTINCT unit_location_id AS `id`
     FROM {{unit}}
-    WHERE unit_player_id = {$user_id} AND unit_location_type = " . LOC_PLANET . " AND unit_level > 0 AND unit_snid IN (" . STRUC_LABORATORY . ", " . STRUC_LABORATORY_NANO . ");");
+    WHERE unit_player_id = {$user_id} AND unit_location_type = ".LOC_PLANET." AND unit_level > 0 AND unit_snid IN (".STRUC_LABORATORY.", ".STRUC_LABORATORY_NANO.");");
   }
 
   public static function db_unit_set_by_id($unit_id, $set) {
@@ -108,9 +108,9 @@ 
 
   public static function db_unit_list_delete($user_id = 0, $unit_location_type, $unit_location_id = 0, $unit_snid = 0) {
     return classSupernova::$gc->cacheOperator->db_del_record_list(LOC_UNIT,
-      "`unit_location_type` = {$unit_location_type}" .
-      ($unit_location_id = idval($unit_location_id) ? " AND `unit_location_id` = {$unit_location_id}" : '') .
-      ($user_id = idval($user_id) ? " AND `unit_player_id` = {$user_id}" : '') .
+      "`unit_location_type` = {$unit_location_type}".
+      ($unit_location_id = idval($unit_location_id) ? " AND `unit_location_id` = {$unit_location_id}" : '').
+      ($user_id = idval($user_id) ? " AND `unit_player_id` = {$user_id}" : '').
       ($unit_snid = idval($unit_snid) ? " AND `unit_snid` = {$unit_snid}" : ''));
   }
 
@@ -118,7 +118,7 @@ 
     return classSupernova::$db->doSelect(
       "SELECT unit_player_id, unit_type, unit_snid, unit_level, count(*) AS unit_amount
     FROM `{{unit}}`
-    WHERE unit_level > 0 AND " . self::db_unit_time_restrictions() .
+    WHERE unit_level > 0 AND " . self::db_unit_time_restrictions().
       " GROUP BY unit_player_id, unit_type, unit_snid, unit_level"
     );
   }
@@ -130,15 +130,15 @@ 
 
 
   public static function db_unit_list_admin_delete_mercenaries_finished() {
-    return classSupernova::$db->doDelete("DELETE FROM `{{unit}}` WHERE unit_time_finish IS NOT NULL AND unit_time_finish < FROM_UNIXTIME(" . SN_TIME_NOW . ") AND unit_type = " . UNIT_MERCENARIES);
+    return classSupernova::$db->doDelete("DELETE FROM `{{unit}}` WHERE unit_time_finish IS NOT NULL AND unit_time_finish < FROM_UNIXTIME(".SN_TIME_NOW.") AND unit_type = ".UNIT_MERCENARIES);
   }
 
   public static function db_unit_list_admin_set_mercenaries_expire_time($default_length) {
     return classSupernova::$db->doUpdate(
       "UPDATE `{{unit}}`
     SET
-      unit_time_start = FROM_UNIXTIME(" . SN_TIME_NOW . "),
-      unit_time_finish = FROM_UNIXTIME(" . (SN_TIME_NOW + $default_length) . ")
+      unit_time_start = FROM_UNIXTIME(" . SN_TIME_NOW."),
+      unit_time_finish = FROM_UNIXTIME(" . (SN_TIME_NOW + $default_length).")
     WHERE unit_type = " . UNIT_MERCENARIES
     );
   }
@@ -163,13 +163,13 @@ 
 
     $temp = DBStaticUnit::db_get_unit_by_location($user['id'], $unit_location, $location_id, $unit_id, true, 'unit_id');
     if (!empty($temp['unit_id'])) {
-      $result = (bool)classSupernova::$gc->cacheOperator->db_upd_record_list(
+      $result = (bool) classSupernova::$gc->cacheOperator->db_upd_record_list(
         LOC_UNIT, "`unit_level` = `unit_level` + ($unit_value)", "`unit_id` = {$temp['unit_id']}"
       );
     } else {
       $locationIdRendered = $unit_location == LOC_USER ? $user['id'] : $planet_id;
       $unitType = get_unit_param($unit_id, P_UNIT_TYPE);
-      $result = (bool)classSupernova::$gc->cacheOperator->db_ins_record(
+      $result = (bool) classSupernova::$gc->cacheOperator->db_ins_record(
         LOC_UNIT,
         "unit_player_id = {$user['id']}, 
         unit_location_type = {$unit_location}, 

includes/classes/DBStaticUser.php

Spacing +11 added lines, -11 removed lines

@@ -23,7 +23,7 @@ 
         ->where('`user_as_ally` IS NULL')
         ->orderBy(array('`id` DESC'));
 
-    return (string)$query->selectValue();
+    return (string) $query->selectValue();
   }
 
   /**
@@ -48,15 +48,15 @@ 
       static::buildDBQ()
         ->field('id')
         ->where("`user_as_ally` IS NULL")
-        ->where("`user_bot` = " . USER_BOT_PLAYER)
+        ->where("`user_bot` = ".USER_BOT_PLAYER)
         ->setForUpdate();
 
     return $query->selectIterator();
   }
 
   public static function db_user_lock_with_target_owner_and_acs($user, $planet = array()) {
-    $query = "SELECT 1 FROM `{{users}}` WHERE `id` = " . idval($user['id']) .
-      (!empty($planet['id_owner']) ? ' OR `id` = ' . idval($planet['id_owner']) : '')
+    $query = "SELECT 1 FROM `{{users}}` WHERE `id` = ".idval($user['id']).
+      (!empty($planet['id_owner']) ? ' OR `id` = '.idval($planet['id_owner']) : '')
       . " FOR UPDATE";
 
     static::getDb()->doSelect($query);
@@ -73,7 +73,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) : '')
     ));
   }
 
@@ -95,7 +95,7 @@ 
       ->fieldCount('r.id', 'referral_count')
       ->fieldSingleFunction('sum', 'r.dark_matter', 'referral_dm')
       ->join('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')
+      ->where($online ? "`onlinetime` >= ".intval(SN_TIME_NOW - classSupernova::$config->game_users_online_timeout) : 'user_as_ally IS NULL')
       ->groupBy('u.id')
       ->orderBy("user_as_ally, {$sort} ASC");
 
@@ -113,7 +113,7 @@ 
       ->where('(`user_birthday_celebrated` IS NULL OR DATE_ADD(`user_birthday_celebrated`, INTERVAL 1 YEAR) < CURRENT_DATE)')
       ->where('`user_as_ally` IS NULL')
       ->having('`days_after_birthday` >= 0')
-      ->having('`days_after_birthday` < ' . intval($config_user_birthday_range))
+      ->having('`days_after_birthday` < '.intval($config_user_birthday_range))
       ->setForUpdate();
 
     $result = $query->selectIterator();
@@ -207,7 +207,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"
       );
       SnCache::cache_set(LOC_USER, $user); // В кэш-юзер так же заполнять индексы
@@ -257,7 +257,7 @@ 
 
 
   public static function db_user_list_set_mass_mail(&$owners_list, $set) {
-    return classSupernova::$gc->cacheOperator->db_upd_record_list(LOC_USER, $set, !empty($owners_list) ? '`id` IN (' . implode(',', $owners_list) . ');' : '');
+    return classSupernova::$gc->cacheOperator->db_upd_record_list(LOC_USER, $set, !empty($owners_list) ? '`id` IN ('.implode(',', $owners_list).');' : '');
   }
 
   public static function db_user_list_set_by_ally_and_rank($ally_id, $ally_rank_id, $set) {
@@ -272,7 +272,7 @@ 
    * @param array $playerArray
    */
   public static function renderNameAndCoordinates($playerArray) {
-    return "{$playerArray['username']} " . uni_render_coordinates($playerArray);
+    return "{$playerArray['username']} ".uni_render_coordinates($playerArray);
   }
 
   /**
@@ -303,7 +303,7 @@ 
       $fieldName = pname_resource_name($resourceId);
       $value = "{$fieldName} = {$fieldName} + ('{$value}')";
     }
-    if($query = implode(',', $playerRowFieldChanges)) {
+    if ($query = implode(',', $playerRowFieldChanges)) {
       classSupernova::$gc->db->doUpdate("UPDATE `{{users}}` SET {$query} WHERE id = {$userId}");
     }
   }

includes/classes/SnDbCachedOperator.php

Spacing +6 added lines, -6 removed lines

@@ -182,8 +182,8 @@ 
           $query = $this->db->doSelect(
             "SELECT
               distinct({{{$location_info[P_TABLE_NAME]}}}.{$owner_data[P_OWNER_FIELD]}) AS parent_id
-            FROM {{{$location_info[P_TABLE_NAME]}}}" .
-            ($filter ? ' WHERE ' . $filter : '') .
+            FROM {{{$location_info[P_TABLE_NAME]}}}".
+            ($filter ? ' WHERE '.$filter : '').
             ($fetch ? ' LIMIT 1' : ''));
           while ($row = db_fetch($query)) {
             // Исключаем из списка родительских ИД уже заблокированные записи
@@ -196,13 +196,13 @@ 
           if ($indexes_str = implode(',', $parent_id_list)) {
             $parent_id_field = static::$location_info[$owner_location_type][P_ID];
             classSupernova::$gc->cacheOperator->db_get_record_list($owner_location_type,
-              $parent_id_field . (count($parent_id_list) > 1 ? " IN ({$indexes_str})" : " = {$indexes_str}"), $fetch, true);
+              $parent_id_field.(count($parent_id_list) > 1 ? " IN ({$indexes_str})" : " = {$indexes_str}"), $fetch, true);
           }
         }
       }
 
       $query = $this->db->doSelect(
-        "SELECT * FROM {{{$location_info[P_TABLE_NAME]}}}" .
+        "SELECT * FROM {{{$location_info[P_TABLE_NAME]}}}".
         (($filter = trim($filter)) ? " WHERE {$filter}" : '')
         . " FOR UPDATE"
       );
@@ -276,7 +276,7 @@ 
     $condition = trim($condition);
     $table_name = static::$location_info[$location_type][P_TABLE_NAME];
 
-    if ($result = $this->db->doUpdate("UPDATE {{{$table_name}}} SET " . $set . ($condition ? ' WHERE ' . $condition : ''))) {
+    if ($result = $this->db->doUpdate("UPDATE {{{$table_name}}} SET ".$set.($condition ? ' WHERE '.$condition : ''))) {
 
       if ($this->db->db_affected_rows()) { // Обновляем данные только если ряд был затронут
         // Поскольку нам неизвестно, что и как обновилось - сбрасываем кэш этого типа полностью
@@ -346,7 +346,7 @@ 
   public function db_lock_tables($tables) {
     $tables = is_array($tables) ? $tables : array($tables => '');
     foreach ($tables as $table_name => $condition) {
-      $this->db->doSelect("SELECT 1 FROM {{{$table_name}}}" . ($condition ? ' WHERE ' . $condition : ''));
+      $this->db->doSelect("SELECT 1 FROM {{{$table_name}}}".($condition ? ' WHERE '.$condition : ''));
     }
   }
 }