supernova-ws / SuperNova

includes/classes/Player.php

Spacing +2 added lines, -2 removed lines

@@ -229,8 +229,8 @@
   public function calcColonyMaxCount($astrotech = -1) {
     global $config;
 
-    if($astrotech == -1) {
-      if(!isset($this->db_row[UNIT_PLAYER_COLONIES_MAX])) {
+    if ($astrotech == -1) {
+      if (!isset($this->db_row[UNIT_PLAYER_COLONIES_MAX])) {
 
         $expeditions = get_player_max_expeditons($this->db_row);
         $astrotech = mrc_get_level($this->db_row, false, TECH_ASTROTECH);

includes/classes/PlayerList.php

Spacing +1 added lines, -1 removed lines

@@ -23,7 +23,7 @@
    * @version 41a6.16
    */
   protected function db_load_player_by_id($player_id) {
-    if(isset($this[$player_id])) {
+    if (isset($this[$player_id])) {
       return;
     }
 

includes/classes/db_mysql_v5.php

Spacing +3 added lines, -3 removed lines

@@ -30,11 +30,11 @@ 
 
     static $need_keys = array('server', 'user', 'pass', 'name', 'prefix');
 
-    if($this->connected) {
+    if ($this->connected) {
       return true;
     }
 
-    if(empty($settings) || !is_array($settings) || array_intersect($need_keys, array_keys($settings)) != $need_keys) {
+    if (empty($settings) || !is_array($settings) || array_intersect($need_keys, array_keys($settings)) != $need_keys) {
       $debug->error_fatal('There is missconfiguration in your config.php. Check it again');
     }
 
@@ -90,7 +90,7 @@ 
     return mysqli_real_escape_string($this->link, $unescaped_string);
   }
   function mysql_close_link() {
-    if(is_object($this->link)) {
+    if (is_object($this->link)) {
       $this->link->close();
       $this->connected = false;
       unset($this->link);

blitz_register.php

Spacing +26 added lines, -26 removed lines

@@ -2,12 +2,12 @@ 
 
 include('common.' . substr(strrchr(__FILE__, '.'), 1));
 
-if($user['authlevel'] < AUTH_LEVEL_DEVELOPER) {
+if ($user['authlevel'] < AUTH_LEVEL_DEVELOPER) {
   $error_message = $config->game_mode == GAME_BLITZ ? 'sys_blitz_page_disabled' : (
   !$config->game_blitz_register ? 'sys_blitz_registration_disabled' : ''
   );
 
-  if($error_message) {
+  if ($error_message) {
     message($lang[$error_message], $lang['sys_error'], 'overview.php', 10);
     die();
   }
@@ -26,16 +26,16 @@ 
 $current_round = intval($config->db_loadItem('game_blitz_register_round'));
 $current_price = intval($config->db_loadItem('game_blitz_register_price'));
 
-if($config->db_loadItem('game_blitz_register') == BLITZ_REGISTER_OPEN && (sys_get_param_str('register_me') || sys_get_param_str('register_me_not'))) {
+if ($config->db_loadItem('game_blitz_register') == BLITZ_REGISTER_OPEN && (sys_get_param_str('register_me') || sys_get_param_str('register_me_not'))) {
   sn_db_transaction_start();
   $user = db_user_by_id($user['id'], true);
   $is_registered = db_blitz_reg_get_id_by_player_and_round($user, $current_round);
-  if(sys_get_param_str('register_me')) {
-    if(empty($is_registered) && mrc_get_level($user, null, RES_METAMATTER) >= $current_price) {
+  if (sys_get_param_str('register_me')) {
+    if (empty($is_registered) && mrc_get_level($user, null, RES_METAMATTER) >= $current_price) {
       db_blitz_reg_insert($user, $current_round);
       classSupernova::$auth->account->metamatter_change(RPG_BLITZ_REGISTRATION, -$current_price, "Регистрация в раунде {$current_round} Блица");
     }
-  } elseif(sys_get_param_str('register_me_not') && !empty($is_registered)) {
+  } elseif (sys_get_param_str('register_me_not') && !empty($is_registered)) {
     db_blitz_reg_delete($user, $current_round);
     classSupernova::$auth->account->metamatter_change(RPG_BLITZ_REGISTRATION_CANCEL, $current_price, "Отмена регистрации в раунде {$current_round} Блица");
   }
@@ -50,17 +50,17 @@ 
 $blitz_players = 0;
 $blitz_prize_dark_matter = 0;
 $blitz_prize_places = 0;
-if($user['authlevel'] >= AUTH_LEVEL_DEVELOPER) {
-  if(sys_get_param_str('generate')) {
+if ($user['authlevel'] >= AUTH_LEVEL_DEVELOPER) {
+  if (sys_get_param_str('generate')) {
     $next_id = 0;
     $query = db_blitz_reg_get_random_id($current_round);
-    while($row = db_fetch($query)) {
+    while ($row = db_fetch($query)) {
       $next_id++;
       $blitz_name = 'Игрок' . $next_id;
       $blitz_password = sys_random_string(8);
       db_blitz_reg_update_with_name_and_password($blitz_name, $blitz_password, $row, $current_round);
     }
-  } elseif(sys_get_param_str('import_generated')) {
+  } elseif (sys_get_param_str('import_generated')) {
     // ЭТО НА БЛИЦЕ!!!
     db_player_list_blitz_delete_players();
     db_planets_purge();
@@ -82,7 +82,7 @@ 
     $system = $system_step;
     $planet = round($config->game_maxPlanet / 2);
 
-    foreach($imported_string as &$string_data) {
+    foreach ($imported_string as &$string_data) {
       $string_data = explode(',', $string_data);
       $username_safe = $string_data[0];
 
@@ -102,7 +102,7 @@ 
 
       $moon_row = uni_create_moon($galaxy, $system, $planet, $user_new['id'], 30, '', false);
 
-      if(($system += $system_step) >= $config->game_maxSystem) {
+      if (($system += $system_step) >= $config->game_maxSystem) {
         $galaxy++;
         $system = $system_step;
       }
@@ -112,13 +112,13 @@ 
     $config->db_saveItem('users_amount', $config->users_amount + $new_players);
     // pdump($imported_string);
     // generated_string
-  } elseif(sys_get_param_str('import_result') && ($blitz_result_string = sys_get_param_str('blitz_result_string'))) {
+  } elseif (sys_get_param_str('import_result') && ($blitz_result_string = sys_get_param_str('blitz_result_string'))) {
     $blitz_result = explode(';', $blitz_result_string);
     $blitz_last_update = $blitz_result[0]; // Пока не используется
     unset($blitz_result[0]);
-    foreach($blitz_result as $blitz_result_data) {
+    foreach ($blitz_result as $blitz_result_data) {
       $blitz_result_data = explode(',', $blitz_result_data);
-      if(count($blitz_result_data) == 5) {
+      if (count($blitz_result_data) == 5) {
         $blitz_result_data[1] = db_escape($blitz_result_data[1]);
         db_blitz_reg_update_results($blitz_result_data, $current_round);
       }
@@ -126,15 +126,15 @@ 
     $blitz_result = array();
   }
 
-  if($config->game_mode == GAME_BLITZ) {
+  if ($config->game_mode == GAME_BLITZ) {
     $blitz_result = array($config->db_loadItem('var_stat_update'));
     $query = db_player_list_export_blitz_info();
-    while($row = db_fetch($query)) {
+    while ($row = db_fetch($query)) {
       $blitz_result[] = "{$row['id']},{$row['username']},{$row['onlinetime']},{$row['total_rank']},{$row['total_points']}";
     }
   } else {
     $query = db_blitz_reg_get_player_list($current_round);
-    while($row = db_fetch($query)) {
+    while ($row = db_fetch($query)) {
       $blitz_generated[] = "{$row['blitz_name']},{$row['blitz_password']}";
       $row['blitz_online'] ? $blitz_prize_players_active++ : false;
       $blitz_players++;
@@ -142,13 +142,13 @@ 
     $blitz_prize_dark_matter = $blitz_prize_players_active * 20000;
     $blitz_prize_places = ceil($blitz_prize_players_active / 5);
 
-    if(sys_get_param_str('prize_calculate') && $blitz_prize_players_active && ($blitz_prize_dark_matter_actual = sys_get_param_int('blitz_prize_dark_matter'))) {
+    if (sys_get_param_str('prize_calculate') && $blitz_prize_players_active && ($blitz_prize_dark_matter_actual = sys_get_param_int('blitz_prize_dark_matter'))) {
       // $blitz_prize_dark_matter_actual = sys_get_param_int('blitz_prize_dark_matter');
       $blitz_prize_places_actual = sys_get_param_int('blitz_prize_places');
       sn_db_transaction_start();
       $query = db_blitz_reg_get_player_list_order_by_place($current_round);
-      while($row = db_fetch($query)) {
-        if(!$row['blitz_place']) {
+      while ($row = db_fetch($query)) {
+        if (!$row['blitz_place']) {
           continue;
         }
 
@@ -157,14 +157,14 @@ 
 
         $reward = $blitz_prize_dark_matter_actual - $row['blitz_reward_dark_matter'];
         pdump("{{$row['id']}} {$row['blitz_name']}, Place {$row['blitz_place']}, Prize places {$blitz_prize_places_actual}, Prize {$reward}", $row['id']);
-        if($reward) {
+        if ($reward) {
           rpg_points_change($row['user_id'], RPG_BLITZ, $reward, sprintf(
             $lang['sys_blitz_reward_log_message'], $row['blitz_place'], $row['blitz_name']
           ));
           db_blitz_reg_update_apply_results($reward, $row, $current_round);
         }
 
-        if(!$blitz_prize_places_actual || $blitz_prize_dark_matter_actual < 1000) {
+        if (!$blitz_prize_places_actual || $blitz_prize_dark_matter_actual < 1000) {
           break;
         }
       }
@@ -179,12 +179,12 @@ 
 
 $player_registered = false;
 $query = db_blitz_reg_get_player_list_and_users($current_round);
-while($row = db_fetch($query)) {
+while ($row = db_fetch($query)) {
   $tpl_player_data = array(
     'NAME' => player_nick_render_to_html($row, array('icons' => true, 'color' => true, 'ally' => true)),
   );
 
-  if($config->game_blitz_register == BLITZ_REGISTER_DISCLOSURE_NAMES) {
+  if ($config->game_blitz_register == BLITZ_REGISTER_DISCLOSURE_NAMES) {
     // Вот так хитро, что бы не было не единого шанса попадания на страницу данных об игроках Блиц-сервера до закрытия раунда
     $tpl_player_data = array_merge($tpl_player_data, array(
       'ID'                       => $row['id'],
@@ -197,7 +197,7 @@ 
   }
 
   $template->assign_block_vars('registrations', $tpl_player_data);
-  if($row['id'] == $user['id']) {
+  if ($row['id'] == $user['id']) {
     $player_registered = $row;
   }
 }

includes/init_secondary.php

Spacing +17 added lines, -17 removed lines

@@ -1,18 +1,18 @@ 
 <?php
 
-if($config->server_updater_check_auto && $config->server_updater_check_last + $config->server_updater_check_period <= SN_TIME_NOW) {
+if ($config->server_updater_check_auto && $config->server_updater_check_last + $config->server_updater_check_period <= SN_TIME_NOW) {
   include(SN_ROOT_PHYSICAL . 'ajax_version_check' . DOT_PHP_EX);
 }
 
-if($config->user_birthday_gift && SN_TIME_NOW - $config->user_birthday_celebrate > PERIOD_DAY) {
+if ($config->user_birthday_gift && SN_TIME_NOW - $config->user_birthday_celebrate > PERIOD_DAY) {
   require_once(SN_ROOT_PHYSICAL . "includes/includes/user_birthday_celebrate" . DOT_PHP_EX);
   sn_user_birthday_celebrate();
 }
 
-if(!$config->var_online_user_count || $config->var_online_user_time + 30 < SN_TIME_NOW) {
+if (!$config->var_online_user_count || $config->var_online_user_time + 30 < SN_TIME_NOW) {
   $config->db_saveItem('var_online_user_count', db_user_count(true));
   $config->db_saveItem('var_online_user_time', SN_TIME_NOW);
-  if($config->server_log_online) {
+  if ($config->server_log_online) {
     db_log_online_insert();
   }
 }
@@ -42,7 +42,7 @@ 
 $template_result[F_ACCOUNT_IS_AUTHORIZED] = $sys_user_logged_in = !empty($user) && isset($user['id']) && $user['id'];
 //pdump($template_result[F_ACCOUNT_IS_AUTHORIZED]);die();
 
-if(!empty($user['id'])) {
+if (!empty($user['id'])) {
   classSupernova::$user_options->user_change($user['id']);
 }
 
@@ -55,15 +55,15 @@ 
     : false
   );
 
-if($template_result[F_LOGIN_STATUS] == LOGIN_ERROR_USERNAME_RESTRICTED_CHARACTERS) {
-  $prohibited_characters = array_map(function ($value) {
+if ($template_result[F_LOGIN_STATUS] == LOGIN_ERROR_USERNAME_RESTRICTED_CHARACTERS) {
+  $prohibited_characters = array_map(function($value) {
     return "'" . htmlentities($value, ENT_QUOTES, 'UTF-8') . "'";
   }, str_split(LOGIN_REGISTER_CHARACTERS_PROHIBITED));
   $template_result[F_LOGIN_MESSAGE] .= implode(', ', $prohibited_characters);
 }
 
 
-if(defined('DEBUG_AUTH') && DEBUG_AUTH && !defined('IN_AJAX')) {
+if (defined('DEBUG_AUTH') && DEBUG_AUTH && !defined('IN_AJAX')) {
   pdump("Отключи отладку перед продакшном!");
 }
 
@@ -77,17 +77,17 @@ 
   ? define('INSTALL_MODE', GAME_DISABLE_INSTALL)
   : false;
 
-if($template_result[F_GAME_DISABLE] = $config->game_disable) {
+if ($template_result[F_GAME_DISABLE] = $config->game_disable) {
   $template_result[F_GAME_DISABLE_REASON] = sys_bbcodeParse(
     $config->game_disable == GAME_DISABLE_REASON
       ? $config->game_disable_reason
       : $lang['sys_game_disable_reason'][$config->game_disable]
   );
-  if(defined('IN_API')) {
+  if (defined('IN_API')) {
     return;
   }
 
-  if(
+  if (
     ($user['authlevel'] < 1 || !(defined('IN_ADMIN') && IN_ADMIN))
     &&
     !(defined('INSTALL_MODE') && defined('LOGIN_LOGOUT'))
@@ -100,8 +100,8 @@ 
 
 // TODO ban
 // TODO $skip_ban_check
-if($template_result[F_BANNED_STATUS] && !$skip_ban_check) {
-  if(defined('IN_API')) {
+if ($template_result[F_BANNED_STATUS] && !$skip_ban_check) {
+  if (defined('IN_API')) {
     return;
   }
 
@@ -119,13 +119,13 @@ 
 // pdump($allow_anonymous, '$allow_anonymous');
 // pdump($sys_user_logged_in, '$sys_user_logged_in');
 
-if($sys_user_logged_in && INITIAL_PAGE == 'login') {
+if ($sys_user_logged_in && INITIAL_PAGE == 'login') {
   sys_redirect(SN_ROOT_VIRTUAL . 'overview.php');
-} elseif($account_logged_in && !$sys_user_logged_in) { // empty(core_auth::$user['id'])
+} elseif ($account_logged_in && !$sys_user_logged_in) { // empty(core_auth::$user['id'])
 //  pdump($sn_page_name);
 //  pdump(INITIAL_PAGE);
 //  die('{Тут должна быть ваша реклама. Точнее - ввод имени игрока}');
-} elseif(!$allow_anonymous && !$sys_user_logged_in) {
+} elseif (!$allow_anonymous && !$sys_user_logged_in) {
   // sn_setcookie(SN_COOKIE, '', time() - PERIOD_WEEK, SN_ROOT_RELATIVE);
   sys_redirect(SN_ROOT_VIRTUAL . 'login.php');
 }
@@ -146,7 +146,7 @@ 
 
 global $skip_fleet_update;
 $skip_fleet_update = $skip_fleet_update || $supernova->options['fleet_update_skip'] || defined('IN_ADMIN');
-if(
+if (
   !$skip_fleet_update
   && !(defined('IN_AJAX') && IN_AJAX === true)
   && SN_TIME_NOW - strtotime($config->fleet_update_last) > $config->fleet_update_interval

includes/classes/Unit.php

Spacing +5 added lines, -5 removed lines

@@ -154,15 +154,15 @@ 
    * @param string $group_name
    */
   public static function _init($group_name = '') {
-    if(static::$_is_static_init) {
+    if (static::$_is_static_init) {
       return;
     }
 
-    if($group_name) {
+    if ($group_name) {
       static::$_sn_group_name = $group_name;
     }
 
-    if(static::$_sn_group_name) {
+    if (static::$_sn_group_name) {
       static::$_group_unit_id_list = sn_get_groups(static::$_sn_group_name);
       empty(static::$_group_unit_id_list) ? static::$_group_unit_id_list = array() : false;
     }
@@ -187,7 +187,7 @@ 
     // TODO - Reset combat stats??
     $this->_unitId = $unitId;
 
-    if($this->_unitId) {
+    if ($this->_unitId) {
       $this->info = get_unit_param($this->_unitId);
       $this->_type = $this->info[P_UNIT_TYPE];
     } else {
@@ -198,7 +198,7 @@ 
 
   protected function setCount($value) {
     // TODO - Reset combat stats??
-    if($value < 0) {
+    if ($value < 0) {
       classSupernova::$debug->error('Can not set Unit::$count to negative value');
     }
     $this->_count = $value;

includes/classes/DBRow.php

Spacing +34 added lines, -34 removed lines

@@ -131,14 +131,14 @@ 
 
     // If method is not getter or setter OR property name not exists in $_properties - raising exception
     // Descendants can catch this Exception to make own __call magic
-    if(($left3 != 'get' && $left3 != 'set') || empty(static::$_properties[$propertyName])) {
+    if (($left3 != 'get' && $left3 != 'set') || empty(static::$_properties[$propertyName])) {
       throw new ExceptionPropertyNotExists('Property ' . $propertyName . ' not exists when calling getter/setter ' . get_called_class() . '::' . $name, ERR_ERROR);
     }
 
     // TODO check for read-only
 
-    if($left3 == 'set') {
-      if(!empty($this->propertiesAdjusted[$propertyName])) {
+    if ($left3 == 'set') {
+      if (!empty($this->propertiesAdjusted[$propertyName])) {
         throw new PropertyAccessException('Property ' . $propertyName . ' already was adjusted so no SET is possible until dbSave in ' . get_called_class() . '::' . $name, ERR_ERROR);
       }
       $this->propertiesChanged[$propertyName] = 1;
@@ -147,13 +147,13 @@ 
     // Now deciding - will we call a protected setter or will we work with protected property
 
     // If method exists - just calling it
-    if(method_exists($this, $name)) {
+    if (method_exists($this, $name)) {
       return call_user_func_array(array($this, $name), $arguments);
     }
     // No getter/setter exists - works directly with protected property
 
     // Is it getter?
-    if($left3 === 'get') {
+    if ($left3 === 'get') {
       return $this->{'_' . $propertyName};
     }
 
@@ -174,14 +174,14 @@ 
 //    $this->_reset();
 
     $dbId = idval($dbId);
-    if($dbId <= 0) {
+    if ($dbId <= 0) {
       classSupernova::$debug->error(get_called_class() . '::dbLoad $dbId not positive = ' . $dbId);
 
       return;
     }
 
     $db_row = doquery("SELECT * FROM `{{" . static::$_table . "}}` WHERE `" . static::$_dbIdFieldName . "` = " . $dbId . " LIMIT 1 FOR UPDATE;", true);
-    if(empty($db_row)) {
+    if (empty($db_row)) {
       return;
     }
 
@@ -197,26 +197,26 @@ 
    */
   // TODO - perform operations only if properties was changed
   public function dbSave() {
-    if($this->isNew()) {
+    if ($this->isNew()) {
       // No DB_ID - new unit
-      if($this->isEmpty()) {
+      if ($this->isEmpty()) {
         classSupernova::$debug->error(__FILE__ . ':' . __LINE__ . ' - object is empty on ' . get_called_class() . '::dbSave');
       }
       $this->dbInsert();
     } else {
       // DB_ID is present
-      if($this->isEmpty()) {
+      if ($this->isEmpty()) {
         $this->dbDelete();
       } else {
-        if(!sn_db_transaction_check(false)) {
+        if (!sn_db_transaction_check(false)) {
           classSupernova::$debug->error(__FILE__ . ':' . __LINE__ . ' - transaction should always be started on ' . get_called_class() . '::dbUpdate');
         }
         $this->dbUpdate();
       }
     }
 
-    if(!empty($this->triggerDbOperationOn)) {
-      foreach($this->triggerDbOperationOn as $item) {
+    if (!empty($this->triggerDbOperationOn)) {
+      foreach ($this->triggerDbOperationOn as $item) {
         $item->dbSave();
       }
     }
@@ -235,12 +235,12 @@ 
    * @return int|string
    */
   public function dbInsert() {
-    if(!$this->isNew()) {
+    if (!$this->isNew()) {
       classSupernova::$debug->error(__FILE__ . ':' . __LINE__ . ' - record db_id is not empty on ' . get_called_class() . '::dbInsert');
     }
     $this->_dbId = $this->db_field_set_create($this->dbMakeFieldSet());
 
-    if(empty($this->_dbId)) {
+    if (empty($this->_dbId)) {
       classSupernova::$debug->error(__FILE__ . ':' . __LINE__ . ' - error saving record ' . get_called_class() . '::dbInsert');
     }
 
@@ -252,7 +252,7 @@ 
    */
   public function dbUpdate() {
     // TODO - Update
-    if($this->isNew()) {
+    if ($this->isNew()) {
       classSupernova::$debug->error(__FILE__ . ':' . __LINE__ . ' - unit db_id is empty on dbUpdate');
     }
     $this->db_field_update($this->dbMakeFieldSet(true));
@@ -262,7 +262,7 @@ 
    * Deletes record from DB
    */
   public function dbDelete() {
-    if($this->isNew()) {
+    if ($this->isNew()) {
       classSupernova::$debug->error(__FILE__ . ':' . __LINE__ . ' - unit db_id is empty on dbDelete');
     }
     doquery("DELETE FROM {{" . static::$_table . "}} WHERE `" . static::$_dbIdFieldName . "` = " . $this->_dbId);
@@ -304,18 +304,18 @@ 
    * @param array $db_row
    */
   public function dbRowParse(array $db_row) {
-    foreach(static::$_properties as $property_name => &$property_data) {
+    foreach (static::$_properties as $property_name => &$property_data) {
       // Advanced values extraction procedure. Should be used when at least one of following rules is matched:
       // - one field should translate to several properties;
       // - one property should be filled according to several fields;
       // - property filling requires some lookup in object values;
-      if(!empty($property_data[P_METHOD_EXTRACT]) && is_callable(array($this, $property_data[P_METHOD_EXTRACT]))) {
+      if (!empty($property_data[P_METHOD_EXTRACT]) && is_callable(array($this, $property_data[P_METHOD_EXTRACT]))) {
         call_user_func_array(array($this, $property_data[P_METHOD_EXTRACT]), array(&$db_row));
         continue;
       }
 
       // If property is read-only - doing nothing
-      if(!empty($property_data[P_READ_ONLY])) {
+      if (!empty($property_data[P_READ_ONLY])) {
         continue;
       }
 
@@ -326,7 +326,7 @@ 
       !empty($property_data[P_FUNC_INPUT]) && is_callable($property_data[P_FUNC_INPUT]) ? $value = call_user_func($property_data[P_FUNC_INPUT], $value) : false;
 
       // If there is setter for this field - using it. Setters is always a methods of $THIS
-      if(!empty($property_data[P_METHOD_SET]) && is_callable(array($this, $property_data[P_METHOD_SET]))) {
+      if (!empty($property_data[P_METHOD_SET]) && is_callable(array($this, $property_data[P_METHOD_SET]))) {
         call_user_func(array($this, $property_data[P_METHOD_SET]), $value);
       } else {
         $this->{$property_name} = $value;
@@ -342,21 +342,21 @@ 
   protected function dbMakeFieldSet($isUpdate = false) {
     $array = array();
 
-    foreach(static::$_properties as $property_name => &$property_data) {
+    foreach (static::$_properties as $property_name => &$property_data) {
       // TODO - on isUpdate add only changed/adjusted properties
 
-      if(!empty($property_data[P_METHOD_INJECT]) && is_callable(array($this, $property_data[P_METHOD_INJECT]))) {
+      if (!empty($property_data[P_METHOD_INJECT]) && is_callable(array($this, $property_data[P_METHOD_INJECT]))) {
         call_user_func_array(array($this, $property_data[P_METHOD_INJECT]), array(&$array));
         continue;
       }
 
       // Skipping properties which have no corresponding field in DB
-      if(empty($property_data[P_DB_FIELD])) {
+      if (empty($property_data[P_DB_FIELD])) {
         continue;
       }
 
       // Checking - is property was adjusted or changed
-      if($isUpdate && array_key_exists($property_name, $this->propertiesAdjusted)) {
+      if ($isUpdate && array_key_exists($property_name, $this->propertiesAdjusted)) {
         // For adjusted property - take value from propertiesAdjusted array
         // TODO - differ how treated conversion to string for changed and adjusted properties
         $value = $this->propertiesAdjusted[$property_name];
@@ -386,17 +386,17 @@ 
    */
   protected function isFieldChanged($fieldName) {
     $isFieldChanged = false;
-    foreach($this->propertiesChanged as $propertyName => $cork) {
+    foreach ($this->propertiesChanged as $propertyName => $cork) {
       $propertyScheme = static::$_properties[$propertyName];
-      if(!empty($propertyScheme[P_DB_FIELDS_LINKED])) {
-        foreach($propertyScheme[P_DB_FIELDS_LINKED] as $linkedFieldName) {
-          if($linkedFieldName == $fieldName) {
+      if (!empty($propertyScheme[P_DB_FIELDS_LINKED])) {
+        foreach ($propertyScheme[P_DB_FIELDS_LINKED] as $linkedFieldName) {
+          if ($linkedFieldName == $fieldName) {
             $isFieldChanged = $propertyName;
             break 2;
           }
         }
       }
-      if(!empty($propertyScheme[P_DB_FIELD]) && $propertyScheme[P_DB_FIELD] == $fieldName) {
+      if (!empty($propertyScheme[P_DB_FIELD]) && $propertyScheme[P_DB_FIELD] == $fieldName) {
         $isFieldChanged = $propertyName;
         break;
       }
@@ -418,7 +418,7 @@ 
     $fields = implode(',', array_keys($field_set));
 
     $result = 0;
-    if(classSupernova::db_query("INSERT INTO `{{" . static::$_table . "}}` ({$fields}) VALUES ({$values});")) {
+    if (classSupernova::db_query("INSERT INTO `{{" . static::$_table . "}}` ({$fields}) VALUES ({$values});")) {
       $result = db_insert_id();
     }
 
@@ -436,13 +436,13 @@ 
     sn_db_field_set_safe_flag_clear($field_set);
 
     $set = array();
-    foreach($field_set as $fieldName => $value) {
-      if(!($changedProperty = $this->isFieldChanged($fieldName))) {
+    foreach ($field_set as $fieldName => $value) {
+      if (!($changedProperty = $this->isFieldChanged($fieldName))) {
         continue;
       }
 
       // TODO - separate sets from adjusts
-      if(array_key_exists($changedProperty, $this->propertiesAdjusted)) {
+      if (array_key_exists($changedProperty, $this->propertiesAdjusted)) {
         $value = "`{$fieldName}` + ($value)"; // braces for negative values
       }
 

Doc Comments +1 added lines, -1 removed lines

@@ -411,7 +411,7 @@
   /**
    * @param array $field_set
    *
-   * @return int|string
+   * @return integer
    */
   protected function db_field_set_create(array $field_set) {
     !sn_db_field_set_is_safe($field_set) ? $field_set = sn_db_field_set_make_safe($field_set) : false;

includes/includes/flt_flying_fleet_handler2.php

Spacing +22 added lines, -26 removed lines

@@ -38,15 +38,11 @@ 
 // ------------------------------------------------------------------
 function flt_flyingFleetsSort($a, $b) {
   // Сравниваем время флотов - кто раньше, тот и первый обрабатывается
-  return $a['fleet_time'] > $b['fleet_time'] ? 1 : ($a['fleet_time'] < $b['fleet_time'] ? -1 :
-    // Если время - одинаковое, сравниваем события флотов
+  return $a['fleet_time'] > $b['fleet_time'] ? 1 : ($a['fleet_time'] < $b['fleet_time'] ? -1 : // Если время - одинаковое, сравниваем события флотов
     // Если события - одинаковые, то флоты равны
-    ($a['fleet_event'] == $b['fleet_event'] ? 0 :
-      // Если события разные - первыми считаем прибывающие флоты
-      ($a['fleet_event'] == EVENT_FLT_ARRIVE ? 1 : ($b['fleet_event'] == EVENT_FLT_ARRIVE ? -1 :
-        // Если нет прибывающих флотов - дальше считаем флоты, которые закончили миссию
-        ($a['fleet_event'] == EVENT_FLT_ACOMPLISH ? 1 : ($b['fleet_event'] == EVENT_FLT_ACOMPLISH ? -1 :
-          // Если нет флотов, закончивших задание - остались возвращающиеся флоты, которые равны между собой
+    ($a['fleet_event'] == $b['fleet_event'] ? 0 : // Если события разные - первыми считаем прибывающие флоты
+      ($a['fleet_event'] == EVENT_FLT_ARRIVE ? 1 : ($b['fleet_event'] == EVENT_FLT_ARRIVE ? -1 : // Если нет прибывающих флотов - дальше считаем флоты, которые закончили миссию
+        ($a['fleet_event'] == EVENT_FLT_ACOMPLISH ? 1 : ($b['fleet_event'] == EVENT_FLT_ACOMPLISH ? -1 : // Если нет флотов, закончивших задание - остались возвращающиеся флоты, которые равны между собой
           // TODO: Добавить еще проверку по ID флота и/или времени запуска - что бы обсчитывать их в порядке запуска
           (
           0 // Вообще сюда доходить не должно - будет отсекаться на равенстве событий
@@ -60,7 +56,7 @@ 
 function log_file($msg) {
   static $handler;
 
-  if(!$handler) {
+  if (!$handler) {
     $handler = fopen('event.log', 'a+');
   }
 
@@ -100,12 +96,12 @@ 
   */
   global $config, $debug;
 
-  if($config->game_disable != GAME_DISABLE_NONE || $skip_fleet_update) {
+  if ($config->game_disable != GAME_DISABLE_NONE || $skip_fleet_update) {
     return;
   }
 
   sn_db_transaction_start();
-  if($config->db_loadItem('game_disable') != GAME_DISABLE_NONE || SN_TIME_NOW - strtotime($config->db_loadItem('fleet_update_last')) <= $config->fleet_update_interval) {
+  if ($config->db_loadItem('game_disable') != GAME_DISABLE_NONE || SN_TIME_NOW - strtotime($config->db_loadItem('fleet_update_last')) <= $config->fleet_update_interval) {
     sn_db_transaction_rollback();
 
     return;
@@ -113,14 +109,14 @@ 
 
 
   // Watchdog timer
-  if($config->db_loadItem('fleet_update_lock')) {
-    if(defined('DEBUG_FLYING_FLEETS')) {
+  if ($config->db_loadItem('fleet_update_lock')) {
+    if (defined('DEBUG_FLYING_FLEETS')) {
       $random = 0;
     } else {
       $random = mt_rand(240, 300);
     }
 
-    if(SN_TIME_NOW - strtotime($config->fleet_update_lock) <= $random) {
+    if (SN_TIME_NOW - strtotime($config->fleet_update_lock) <= $random) {
       sn_db_transaction_rollback();
 
       return;
@@ -144,11 +140,11 @@ 
   $missions_used = array();
 
   $objFleetList = FleetList::dbGetFleetListCurrentTick();
-  foreach($objFleetList->_container as $objFleet) {
+  foreach ($objFleetList->_container as $objFleet) {
     set_time_limit(15);
     // TODO - Унифицировать код с темплейтным разбором эвентов на планете!
     $missions_used[$objFleet->mission_type] = 1;
-    if($objFleet->time_arrive_to_target <= SN_TIME_NOW && !$objFleet->isReturning()) {
+    if ($objFleet->time_arrive_to_target <= SN_TIME_NOW && !$objFleet->isReturning()) {
       $fleet_event_list[] = array(
         'object'      => $objFleet,
         'fleet_time'  => $objFleet->time_arrive_to_target,
@@ -156,7 +152,7 @@ 
       );
     }
 
-    if($objFleet->time_mission_job_complete > 0 && $objFleet->time_mission_job_complete <= SN_TIME_NOW && !$objFleet->isReturning()) {
+    if ($objFleet->time_mission_job_complete > 0 && $objFleet->time_mission_job_complete <= SN_TIME_NOW && !$objFleet->isReturning()) {
       $fleet_event_list[] = array(
         'object'      => $objFleet,
         'fleet_time'  => $objFleet->time_mission_job_complete,
@@ -164,7 +160,7 @@ 
       );
     }
 
-    if($objFleet->time_return_to_source <= SN_TIME_NOW) {
+    if ($objFleet->time_return_to_source <= SN_TIME_NOW) {
       $fleet_event_list[] = array(
         'object'      => $objFleet,
         'fleet_time'  => $objFleet->time_return_to_source,
@@ -190,17 +186,17 @@ 
 //    MT_MISSILE => 'flt_mission_missile.php',
     MT_EXPLORE   => 'flt_mission_explore',
   );
-  foreach($missions_used as $mission_id => $cork) {
+  foreach ($missions_used as $mission_id => $cork) {
     require_once(SN_ROOT_PHYSICAL . "includes/includes/{$mission_files[$mission_id]}" . DOT_PHP_EX);
   }
 
 //log_file('Обработка миссий');
   $sn_groups_mission = sn_get_groups('missions');
-  foreach($fleet_event_list as $fleet_event) {
+  foreach ($fleet_event_list as $fleet_event) {
     // TODO: Указатель тут потом сделать
     // TODO: СЕЙЧАС НАДО ПРОВЕРЯТЬ ПО БАЗЕ - А ЖИВОЙ ЛИ ФЛОТ?!
     $fleet_row = $fleet_event['fleet_row'];
-    if(empty($fleet_event['object'])) {
+    if (empty($fleet_event['object'])) {
       // Fleet was destroyed in course of previous actions
       continue;
     }
@@ -224,20 +220,20 @@ 
 
     $objFleet->dbLoad($objFleet->dbId);
 
-    if(!$objFleet->dbId) {
+    if (!$objFleet->dbId) {
       // Fleet was destroyed in course of previous actions
       sn_db_transaction_commit();
       continue;
     }
 
-    if($fleet_event['fleet_event'] == EVENT_FLT_RETURN) {
+    if ($fleet_event['fleet_event'] == EVENT_FLT_RETURN) {
       // Fleet returns to planet
       $objFleet->RestoreFleetToPlanet(true, false);
       sn_db_transaction_commit();
       continue;
     }
 
-    if($fleet_event['fleet_event'] == EVENT_FLT_ARRIVE && $objFleet->isReturning()) {
+    if ($fleet_event['fleet_event'] == EVENT_FLT_ARRIVE && $objFleet->isReturning()) {
       // При событии EVENT_FLT_ARRIVE флот всегда должен иметь fleet_mess == 0
       // В противном случае это означает, что флот уже был обработан ранее - например, при САБе
       sn_db_transaction_commit();
@@ -257,13 +253,13 @@ 
     $objMission->dst_planet = $mission_data['dst_planet'] ? db_planet_by_vector($objFleet->target_coordinates_typed(), '', true, '`id`, `id_owner`, `name`') : null;
     $objMission->fleet_event = $fleet_event['fleet_event'];
 
-    if($objMission->dst_planet && $objMission->dst_planet['id_owner']) {
+    if ($objMission->dst_planet && $objMission->dst_planet['id_owner']) {
       $update_result = sys_o_get_updated($objMission->dst_planet['id_owner'], $objMission->dst_planet['id'], $objFleet->time_arrive_to_target);
       $objMission->dst_user = !empty($objMission->dst_user) ? $update_result['user'] : null;
       $objMission->dst_planet = $update_result['planet'];
     }
 
-    switch($objFleet->mission_type) {
+    switch ($objFleet->mission_type) {
       // Для боевых атак нужно обновлять по САБу и по холду - таки надо возвращать данные из обработчика миссий!
       case MT_AKS:
       case MT_ATTACK:

Doc Comments +1 added lines, -1 removed lines

@@ -10,7 +10,7 @@
  *
  * @param Fleet $objFleet
  * @param bool  $start
- * @param null  $result
+ * @param integer  $result
  *
  * @return mixed
  */

includes/includes/flt_mission_colonize.php

Spacing +4 added lines, -4 removed lines

@@ -20,14 +20,14 @@ 
   $TargetAddress = sprintf($lang['sys_adress_planet'], $fleet_end_coordinates['galaxy'], $fleet_end_coordinates['system'], $fleet_end_coordinates['planet']);
 
   $TheMessage = $lang['sys_colo_no_colonizer'];
-  if($objFleet->shipsGetTotalById(SHIP_COLONIZER) >= 1) {
+  if ($objFleet->shipsGetTotalById(SHIP_COLONIZER) >= 1) {
     $TheMessage = $lang['sys_colo_notfree'];
-    if(empty($mission_data->dst_planet)) {
+    if (empty($mission_data->dst_planet)) {
       $iPlanetCount = get_player_current_colonies($src_user_row);
 
       // Can we colonize more planets?
       $TheMessage = $lang['sys_colo_maxcolo'];
-      if($iPlanetCount < get_player_max_colonies($src_user_row)) {
+      if ($iPlanetCount < get_player_max_colonies($src_user_row)) {
         // Yes, we can colonize
         $TheMessage = $lang['sys_colo_badpos'];
 
@@ -35,7 +35,7 @@ 
           $fleet_end_coordinates['galaxy'], $fleet_end_coordinates['system'], $fleet_end_coordinates['planet'],
           $objFleet->playerOwnerId, "{$lang['sys_colo_defaultname']} {$iPlanetCount}", false,
           array('user_row' => $src_user_row));
-        if($NewOwnerPlanet) {
+        if ($NewOwnerPlanet) {
           $TheMessage = $lang['sys_colo_arrival'] . $TargetAddress . $lang['sys_colo_allisok'];
           msg_send_simple_message($objFleet->playerOwnerId, '', $objFleet->time_arrive_to_target, MSG_TYPE_SPY, $lang['sys_colo_mess_from'], $lang['sys_colo_mess_report'], $TheMessage);