supernova-ws / SuperNova

classes/FleetList.php

Doc Comments +5 added lines

@@ -64,6 +64,10 @@ 
    *
    */
   // DEPRECATED
+
+  /**
+   * @param boolean $for_update
+   */
   public static function dbGetFleetList($where_safe = '', $for_update = DB_SELECT_FOR_UPDATE) {
     $fleetList = new static();
     $fleetList->dbLoadWhere($where_safe, $for_update);
@@ -246,6 +250,7 @@ 
    * LIST - Get missile attack list by condition
    *
    * @param string $where
+   * @param boolean $for_update
    */
   public function dbMergeMissileList($where, $for_update = DB_SELECT_FOR_UPDATE) {
     $query = classSupernova::$db->doSelect(

Spacing +25 added lines, -25 removed lines

@@ -33,18 +33,18 @@ 
     $fleets_added = array();
 
     $query = classSupernova::$db->doSelect(
-      "SELECT * FROM `{{fleets}}`" .
-      (!empty($where_safe) ? " WHERE {$where_safe}" : '') .
+      "SELECT * FROM `{{fleets}}`".
+      (!empty($where_safe) ? " WHERE {$where_safe}" : '').
       ($for_update == DB_SELECT_FOR_UPDATE ? " FOR UPDATE;" : '')
     );
-    while($row = db_fetch($query)) {
+    while ($row = db_fetch($query)) {
       /**
        * @var Fleet $fleet
        */
       $fleet = $this->_createElement();
       $fleet->dbRowParse($row);
 
-      if(isset($this[$fleet->dbId])) {
+      if (isset($this[$fleet->dbId])) {
         // Нужно ли ????
         classSupernova::$debug->error('Fleet list already set');
       }
@@ -119,11 +119,11 @@ 
   public static function dbGetFleetListCurrentTick() {
     return static::dbGetFleetList(
       "
-    (`fleet_start_time` <= " . SN_TIME_NOW . " AND `fleet_mess` = 0)
+    (`fleet_start_time` <= " . SN_TIME_NOW." AND `fleet_mess` = 0)
     OR
-    (`fleet_end_stay` <= " . SN_TIME_NOW . " AND `fleet_end_stay` > 0 AND `fleet_mess` = 0)
+    (`fleet_end_stay` <= " . SN_TIME_NOW." AND `fleet_end_stay` > 0 AND `fleet_mess` = 0)
     OR
-    (`fleet_end_time` <= " . SN_TIME_NOW . ")"
+    (`fleet_end_time` <= " . SN_TIME_NOW.")"
       , DB_SELECT_PLAIN
     );
   }
@@ -144,7 +144,7 @@ 
     AND `fleet_end_planet` = {$planet_row['planet']}
     AND `fleet_end_type`   = {$planet_row['planet_type']}
     AND `fleet_owner` = {$fleet_owner_id}
-    AND `fleet_mission` IN (" . MT_ATTACK . "," . MT_ACS . "," . MT_DESTROY . ")
+    AND `fleet_mission` IN (".MT_ATTACK.",".MT_ACS.",".MT_DESTROY.")
     AND `fleet_mess` = 0"
       , DB_SELECT_FOR_UPDATE
     );
@@ -170,7 +170,7 @@ 
    * @return static|array
    */
   public static function dbGetFleetListAndMissileByCoordinates($coordinates, $for_phalanx = false) {
-    if(empty($coordinates) || !is_array($coordinates)) {
+    if (empty($coordinates) || !is_array($coordinates)) {
       return array();
     }
 
@@ -201,8 +201,8 @@ 
      * @var Fleet[] $array_of_Fleet
      */
     $array_of_Fleet = array();
-    if(!empty($fleet_db_list) && $fleet_db_list->count()) {
-      foreach($fleet_db_list->_container as $fleet_id => $objFleet) {
+    if (!empty($fleet_db_list) && $fleet_db_list->count()) {
+      foreach ($fleet_db_list->_container as $fleet_id => $objFleet) {
         $array_of_Fleet[$fleet_id] = $objFleet;
       }
       $planet_fleets = flt_get_fleets_to_planet_by_array_of_Fleet($array_of_Fleet);
@@ -227,16 +227,16 @@ 
     return static::dbGetFleetList(
       "(
       fleet_start_galaxy = {$galaxy}
-      AND fleet_start_system = {$system}" .
-      ($planet ? " AND fleet_start_planet = {$planet}" : '') .
-      ($planet_type != PT_ALL ? " AND fleet_start_type = {$planet_type}" : '') .
-      ($for_phalanx ? '' : " AND fleet_mess = 1") .
+      AND fleet_start_system = {$system}".
+      ($planet ? " AND fleet_start_planet = {$planet}" : '').
+      ($planet_type != PT_ALL ? " AND fleet_start_type = {$planet_type}" : '').
+      ($for_phalanx ? '' : " AND fleet_mess = 1").
       ") OR (
       fleet_end_galaxy = {$galaxy}
-      AND fleet_end_system = {$system}" .
-      ($planet ? " AND fleet_end_planet = {$planet}" : '') .
-      ($planet_type != PT_ALL ? " AND fleet_end_type = {$planet_type} " : '') .
-      ($for_phalanx ? '' : " AND fleet_mess = 0") .
+      AND fleet_end_system = {$system}".
+      ($planet ? " AND fleet_end_planet = {$planet}" : '').
+      ($planet_type != PT_ALL ? " AND fleet_end_type = {$planet_type} " : '').
+      ($for_phalanx ? '' : " AND fleet_mess = 0").
       ")"
       , DB_SELECT_PLAIN
     );
@@ -249,11 +249,11 @@ 
    */
   public function dbMergeMissileList($where, $for_update = DB_SELECT_FOR_UPDATE) {
     $query = classSupernova::$db->doSelect(
-      "SELECT * FROM `{{iraks}}`" .
-      (!empty($where) ? " WHERE {$where}" : '') .
+      "SELECT * FROM `{{iraks}}`".
+      (!empty($where) ? " WHERE {$where}" : '').
       ($for_update == DB_SELECT_FOR_UPDATE ? " FOR UPDATE;" : '')
     );
-    while($missile_db_row = db_fetch($query)) {
+    while ($missile_db_row = db_fetch($query)) {
       /**
        * @var Fleet $objFleet
        */
@@ -275,7 +275,7 @@ 
    */
   public static function dbGetFleetListAndMissileINCOMING($owner_id) {
     $owner_id_safe = idval($owner_id);
-    if(empty($owner_id_safe)) {
+    if (empty($owner_id_safe)) {
       return array();
     }
 
@@ -309,10 +309,10 @@ 
    */
   public static function fleet_count_flying($player_id, $mission_id = 0) {
     $player_id_safe = idval($player_id);
-    if(!empty($player_id_safe)) {
+    if (!empty($player_id_safe)) {
       $mission_id_safe = intval($mission_id);
       $result = static::db_fleet_count(
-        "`fleet_owner` = {$player_id_safe}" .
+        "`fleet_owner` = {$player_id_safe}".
         ($mission_id_safe ? " AND `fleet_mission` = {$mission_id_safe}" : '')
       );
     } else {

admin/statbuilder.php

Spacing +5 added lines, -5 removed lines

@@ -9,18 +9,18 @@
  * @copyright 2008 by Chlorel for XNova
  */
 
-define('INSIDE'  , true);
-define('INSTALL' , false);
+define('INSIDE', true);
+define('INSTALL', false);
 define('IN_ADMIN', true);
-require_once('../common.' . substr(strrchr(__FILE__, '.'), 1));
+require_once('../common.'.substr(strrchr(__FILE__, '.'), 1));
 
 // if($user['authlevel'] < 1)
-if($user['authlevel'] < 3)
+if ($user['authlevel'] < 3)
 {
   AdminMessage(classLocale::$lang['adm_err_denied']);
 }
 
-if(SN_TIME_NOW >= classSupernova::$config->db_loadItem('var_stat_update_admin_forced') && SN_TIME_NOW >= classSupernova::$config->db_loadItem('var_stat_update_end'))
+if (SN_TIME_NOW >= classSupernova::$config->db_loadItem('var_stat_update_admin_forced') && SN_TIME_NOW >= classSupernova::$config->db_loadItem('var_stat_update_end'))
 {
   classSupernova::$config->db_saveItem('var_stat_update_admin_forced', SN_TIME_NOW + 120);
 

classes/Entity/EntityModel.php

Spacing +6 added lines, -6 removed lines

@@ -75,7 +75,7 @@ 
     $this->rowOperator = $gc->dbGlobalRowOperator;
     $this->accessors = new Accessors();
 
-    if(property_exists($this, 'newProperties') && !empty($this->newProperties)) {
+    if (property_exists($this, 'newProperties') && !empty($this->newProperties)) {
       $this->extendProperties($this->newProperties);
     }
   }
@@ -216,7 +216,7 @@ 
   }
 
   protected function delete(EntityContainer $cEntity) {
-    throw new \Exception(__CLASS__ . '::delete() in ' . get_called_class() . 'is not yet implemented');
+    throw new \Exception(__CLASS__.'::delete() in '.get_called_class().'is not yet implemented');
   }
 
   protected function insert(EntityContainer $cEntity) {
@@ -229,19 +229,19 @@ 
     // Generate changeset row
     // Foreach all rows. If there is change and no delta - then put delta. Otherwise put change
     // If row not empty - update
-    throw new \Exception(__CLASS__ . '::update() in ' . get_called_class() . 'is not yet implemented');
+    throw new \Exception(__CLASS__.'::update() in '.get_called_class().'is not yet implemented');
   }
 
-  protected function unchanged(EntityContainer $cEntity){
+  protected function unchanged(EntityContainer $cEntity) {
     // TODO - or just save nothing ?????
 //    throw new \Exception('EntityModel isNotEmpty, have dbId and not CHANGED! It can\'t be!');
-    throw new \Exception(__CLASS__ . '::unchanged() in ' . get_called_class() . 'is not yet implemented');
+    throw new \Exception(__CLASS__.'::unchanged() in '.get_called_class().'is not yet implemented');
   }
 
   protected function emptyAction(EntityContainer $cEntity) {
     // Just created container and doesn't use it
 //    throw new \Exception('EntityModel isEmpty but not loaded! It can\'t be!');
-    throw new \Exception(__CLASS__ . '::emptyAction() in ' . get_called_class() . 'is not yet implemented');
+    throw new \Exception(__CLASS__.'::emptyAction() in '.get_called_class().'is not yet implemented');
   }
 
   protected function save(EntityContainer $cEntity) {

classes/Entity/EntityContainer.php

Spacing +1 added lines, -1 removed lines

@@ -69,7 +69,7 @@
     elseif ($value != $this->original[$name]) {
       $this->delta[$name] = $value;
       // New value not equal original value. We should update delta
-      if((is_int($value) || is_float($value))) {
+      if ((is_int($value) || is_float($value))) {
         $this->delta[$name] -= $this->original[$name];
       }
     }

classes/Entity/KeyedModel.php

Spacing +1 added lines, -1 removed lines

@@ -79,7 +79,7 @@
     throw new \Exception('KeyedModel::update() is not yet implemented');
   }
 
-  protected function unchanged(KeyedContainer $cEntity){
+  protected function unchanged(KeyedContainer $cEntity) {
     // TODO - or just save nothing ?????
     // throw new \Exception('EntityModel isNotEmpty, have dbId and not CHANGED! It can\'t be!');
     // Do nothing

classes/db_mysql_v5.php

Spacing +5 added lines, -5 removed lines

@@ -37,19 +37,19 @@
 
     $this->link = mysqli_connect($settings['server'], $settings['user'], $settings['pass'], $settings['name']);
     if (!is_object($this->link) || $this->link->connect_error) {
-      classSupernova::$debug->error_fatal('DB Error - cannot connect to server error #' . $this->link->connect_errno, $this->link->connect_error);
+      classSupernova::$debug->error_fatal('DB Error - cannot connect to server error #'.$this->link->connect_errno, $this->link->connect_error);
     }
 
 
     !$this->mysql_query("/*!40101 SET NAMES 'utf8' */")
-      ? classSupernova::$debug->error_fatal('DB error - cannot set names 1 error #' . $this->link->errno, $this->link->error)
+      ? classSupernova::$debug->error_fatal('DB error - cannot set names 1 error #'.$this->link->errno, $this->link->error)
       : false;
     !$this->mysql_query("SET NAMES 'utf8';")
-      ? classSupernova::$debug->error_fatal('DB error - cannot set names 2 error #' . $this->link->errno, $this->link->error)
+      ? classSupernova::$debug->error_fatal('DB error - cannot set names 2 error #'.$this->link->errno, $this->link->error)
       : false;
 
-    !$this->mysql_query('SET SESSION TRANSACTION ISOLATION LEVEL ' . self::DB_MYSQL_TRANSACTION_SERIALIZABLE . ';')
-      ? classSupernova::$debug->error_fatal('DB error - cannot set desired isolation level error #' . $this->link->errno, $this->link->error)
+    !$this->mysql_query('SET SESSION TRANSACTION ISOLATION LEVEL '.self::DB_MYSQL_TRANSACTION_SERIALIZABLE.';')
+      ? classSupernova::$debug->error_fatal('DB error - cannot set desired isolation level error #'.$this->link->errno, $this->link->error)
       : false;
 
     $this->connected = true;

includes/init_secondary.php

Spacing +25 added lines, -25 removed lines

@@ -4,19 +4,19 @@ 
 
 $classLocale = classLocale::$lang;
 
-if(classSupernova::$config->server_updater_check_auto && classSupernova::$config->server_updater_check_last + classSupernova::$config->server_updater_check_period <= SN_TIME_NOW) {
-  include(SN_ROOT_PHYSICAL . 'ajax_version_check' . DOT_PHP_EX);
+if (classSupernova::$config->server_updater_check_auto && classSupernova::$config->server_updater_check_last + classSupernova::$config->server_updater_check_period <= SN_TIME_NOW) {
+  include(SN_ROOT_PHYSICAL.'ajax_version_check'.DOT_PHP_EX);
 }
 
-if(classSupernova::$config->user_birthday_gift && SN_TIME_NOW - classSupernova::$config->user_birthday_celebrate > PERIOD_DAY) {
-  require_once(SN_ROOT_PHYSICAL . "includes/includes/user_birthday_celebrate" . DOT_PHP_EX);
+if (classSupernova::$config->user_birthday_gift && SN_TIME_NOW - classSupernova::$config->user_birthday_celebrate > PERIOD_DAY) {
+  require_once(SN_ROOT_PHYSICAL."includes/includes/user_birthday_celebrate".DOT_PHP_EX);
   sn_user_birthday_celebrate();
 }
 
-if(!classSupernova::$config->var_online_user_count || classSupernova::$config->var_online_user_time + 30 < SN_TIME_NOW) {
+if (!classSupernova::$config->var_online_user_count || classSupernova::$config->var_online_user_time + 30 < SN_TIME_NOW) {
   classSupernova::$config->db_saveItem('var_online_user_count', DBStaticUser::db_user_count(true));
   classSupernova::$config->db_saveItem('var_online_user_time', SN_TIME_NOW);
-  if(classSupernova::$config->server_log_online) {
+  if (classSupernova::$config->server_log_online) {
     db_log_online_insert();
   }
 }
@@ -43,7 +43,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']);
 }
 
@@ -56,15 +56,15 @@ 
     : false
   );
 
-if($template_result[F_LOGIN_STATUS] == LOGIN_ERROR_USERNAME_RESTRICTED_CHARACTERS) {
-  $prohibited_characters = array_map(function ($value) {
-    return "'" . htmlentities($value, ENT_QUOTES, 'UTF-8') . "'";
+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("Отключи отладку перед продакшном!");
 }
 
@@ -78,7 +78,7 @@ 
   ? define('INSTALL_MODE', GAME_DISABLE_INSTALL)
   : false;
 
-if(
+if (
   classSupernova::$config->game_disable == GAME_DISABLE_STAT
   &&
   SN_TIME_NOW - strtotime(classSupernova::$config->db_loadItem('var_stat_update_end')) > 600
@@ -91,17 +91,17 @@ 
   classSupernova::$debug->warning('Stat worked too long - watchdog unlocked', 'Stat WARNING');
 }
 
-if($template_result[F_GAME_DISABLE] = classSupernova::$config->game_disable) {
+if ($template_result[F_GAME_DISABLE] = classSupernova::$config->game_disable) {
   $template_result[F_GAME_DISABLE_REASON] = sys_bbcodeParse(
     classSupernova::$config->game_disable == GAME_DISABLE_REASON
       ? classSupernova::$config->game_disable_reason
       : classLocale::$lang['sys_game_disable_reason'][classSupernova::$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'))
@@ -115,8 +115,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;
   }
 
@@ -134,15 +134,15 @@ 
 // pdump($allow_anonymous, '$allow_anonymous');
 // pdump($sys_user_logged_in, '$sys_user_logged_in');
 
-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'])
+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'])
 //  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');
+  sys_redirect(SN_ROOT_VIRTUAL.'login.php');
 }
 
 $user_time_diff = playerTimeDiff::user_time_diff_get();
@@ -161,16 +161,16 @@ 
 
 global $skip_fleet_update;
 $skip_fleet_update = $skip_fleet_update || classSupernova::$options['fleet_update_skip'] || defined('IN_ADMIN');
-if(
+if (
   !$skip_fleet_update
   && !(defined('IN_AJAX') && IN_AJAX === true)
   && SN_TIME_NOW - strtotime(classSupernova::$config->fleet_update_last) > classSupernova::$config->fleet_update_interval
 ) {
-  require_once(SN_ROOT_PHYSICAL . "includes/includes/flt_flying_fleet_handler2" . DOT_PHP_EX);
+  require_once(SN_ROOT_PHYSICAL."includes/includes/flt_flying_fleet_handler2".DOT_PHP_EX);
   flt_flying_fleet_handler($skip_fleet_update);
 }
 
-if(!defined('IN_AJAX')) {
+if (!defined('IN_AJAX')) {
   pdump("Scheduled processes is disabled");
 }
 // scheduler_process();

includes/functions/scheduler_process.php

Spacing +11 added lines, -11 removed lines

@@ -9,19 +9,19 @@ 
   $ts_var_stat_update = strtotime(classSupernova::$config->db_loadItem('var_stat_update'));
   $ts_scheduled_update = sys_schedule_get_prev_run(classSupernova::$config->db_loadItem('stats_schedule'), classSupernova::$config->var_stat_update);
 
-  if(sys_get_param_int('admin_update')) {
+  if (sys_get_param_int('admin_update')) {
     define('USER_LEVEL', isset($user['authlevel']) ? $user['authlevel'] : -1);
-    if(USER_LEVEL > 0) {
+    if (USER_LEVEL > 0) {
       $is_admin_request = true;
       $ts_scheduled_update = SN_TIME_NOW;
     }
   }
 
-  if($ts_scheduled_update > $ts_var_stat_update) {
+  if ($ts_scheduled_update > $ts_var_stat_update) {
     lng_include('admin');
     sn_db_transaction_start();
     $ts_var_stat_update_end = strtotime(classSupernova::$config->db_loadItem('var_stat_update_end'));
-    if(SN_TIME_NOW > $ts_var_stat_update_end) {
+    if (SN_TIME_NOW > $ts_var_stat_update_end) {
       $old_server_status = classSupernova::$config->db_loadItem('game_disable');
       classSupernova::$config->db_saveItem('game_disable', GAME_DISABLE_STAT);
 
@@ -31,14 +31,14 @@ 
 
       $msg = $is_admin_request ? 'admin request' : 'scheduler';
       $next_run = date(FMT_DATE_TIME_SQL, sys_schedule_get_prev_run(classSupernova::$config->stats_schedule, classSupernova::$config->var_stat_update, true));
-      $msg = "Running stat updates: {$msg}. Config->var_stat_update = " . classSupernova::$config->var_stat_update .
-        ', $ts_scheduled_update = ' . date(FMT_DATE_TIME_SQL, $ts_scheduled_update) .
-        ', next_stat_update = ' . $next_run;
+      $msg = "Running stat updates: {$msg}. Config->var_stat_update = ".classSupernova::$config->var_stat_update.
+        ', $ts_scheduled_update = '.date(FMT_DATE_TIME_SQL, $ts_scheduled_update).
+        ', next_stat_update = '.$next_run;
       classSupernova::$debug->warning($msg, 'Stat update', LOG_INFO_STAT_PROCESS);
       $total_time = microtime(true);
 
       // require_once('../includes/sys_stat.php');
-      require_once(SN_ROOT_PHYSICAL . 'includes/includes/sys_stat.php');
+      require_once(SN_ROOT_PHYSICAL.'includes/includes/sys_stat.php');
       sys_stat_calculate();
 
       $total_time = microtime(true) - $total_time;
@@ -56,17 +56,17 @@ 
       classSupernova::$config->db_saveItem('var_stat_update_admin_forced', SN_TIME_SQL);
       classSupernova::$config->db_saveItem('var_stat_update_end', SN_TIME_SQL);
 
-      if($old_server_status == GAME_DISABLE_STAT) {
+      if ($old_server_status == GAME_DISABLE_STAT) {
         $old_server_status = GAME_DISABLE_NONE;
       }
       classSupernova::$config->db_saveItem('game_disable', $old_server_status);
-    } elseif($ts_scheduled_update > $ts_var_stat_update) {
+    } elseif ($ts_scheduled_update > $ts_var_stat_update) {
       $timeout = strtotime(classSupernova::$config->db_loadItem('var_stat_update_end')) - SN_TIME_NOW;
       $msg = classSupernova::$config->db_loadItem('var_stat_update_msg');
       $msg = "{$msg} ETA {$timeout} seconds. Please wait...";
     }
     sn_db_transaction_rollback();
-  } elseif($is_admin_request) {
+  } elseif ($is_admin_request) {
     $msg = 'Stat is up to date';
   }
 

includes/includes/flt_flying_fleet_handler2.php

Spacing +9 added lines, -13 removed lines

@@ -23,15 +23,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 // Вообще сюда доходить не должно - будет отсекаться на равенстве событий
@@ -49,13 +45,13 @@ 
     $handler = fopen('event.log', 'a+');
   }
 
-  fwrite($handler, date(FMT_DATE_TIME_SQL, time()) . ' ' . $msg . "\r\n");
+  fwrite($handler, date(FMT_DATE_TIME_SQL, time()).' '.$msg."\r\n");
 }
 
 // ------------------------------------------------------------------
 function flt_flying_fleet_handler($skip_fleet_update = false) {
   if (true) {
-    if(!defined('IN_AJAX')) {
+    if (!defined('IN_AJAX')) {
       print('<div style="color: red; font-size: 300%">Fleet handler is disabled</div>');
       pdump('Fleet handler is disabled');
     }
@@ -181,7 +177,7 @@ 
     MT_EXPLORE   => 'flt_mission_explore',
   );
   foreach ($missions_used as $mission_id => $cork) {
-    require_once(SN_ROOT_PHYSICAL . "includes/includes/{$mission_files[$mission_id]}" . DOT_PHP_EX);
+    require_once(SN_ROOT_PHYSICAL."includes/includes/{$mission_files[$mission_id]}".DOT_PHP_EX);
   }
 
 //log_file('Обработка миссий');
@@ -190,7 +186,7 @@ 
     // Watchdog timer
     // If flying fleet handler works more then 10 seconds - stopping it
     // Let next run handle rest of fleets
-    if(time() - SN_TIME_NOW > 10) {
+    if (time() - SN_TIME_NOW > 10) {
       $debug->warning('Flying fleet handler standard routine works more then 10 seconds - watchdog unlocked', 'FFH Warning', 504);
       break;
     }
@@ -256,7 +252,7 @@ 
     $objMission->fleet_event = $fleet_event['fleet_event'];
 
     // Fleet that have planet destination is returned
-    if($mission_data['dst_planet'] && empty($objMission->dst_planet['id_owner'])) {
+    if ($mission_data['dst_planet'] && empty($objMission->dst_planet['id_owner'])) {
       $objFleet->markReturnedAndSave();
       sn_db_transaction_commit();
       continue;