supernova-ws / SuperNova

includes/alliance/ali_internal_admin_request.inc

Spacing +4 added lines, -4 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if(!defined('SN_IN_ALLY') || SN_IN_ALLY !== true) {
+if (!defined('SN_IN_ALLY') || SN_IN_ALLY !== true) {
   classSupernova::$debug->error("Attempt to call ALLIANCE page mode {$mode} directly - not from alliance.php", 'Forbidden', 403);
 }
 
@@ -10,16 +10,16 @@ 
 
 $d = sys_get_param_id('d');
 
-if($d) {
+if ($d) {
   db_ally_request_deny($d);
 }
 
 $id_user = sys_get_param_id('id_user');
 
-if($id_user) {
+if ($id_user) {
   $ally_name_safe = db_escape($ally['ally_name']);
   $ally_tag_safe = db_escape($ally['ally_tag']);
-  DBStaticUser::db_user_set_by_id($id_user, "`ally_id` = '{$ally['id']}', `ally_name` = '{$ally_name_safe}', `ally_tag` = '{$ally_tag_safe}', `ally_register_time` = " . SN_TIME_NOW . ", `ally_rank_id` = 0");
+  DBStaticUser::db_user_set_by_id($id_user, "`ally_id` = '{$ally['id']}', `ally_name` = '{$ally_name_safe}', `ally_tag` = '{$ally_tag_safe}', `ally_register_time` = ".SN_TIME_NOW.", `ally_rank_id` = 0");
   db_ally_update_member_increase($ally);
   db_ally_request_delete_by_user_id($id_user);
 }

includes/classes/classSupernova.php

Doc Comments +6 added lines, -3 removed lines

@@ -323,7 +323,7 @@ 
    *   <p>null - транзакция НЕ должна быть запущена</p>
    *   <p>true - транзакция должна быть запущена - для совместимости с $for_update</p>
    *   <p>false - всё равно - для совместимости с $for_update</p>
-   * @return bool Текущий статус транзакции
+   * @return null|boolean Текущий статус транзакции
    */
   public static function db_transaction_check($status = null) {
     $error_msg = false;
@@ -399,7 +399,7 @@ 
   /**
    * Блокирует указанные таблицу/список таблиц
    *
-   * @param string|array $tables Таблица/список таблиц для блокировки. Названия таблиц - без префиксов
+   * @param string $tables Таблица/список таблиц для блокировки. Названия таблиц - без префиксов
    * <p>string - название таблицы для блокировки</p>
    * <p>array - массив, где ключ - имя таблицы, а значение - условия блокировки элементов</p>
    */
@@ -587,6 +587,9 @@ 
     return $result;
   }
 
+  /**
+   * @param integer $location_type
+   */
   public static function db_ins_field_set($location_type, $field_set, $serialize = false) {
     // TODO multiinsert
     !sn_db_field_set_is_safe($field_set) ? $field_set = sn_db_field_set_make_safe($field_set, $serialize) : false;
@@ -809,7 +812,7 @@ 
    * @param     $location_type
    * @param     $location_id
    *
-   * @return array|bool
+   * @return boolean
    */
   public static function db_get_unit_list_by_location($user_id = 0, $location_type, $location_id)
   {

Spacing +18 added lines, -20 removed lines

@@ -236,7 +236,7 @@ 
   public static function cache_clear($location_type, $hard = true) {
     if ($hard && !empty(static::$data[$location_type])) {
       // Здесь нельзя делать unset - надо записывать NULL, что бы это отразилось на зависимых записях
-      array_walk(static::$data[$location_type], function (&$item) { $item = null; });
+      array_walk(static::$data[$location_type], function(&$item) { $item = null; });
     }
     static::$locator[$location_type] = array();
     static::$queries[$location_type] = array();
@@ -354,7 +354,7 @@ 
 
     if (!empty($error_msg)) {
       // TODO - Убрать позже
-      print('<h1>СООБЩИТЕ ЭТО АДМИНУ: sn_db_transaction_check() - ' . $error_msg . '</h1>');
+      print('<h1>СООБЩИТЕ ЭТО АДМИНУ: sn_db_transaction_check() - '.$error_msg.'</h1>');
       $backtrace = debug_backtrace();
       array_shift($backtrace);
       pdump($backtrace);
@@ -367,7 +367,7 @@ 
   public static function db_transaction_start($level = '') {
     static::db_transaction_check(null);
 
-    $level ? doquery('SET TRANSACTION ISOLATION LEVEL ' . $level) : false;
+    $level ? doquery('SET TRANSACTION ISOLATION LEVEL '.$level) : false;
 
     static::$transaction_id++;
     doquery('START TRANSACTION');
@@ -427,7 +427,7 @@ 
   public static function db_lock_tables($tables) {
     $tables = is_array($tables) ? $tables : array($tables => '');
     foreach ($tables as $table_name => $condition) {
-      self::$db->doquery("SELECT 1 FROM {{{$table_name}}}" . ($condition ? ' WHERE ' . $condition : ''));
+      self::$db->doquery("SELECT 1 FROM {{{$table_name}}}".($condition ? ' WHERE '.$condition : ''));
     }
   }
 
@@ -481,8 +481,8 @@ 
           $query = static::db_query(
             "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' : ''), false, true);
 
           while ($row = db_fetch($query)) {
@@ -495,13 +495,13 @@ 
           if ($indexes_str = implode(',', $parent_id_list)) {
             $parent_id_field = static::$location_info[$owner_location_type][P_ID];
             static::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 = static::db_query(
-        "SELECT * FROM {{{$location_info[P_TABLE_NAME]}}}" .
+        "SELECT * FROM {{{$location_info[P_TABLE_NAME]}}}".
         (($filter = trim($filter)) ? " WHERE {$filter}" : '')
       );
       while ($row = db_fetch($query)) {
@@ -567,7 +567,7 @@ 
     $condition = trim($condition);
     $table_name = static::$location_info[$location_type][P_TABLE_NAME];
 
-    if ($result = static::db_query("UPDATE {{{$table_name}}} SET " . $set . ($condition ? ' WHERE ' . $condition : ''))) {
+    if ($result = static::db_query("UPDATE {{{$table_name}}} SET ".$set.($condition ? ' WHERE '.$condition : ''))) {
 
       if (static::$db->db_affected_rows()) { // Обновляем данные только если ряд был затронут
         // Поскольку нам неизвестно, что и как обновилось - сбрасываем кэш этого типа полностью
@@ -728,7 +728,7 @@ 
 
       // TODO переписать
       $user = static::db_query(
-        "SELECT * FROM {{users}} WHERE `username` " . ($like ? 'LIKE' : '=') . " '{$username_safe}'"
+        "SELECT * FROM {{users}} WHERE `username` ".($like ? 'LIKE' : '=')." '{$username_safe}'"
         , true);
       static::cache_set(LOC_USER, $user); // В кэш-юзер так же заполнять индексы
     }
@@ -817,7 +817,7 @@ 
 
     $query_cache = &static::$locator[LOC_UNIT][$location_type][$location_id];
     if (!isset($query_cache)) {
-      $got_data = static::db_get_record_list(LOC_UNIT, "unit_location_type = {$location_type} AND unit_location_id = {$location_id} AND " . static::db_unit_time_restrictions());
+      $got_data = static::db_get_record_list(LOC_UNIT, "unit_location_type = {$location_type} AND unit_location_id = {$location_id} AND ".static::db_unit_time_restrictions());
       if (is_array($got_data)) {
         foreach ($got_data as $unit_id => $unit_data) {
           $query_cache[$unit_data['unit_snid']] = &static::$data[LOC_UNIT][$unit_id];
@@ -878,7 +878,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}";
@@ -999,13 +999,13 @@ 
         $condition = "`{$field_name}` = ";
         $value = '';
         if ($field_data['delta']) {
-          $value = "`{$field_name}`" . ($field_data['delta'] >= 0 ? '+' : '') . $field_data['delta'];
+          $value = "`{$field_name}`".($field_data['delta'] >= 0 ? '+' : '').$field_data['delta'];
         } elseif ($field_data['set']) {
           $value = (is_string($field_data['set']) ? "'{$field_data['set']}'" : $field_data['set']);
         }
 
         if ($value) {
-          $fields[] = $condition . $value;
+          $fields[] = $condition.$value;
         }
       }
       $conditions[P_FIELDS_STR] = implode(',', $fields);
@@ -1019,9 +1019,7 @@ 
           // Простое условие - $field_id = $field_value
           if (is_string($field_id)) {
             $field_value =
-              $field_value === null ? 'NULL' :
-                (is_string($field_value) ? "'" . db_escape($field_value) . "'" :
-                  (is_bool($field_value) ? intval($field_value) : $field_value));
+              $field_value === null ? 'NULL' : (is_string($field_value) ? "'".db_escape($field_value)."'" : (is_bool($field_value) ? intval($field_value) : $field_value));
             $the_conditions[] = "`{$field_id}` = {$field_value}";
           } else {
             die('Неподдерживаемый тип условия');
@@ -1048,7 +1046,7 @@ 
         die('Неподдерживаемая операция в classSupernova::db_changeset_condition_compile');
     }
 
-    $conditions[P_QUERY_STR] = $conditions[P_ACTION_STR] . ' ' . $conditions[P_FIELDS_STR] . (' WHERE ' . $conditions[P_WHERE_STR]);
+    $conditions[P_QUERY_STR] = $conditions[P_ACTION_STR].' '.$conditions[P_FIELDS_STR].(' WHERE '.$conditions[P_WHERE_STR]);
   }
 
   public static function db_changeset_apply($db_changeset, $flush_delayed = false) {
@@ -1146,7 +1144,7 @@ 
     ini_get('magic_quotes_sybase') ? die('SN is incompatible with \'magic_quotes_sybase\' turned on. Disable it in php.ini or .htaccess...') : false;
     if (@get_magic_quotes_gpc()) {
       $gpcr = array(&$_GET, &$_POST, &$_COOKIE, &$_REQUEST);
-      array_walk_recursive($gpcr, function (&$value, $key) {
+      array_walk_recursive($gpcr, function(&$value, $key) {
         $value = stripslashes($value);
       });
     }
@@ -1160,7 +1158,7 @@ 
   public static function init_3_load_config_file() {
     $dbsettings = array();
 
-    require(SN_ROOT_PHYSICAL . "config" . DOT_PHP_EX);
+    require(SN_ROOT_PHYSICAL."config".DOT_PHP_EX);
     self::$cache_prefix = !empty($dbsettings['cache_prefix']) ? $dbsettings['cache_prefix'] : $dbsettings['prefix'];
     self::$db_name = $dbsettings['name'];
     self::$sn_secret_word = $dbsettings['secretword'];

Braces +6 added lines, -2 removed lines

@@ -542,7 +542,8 @@ 
     $location_info = &static::$location_info[$location_type];
     $id_field = $location_info[P_ID];
     $table_name = $location_info[P_TABLE_NAME];
-    if ($result = static::db_query($q = "UPDATE {{{$table_name}}} SET {$set} WHERE `{$id_field}` = {$record_id}")) // TODO Как-то вернуть может быть LIMIT 1 ?
+    if ($result = static::db_query($q = "UPDATE {{{$table_name}}} SET {$set} WHERE `{$id_field}` = {$record_id}")) {
+      // TODO Как-то вернуть может быть LIMIT 1 ?
     {
       if (static::$db->db_affected_rows()) {
         // Обновляем данные только если ряд был затронут
@@ -550,6 +551,7 @@ 
 
         // Тут именно так, а не cache_unset - что бы в кэшах автоматически обновилась запись. Будет нужно на будущее
         static::$data[$location_type][$record_id] = null;
+    }
         // Вытаскиваем обновленную запись
         static::db_get_record_by_id($location_type, $record_id);
         static::cache_clear($location_type, false); // Мягкий сброс - только $queries
@@ -589,9 +591,11 @@ 
     $set = trim($set);
     $table_name = static::$location_info[$location_type][P_TABLE_NAME];
     if ($result = static::db_query("INSERT INTO `{{{$table_name}}}` SET {$set}")) {
-      if (static::$db->db_affected_rows()) // Обновляем данные только если ряд был затронут
+      if (static::$db->db_affected_rows()) {
+        // Обновляем данные только если ряд был затронут
       {
         $record_id = db_insert_id();
+      }
         // Вытаскиваем запись целиком, потому что в $set могли быть "данные по умолчанию"
         $result = static::db_get_record_by_id($location_type, $record_id);
         // Очищаем второстепенные кэши - потому что вставленная запись могла повлиять на результаты запросов или локация или еще чего

includes/classes/FleetValidator.php

Spacing +9 added lines, -9 removed lines

@@ -59,7 +59,7 @@ 
 //pdump($checkResult, $condition);
 
       if (is_array($action)) {
-        if(!empty($action[$checkResult])) {
+        if (!empty($action[$checkResult])) {
           $action = $action[$checkResult];
         } else {
           continue;
@@ -882,8 +882,8 @@ 
    */
   protected function checkACSInvited() {
     $playersInvited = !empty($this->fleet->acs['eingeladen']) ? explode(',', $this->fleet->acs['eingeladen']) : array();
-    foreach($playersInvited as $playerId) {
-      if(intval($playerId) == $this->fleet->dbOwnerRow['id']) {
+    foreach ($playersInvited as $playerId) {
+      if (intval($playerId) == $this->fleet->dbOwnerRow['id']) {
         return true;
       }
     }
@@ -970,9 +970,9 @@ 
 
     // Retrieving flying fleets
     $objFleetsBashing = FleetList::dbGetFleetListBashing($user['id'], $this->fleet->dbTargetRow);
-    foreach($objFleetsBashing->_container as $fleetBashing) {
+    foreach ($objFleetsBashing->_container as $fleetBashing) {
       // Checking for ACS - each ACS count only once
-      if($fleetBashing->group_id) {
+      if ($fleetBashing->group_id) {
         $bashing_list["{$user['id']}_{$fleetBashing->group_id}"] = $fleetBashing->time_arrive_to_target;
       } else {
         $bashing_list[] = $fleetBashing->time_arrive_to_target;
@@ -980,12 +980,12 @@ 
     }
 
     // Check for joining to ACS - if there are already fleets in ACS no checks should be done
-    if($this->fleet->mission_type == MT_ACS && $bashing_list["{$user['id']}_{$this->fleet->group_id}"]) {
+    if ($this->fleet->mission_type == MT_ACS && $bashing_list["{$user['id']}_{$this->fleet->group_id}"]) {
       return true;
     }
 
     $query = db_bashing_list_get($user, $this->fleet->dbTargetRow, $time_limit);
-    while($bashing_row = db_fetch($query)) {
+    while ($bashing_row = db_fetch($query)) {
       $bashing_list[] = $bashing_row['bashing_time'];
     }
 
@@ -994,9 +994,9 @@ 
     $last_attack = 0;
     $wave = 0;
     $attack = 1;
-    foreach($bashing_list as &$bash_time) {
+    foreach ($bashing_list as &$bash_time) {
       $attack++;
-      if(
+      if (
         $bash_time - $last_attack > classSupernova::$config->fleet_bashing_interval
         ||
         $attack > classSupernova::$config->fleet_bashing_attacks

includes/classes/UBE/UBEMoonCalculator.php

Spacing +21 added lines, -21 removed lines

@@ -70,7 +70,7 @@ 
 
     $debris_for_moon = $debris->debris_total();
 
-    if(!$debris_for_moon) {
+    if (!$debris_for_moon) {
       return;
     }
 
@@ -78,12 +78,12 @@ 
     $moon_chance = min($debris_for_moon / UBE_MOON_DEBRIS_PER_PERCENT, UBE_MOON_PERCENT_MAX); // TODO Configure
     $moon_chance = $moon_chance >= UBE_MOON_PERCENT_MIN ? $moon_chance : 0;
     $this->create_chance = $moon_chance;
-    if($moon_chance) {
-      if($is_simulator || mt_rand(1, 100) <= $moon_chance) {
+    if ($moon_chance) {
+      if ($is_simulator || mt_rand(1, 100) <= $moon_chance) {
         $this->status = UBE_MOON_CREATE_SUCCESS;
         $this->moon_diameter = round($is_simulator ? $moon_chance * 150 + 1999 : mt_rand($moon_chance * 100 + 1000, $moon_chance * 200 + 2999));
 
-        if($debris_for_moon <= UBE_MOON_DEBRIS_MAX_SPENT) {
+        if ($debris_for_moon <= UBE_MOON_DEBRIS_MAX_SPENT) {
           $debris->_reset();
         } else {
           $moon_debris_left_percent = ($debris_for_moon - UBE_MOON_DEBRIS_MAX_SPENT) / $debris_for_moon;
@@ -102,7 +102,7 @@ 
    */
   protected function moon_destroy_try($reapers) {
     // TODO: $is_simulator
-    if($reapers <= 0) {
+    if ($reapers <= 0) {
       return;
     }
 
@@ -120,8 +120,8 @@ 
    * @version 2016-02-25 23:42:45 41a4.68
    */
   public function calculate_moon(UBE $ube) {
-    if(UBE_MOON_EXISTS == $this->status) {
-      if($ube->mission_type_id == MT_DESTROY && $ube->combat_result == UBE_COMBAT_RESULT_WIN) {
+    if (UBE_MOON_EXISTS == $this->status) {
+      if ($ube->mission_type_id == MT_DESTROY && $ube->combat_result == UBE_COMBAT_RESULT_WIN) {
         $reapers = $ube->fleet_list->ube_calculate_attack_reapers();
         $this->moon_destroy_try($reapers);
       }
@@ -131,12 +131,12 @@ 
   }
 
   public function report_generate_sql() {
-    return "`ube_report_moon` = " . (int)$this->status . ",
-      `ube_report_moon_chance` = " . (int)$this->create_chance . ",
-      `ube_report_moon_size` = " . (float)$this->moon_diameter . ",
-      `ube_report_moon_reapers` = " . (int)$this->reapers_status . ",
-      `ube_report_moon_destroy_chance` = " . (int)$this->destroy_chance . ",
-      `ube_report_moon_reapers_die_chance` = " . (int)$this->reaper_die_chance;
+    return "`ube_report_moon` = ".(int) $this->status.",
+      `ube_report_moon_chance` = " . (int) $this->create_chance.",
+      `ube_report_moon_size` = " . (float) $this->moon_diameter.",
+      `ube_report_moon_reapers` = " . (int) $this->reapers_status.",
+      `ube_report_moon_destroy_chance` = " . (int) $this->destroy_chance.",
+      `ube_report_moon_reapers_die_chance` = " . (int) $this->reaper_die_chance;
   }
 
   public function report_render_moon() {
@@ -166,11 +166,11 @@ 
    * @param $planet_id
    */
   public function db_apply_result($planet_info, $destination_user_id) {
-    if($this->status == UBE_MOON_CREATE_SUCCESS) {
+    if ($this->status == UBE_MOON_CREATE_SUCCESS) {
       $moon_row = uni_create_moon($planet_info[PLANET_GALAXY], $planet_info[PLANET_SYSTEM], $planet_info[PLANET_PLANET], $destination_user_id, $this->moon_diameter, '', false);
       $this->moon_name = $moon_row['name'];
       unset($moon_row);
-    } elseif($this->status == UBE_MOON_DESTROY_SUCCESS) {
+    } elseif ($this->status == UBE_MOON_DESTROY_SUCCESS) {
       DBStaticPlanet::db_planet_delete_by_id($planet_info[PLANET_ID]);
     }
   }
@@ -179,18 +179,18 @@ 
     $classLocale = classLocale::$lang;
 
     $text_defender = '';
-    if($this->status == UBE_MOON_CREATE_SUCCESS) {
+    if ($this->status == UBE_MOON_CREATE_SUCCESS) {
       $text_defender .= "{$classLocale['ube_report_moon_created']} {$this->moon_diameter} {$classLocale['sys_kilometers_short']}<br /><br />";
-    } elseif($this->status == UBE_MOON_CREATE_FAILED) {
+    } elseif ($this->status == UBE_MOON_CREATE_FAILED) {
       $text_defender .= "{$classLocale['ube_report_moon_chance']} {$this->create_chance}%<br /><br />";
     }
 
-    if($ube->mission_type_id == MT_DESTROY) {
-      if($this->reapers_status == UBE_MOON_REAPERS_NONE) {
+    if ($ube->mission_type_id == MT_DESTROY) {
+      if ($this->reapers_status == UBE_MOON_REAPERS_NONE) {
         $text_defender .= classLocale::$lang['ube_report_moon_reapers_none'];
       } else {
         $text_defender .= "{$classLocale['ube_report_moon_reapers_wave']}. {$classLocale['ube_report_moon_reapers_chance']} {$this->destroy_chance}%. ";
-        $text_defender .= classLocale::$lang[$this->status == UBE_MOON_DESTROY_SUCCESS ? 'ube_report_moon_reapers_success' : 'ube_report_moon_reapers_failure'] . "<br />";
+        $text_defender .= classLocale::$lang[$this->status == UBE_MOON_DESTROY_SUCCESS ? 'ube_report_moon_reapers_success' : 'ube_report_moon_reapers_failure']."<br />";
 
         $text_defender .= "{$classLocale['ube_report_moon_reapers_outcome']} {$this->reaper_die_chance}%. ";
         $text_defender .= classLocale::$lang[$this->reapers_status == UBE_MOON_REAPERS_RETURNED ? 'ube_report_moon_reapers_survive' : 'ube_report_moon_reapers_died'];
@@ -215,7 +215,7 @@ 
    * @version 2016-02-25 23:42:45 41a4.68
    */
   public function ubeInitLoadStatis($destination_planet) {
-    if($destination_planet['planet_type'] == PT_MOON || is_array($moon = DBStaticPlanet::db_planet_by_parent($destination_planet['id'], true, '`id`'))) {
+    if ($destination_planet['planet_type'] == PT_MOON || is_array($moon = DBStaticPlanet::db_planet_by_parent($destination_planet['id'], true, '`id`'))) {
       $this->status = UBE_MOON_EXISTS;
       $this->moon_diameter = !empty($moon['planet_type']) && $moon['planet_type'] == PT_MOON ? $moon['diameter'] : $destination_planet['diameter'];
       $this->reapers_status = UBE_MOON_REAPERS_NONE;

includes/includes/upd_helpers.php

Spacing +12 added lines, -12 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 . ': ' . db_error()) : false;
+  !($result = classSupernova::$db->db_sql_query($query)) ? die('Query error for '.$query.': '.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 = 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);
@@ -175,10 +175,10 @@ 
     "SELECT {$fields}
     FROM {{unit}}
     WHERE
-      `unit_location_type` = {$location_type} AND `unit_location_id` = {$location_id} AND " . DBStaticUnit::db_unit_time_restrictions() .
-    ($user_id = intval($user_id) ? " AND `unit_player_id` = {$user_id}" : '') .
-    ($unit_snid = intval($unit_snid) ? " AND `unit_snid` = {$unit_snid}" : '') .
-    " LIMIT 1" .
+      `unit_location_type` = {$location_type} AND `unit_location_id` = {$location_id} AND ".DBStaticUnit::db_unit_time_restrictions().
+    ($user_id = intval($user_id) ? " AND `unit_player_id` = {$user_id}" : '').
+    ($unit_snid = intval($unit_snid) ? " AND `unit_snid` = {$unit_snid}" : '').
+    " LIMIT 1".
     ($for_update ? ' FOR UPDATE' : '')
   ));
 }
@@ -259,7 +259,7 @@ 
     foreach ($table_data as $record_id => $conditions) {
       $where = '';
       if (!empty($conditions['where'])) {
-        $where = 'WHERE ' . implode(' AND ', $conditions['where']);
+        $where = 'WHERE '.implode(' AND ', $conditions['where']);
       }
 
       $fields = array();
@@ -268,12 +268,12 @@ 
           $condition = "`{$field_name}` = ";
           $value = '';
           if ($field_data['delta']) {
-            $value = "`{$field_name}`" . ($field_data['delta'] >= 0 ? '+' : '') . $field_data['delta'];
+            $value = "`{$field_name}`".($field_data['delta'] >= 0 ? '+' : '').$field_data['delta'];
           } elseif ($field_data['set']) {
             $value = (is_string($field_data['set']) ? "'{$field_data['set']}'" : $field_data['set']);
           }
           if ($value) {
-            $fields[] = $condition . $value;
+            $fields[] = $condition.$value;
           }
         }
       }

includes/includes/art_artifact.php

Spacing +2 added lines, -2 removed lines

@@ -13,7 +13,7 @@ 
   $unit_level = $artifact_level_old = mrc_get_level($user, null, $unit_id, true);
   if ($unit_level > 0) {
     $db_changeset = array();
-    switch($unit_id) {
+    switch ($unit_id) {
       case ART_LHC:
       case ART_HOOK_SMALL:
       case ART_HOOK_MEDIUM:
@@ -133,6 +133,6 @@ 
 
   sn_db_transaction_commit();
   message($message, "{$classLocale['tech'][UNIT_ARTIFACTS]} - {$classLocale['tech'][$unit_id]}",
-    ($request_uri = sys_get_param_str_unsafe('REQUEST_URI')) ? $request_uri : ('artifacts' . DOT_PHP_EX . '#' . $unit_id),
+    ($request_uri = sys_get_param_str_unsafe('REQUEST_URI')) ? $request_uri : ('artifacts'.DOT_PHP_EX.'#'.$unit_id),
     5);
 }

includes/classes/DBStaticPlanet.php

Doc Comments +14 added lines

@@ -21,11 +21,19 @@ 
     return empty($result) ? null : $result;
   }
 
+  /**
+   * @param integer $galaxy
+   * @param integer $system
+   * @param integer $planet
+   */
   public static function db_planet_by_gspt_safe($galaxy, $system, $planet, $planet_type, $for_update = false, $fields = '*') {
     return classSupernova::db_get_record_list(LOC_PLANET,
       "{{planets}}.`galaxy` = {$galaxy} AND {{planets}}.`system` = {$system} AND {{planets}}.`planet` = {$planet} AND {{planets}}.`planet_type` = {$planet_type}", true);
   }
 
+  /**
+   * @param integer $planet_type
+   */
   public static function db_planet_by_gspt($galaxy, $system, $planet, $planet_type, $for_update = false, $fields = '*') {
     $galaxy = intval($galaxy);
     $system = intval($system);
@@ -120,6 +128,9 @@ 
       "`id_owner` = '{$user_row['id']}' {$conditions} ORDER BY {$order_by}");
   }
 
+  /**
+   * @param integer $planet_id
+   */
   public static function db_planet_list_by_user_or_planet($user_id, $planet_id) {
     if(!($user_id = idval($user_id)) && !($planet_id = idval($planet_id))) {
       return false;
@@ -138,6 +149,9 @@ 
     return classSupernova::db_upd_record_by_id(LOC_PLANET, $planet_id, $set);
   }
 
+  /**
+   * @param integer $ui_planet_type
+   */
   public static function db_planet_set_by_gspt($ui_galaxy, $ui_system, $ui_planet, $ui_planet_type = PT_ALL, $set) {
     if(!($set = trim($set))) {
       return false;

Spacing +20 added lines, -21 removed lines

@@ -36,11 +36,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);
@@ -61,17 +60,17 @@ 
   }
 
   public static function db_planet_by_parent($parent_id, $for_update = false, $fields = '*') {
-    if(!($parent_id = idval($parent_id))) {
+    if (!($parent_id = idval($parent_id))) {
       return false;
     }
 
     return classSupernova::db_get_record_list(LOC_PLANET,
-      "`parent_planet` = {$parent_id} AND `planet_type` = " . PT_MOON, true);
+      "`parent_planet` = {$parent_id} AND `planet_type` = ".PT_MOON, true);
   }
 
   public static function db_planet_by_id_and_owner($planet_id, $owner_id, $for_update = false, $fields = '*') {
     //if(!($planet_id = intval($planet_id)) || !($owner_id = intval($owner_id))) return false;
-    if(!($planet_id = idval($planet_id)) || !($owner_id = idval($owner_id))) {
+    if (!($planet_id = idval($planet_id)) || !($owner_id = idval($owner_id))) {
       return false;
     }
 
@@ -82,12 +81,12 @@ 
 
   public static function db_planet_list_moon_other($user_id, $this_moon_id) {
     // if(!($user_id = intval($user_id)) || !($this_moon_id = intval($this_moon_id))) return false;
-    if(!($user_id = idval($user_id)) || !($this_moon_id = idval($this_moon_id))) {
+    if (!($user_id = idval($user_id)) || !($this_moon_id = idval($this_moon_id))) {
       return false;
     }
 
     return classSupernova::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) {
@@ -99,7 +98,7 @@ 
   }
 
   public static function db_planet_list_sorted($user_row, $skip_planet_id = false, $field_list = '', $conditions = '') {
-    if(!is_array($user_row)) {
+    if (!is_array($user_row)) {
       return false;
     }
     // $field_list = $field_list != '*' ? "{{planets}}.`id`, `name`, `image`, {{planets}}.`galaxy`, {{planets}}.`system`, {{planets}}.`planet`, `planet_type`{$field_list}" : $field_list;
@@ -113,7 +112,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::db_get_record_list(LOC_PLANET,
@@ -121,7 +120,7 @@ 
   }
 
   public static function db_planet_list_by_user_or_planet($user_id, $planet_id) {
-    if(!($user_id = idval($user_id)) && !($planet_id = idval($planet_id))) {
+    if (!($user_id = idval($user_id)) && !($planet_id = idval($planet_id))) {
       return false;
     }
 
@@ -131,7 +130,7 @@ 
 
   public static function db_planet_set_by_id($planet_id, $set) {
     // if(!($planet_id = intval($planet_id))) return false;
-    if(!($planet_id = idval($planet_id))) {
+    if (!($planet_id = idval($planet_id))) {
       return false;
     }
 
@@ -139,7 +138,7 @@ 
   }
 
   public static function db_planet_set_by_gspt($ui_galaxy, $ui_system, $ui_planet, $ui_planet_type = PT_ALL, $set) {
-    if(!($set = trim($set))) {
+    if (!($set = trim($set))) {
       return false;
     }
 
@@ -153,7 +152,7 @@ 
 
   public static function db_planet_set_by_parent($ui_parent_id, $ss_set) {
     //if(!($si_parent_id = intval($ui_parent_id)) || !($ss_set = trim($ss_set))) return false;
-    if(!($si_parent_id = idval($ui_parent_id)) || !($ss_set = trim($ss_set))) {
+    if (!($si_parent_id = idval($ui_parent_id)) || !($ss_set = trim($ss_set))) {
       return false;
     }
 
@@ -162,7 +161,7 @@ 
 
   public static function db_planet_set_by_owner($ui_owner_id, $ss_set) {
     //if(!($si_owner_id = intval($ui_owner_id)) || !($ss_set = trim($ss_set))) return false;
-    if(!($si_owner_id = idval($ui_owner_id)) || !($ss_set = trim($ss_set))) {
+    if (!($si_owner_id = idval($ui_owner_id)) || !($ss_set = trim($ss_set))) {
       return false;
     }
 
@@ -172,11 +171,11 @@ 
 
   public static function db_planet_delete_by_id($planet_id) {
     // if(!($planet_id = intval($planet_id))) return false;
-    if(!($planet_id = idval($planet_id))) {
+    if (!($planet_id = idval($planet_id))) {
       return false;
     }
     classSupernova::db_del_record_by_id(LOC_PLANET, $planet_id);
-    classSupernova::db_del_record_list(LOC_UNIT, "`unit_location_type` = " . LOC_PLANET . " AND `unit_location_id` = " . $planet_id);
+    classSupernova::db_del_record_list(LOC_UNIT, "`unit_location_type` = ".LOC_PLANET." AND `unit_location_id` = ".$planet_id);
 
     // Очереди очистятся автоматически по FOREIGN KEY
     return true;
@@ -184,11 +183,11 @@ 
 
   public static function db_planet_list_delete_by_owner($ui_owner_id) {
     // if(!($si_owner_id = intval($ui_owner_id))) return false;
-    if(!($si_owner_id = idval($ui_owner_id))) {
+    if (!($si_owner_id = idval($ui_owner_id))) {
       return false;
     }
     classSupernova::db_del_record_list(LOC_PLANET, "`id_owner` = {$si_owner_id}");
-    classSupernova::db_del_record_list(LOC_UNIT, "`unit_location_type` = " . LOC_PLANET . " AND `unit_player_id` = " . $si_owner_id);
+    classSupernova::db_del_record_list(LOC_UNIT, "`unit_location_type` = ".LOC_PLANET." AND `unit_player_id` = ".$si_owner_id);
 
     // Очереди очистятся автоматически по FOREIGN KEY
     return true;

includes/classes/DBStaticUnit.php

Doc Comments +6 added lines

@@ -56,6 +56,9 @@ 
     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 . ");");
   }
 
+  /**
+   * @param string $set
+   */
   public static function db_unit_set_by_id($unit_id, $set) {
     return classSupernova::db_upd_record_by_id(LOC_UNIT, $unit_id, $set);
   }
@@ -69,6 +72,9 @@ 
     return classSupernova::db_ins_record(LOC_UNIT, $set);
   }
 
+  /**
+   * @param integer $unit_location_type
+   */
   public static function db_unit_list_delete($user_id = 0, $unit_location_type, $unit_location_id, $unit_snid = 0) {
     return classSupernova::db_del_record_list(LOC_UNIT,
       "`unit_location_type` = {$unit_location_type} AND `unit_location_id` = {$unit_location_id}" .

Spacing +13 added lines, -13 removed lines

@@ -21,13 +21,13 @@ 
 
   public static function db_unit_count_by_user_and_type_and_snid($user_id, $unit_type = 0, $unit_snid = 0) {
     $query = doquery(
-      "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();
-    while($row = db_fetch($query)) {
+    while ($row = db_fetch($query)) {
       $result[$row['unit_snid']] = $row;
     }
 
@@ -43,8 +43,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' : '')
       , true);
   }
@@ -53,7 +53,7 @@ 
   public static function db_unit_list_laboratories($user_id) {
     return doquery("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) {
@@ -71,8 +71,8 @@ 
 
   public static function db_unit_list_delete($user_id = 0, $unit_location_type, $unit_location_id, $unit_snid = 0) {
     return classSupernova::db_del_record_list(LOC_UNIT,
-      "`unit_location_type` = {$unit_location_type} AND `unit_location_id` = {$unit_location_id}" .
-      ($user_id = idval($user_id) ? " AND `unit_player_id` = {$user_id}" : '') .
+      "`unit_location_type` = {$unit_location_type} 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}" : ''));
   }
 
@@ -80,7 +80,7 @@ 
     return doquery(
       "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"
     );
   }
@@ -92,15 +92,15 @@ 
 
 
   public static function db_unit_list_admin_delete_mercenaries_finished() {
-    return doquery("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 doquery("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 doquery(
       "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
     );
   }

includes/classes/DBStaticAlly.php

Doc Comments +1 added lines, -1 removed lines

@@ -293,7 +293,7 @@
   }
 
   /**
-   * @param $ranklist
+   * @param string $ranklist
    * @param $user
    */
   public static function db_ally_update_ranklist($ranklist, $user) {

Spacing +5 added lines, -5 removed lines

@@ -66,9 +66,9 @@ 
     `ally_name` = '{$ally_name}',
     `ally_tag` = '{$ally_tag}',
     `ally_owner` = '{$user['id']}',
-    `ally_owner_range` = '" . classLocale::$lang['ali_leaderRank'] . "',
+    `ally_owner_range` = '".classLocale::$lang['ali_leaderRank']."',
     `ally_members` = 1,
-    `ranklist` = '" . classLocale::$lang['ali_defaultRankName'] . ",0,0,0,0,0',
+    `ranklist` = '" . classLocale::$lang['ali_defaultRankName'].",0,0,0,0,0',
     `ally_register_time`= " . SN_TIME_NOW
     );
   }
@@ -87,7 +87,7 @@ 
    * @param $POST_text
    */
   public static function db_ally_request_insert($user, $id_ally, $POST_text) {
-    doquery("INSERT INTO {{alliance_requests}} SET `id_user` = {$user['id']}, `id_ally`='{$id_ally}', request_text ='{$POST_text}', request_time=" . SN_TIME_NOW . ";");
+    doquery("INSERT INTO {{alliance_requests}} SET `id_user` = {$user['id']}, `id_ally`='{$id_ally}', request_text ='{$POST_text}', request_time=".SN_TIME_NOW.";");
   }
 
   /**
@@ -137,7 +137,7 @@ 
    * @param $ally
    */
   public static function db_ally_update_by_changeset($ally_changeset, $ally) {
-    doquery("UPDATE {{alliance}} SET " . implode(',', $ally_changeset) . " WHERE `id`='{$ally['id']}' LIMIT 1;");
+    doquery("UPDATE {{alliance}} SET ".implode(',', $ally_changeset)." WHERE `id`='{$ally['id']}' LIMIT 1;");
   }
 
   /**
@@ -248,7 +248,7 @@ 
    * @param $d
    */
   public static function db_ally_request_deny($d) {
-    doquery("UPDATE {{alliance_requests}} SET `request_denied` = 1, `request_text` = '" . classLocale::$lang['ali_req_deny_reason'] . "' WHERE `id_user`= {$d} LIMIT 1;");
+    doquery("UPDATE {{alliance_requests}} SET `request_denied` = 1, `request_text` = '".classLocale::$lang['ali_req_deny_reason']."' WHERE `id_user`= {$d} LIMIT 1;");
   }
 
   /**