supernova-ws / SuperNova

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/functions/uni_functions.php

Spacing +39 added lines, -39 removed lines

@@ -7,12 +7,12 @@ 
 
   $possible_cores = array();
   $probability = 0;
-  foreach($density_list as $possible_core_id => $core_data) {
-    if(!$core_data[UNIT_PLANET_DENSITY_RARITY]) {
+  foreach ($density_list as $possible_core_id => $core_data) {
+    if (!$core_data[UNIT_PLANET_DENSITY_RARITY]) {
       continue;
     }
 
-    if(
+    if (
       // Core type exists
       in_array($possible_core_id, $position_data['core_types'])
       // Limit core type with planet sector count
@@ -33,8 +33,8 @@ 
 
   $random = mt_rand(1, $probability);
   $selected_core = null;
-  foreach($possible_cores as $core_type => $core_info) {
-    if($random <= $core_info[UNIT_PLANET_DENSITY_RARITY]) {
+  foreach ($possible_cores as $core_type => $core_info) {
+    if ($random <= $core_info[UNIT_PLANET_DENSITY_RARITY]) {
       $selected_core = $core_info;
       break;
     }
@@ -57,7 +57,7 @@ 
 function uni_create_planet($Galaxy, $System, $Position, $PlanetOwnerID, $planet_name_unsafe = '', $HomeWorld = false, $options = array()) {
   $Position = intval($Position);
 
-  if(!isset($options['skip_check']) && DBStaticPlanet::db_planet_by_gspt($Galaxy, $System, $Position, PT_PLANET, true, '`id`')) {
+  if (!isset($options['skip_check']) && DBStaticPlanet::db_planet_by_gspt($Galaxy, $System, $Position, PT_PLANET, true, '`id`')) {
     return false;
   }
 
@@ -66,11 +66,11 @@ 
 
   $planet_generator = sn_get_groups('planet_generator');
 
-  if($HomeWorld) {
+  if ($HomeWorld) {
     $position_data = $planet_generator[0];
   } else {
     $position_data = $planet_generator[$Position >= UNIVERSE_RANDOM_PLANET_START || $Position < 1 ? UNIVERSE_RANDOM_PLANET_START : $Position];
-    if($Position >= UNIVERSE_RANDOM_PLANET_START) {
+    if ($Position >= UNIVERSE_RANDOM_PLANET_START) {
       // Корректируем температуру для планеты-странника
       $position_data['t_max_max'] -= UNIVERSE_RANDOM_PLANET_TEMPERATURE_DECREASE * ($Position - UNIVERSE_RANDOM_PLANET_START);
     }
@@ -78,7 +78,7 @@ 
 
   $planet_images = sn_get_groups('planet_images');
   $planet_image = $position_data['planet_images'][mt_rand(0, count($position_data['planet_images']) - 1)];
-  $planet_image .= 'planet' . $planet_images[$planet_image][mt_rand(0, count($planet_images[$planet_image]) - 1)];
+  $planet_image .= 'planet'.$planet_images[$planet_image][mt_rand(0, count($planet_images[$planet_image]) - 1)];
 
   $t_max = sn_rand_gauss_range($position_data['t_max_min'], $position_data['t_max_max'], true, 1.3, true);
   $t_min = $t_max - sn_rand_gauss_range($position_data['t_delta_min'], $position_data['t_delta_max'], true, 1.3, true);
@@ -89,7 +89,7 @@ 
 
   $core_info = uni_create_planet_get_density($position_data, $user_row, $planet_sectors);
 
-  $planet_name_unsafe = $user_row['username'] . ' ' . ($planet_name_unsafe ? $planet_name_unsafe : classLocale::$lang['sys_colo_defaultname']);
+  $planet_name_unsafe = $user_row['username'].' '.($planet_name_unsafe ? $planet_name_unsafe : classLocale::$lang['sys_colo_defaultname']);
 
   $planet['name'] = db_escape(strip_tags(trim($planet_name_unsafe)));
   $planet['id_owner'] = $PlanetOwnerID;
@@ -170,15 +170,15 @@ 
   $moon_name = '';
   $moon_row = array();
   $moon = DBStaticPlanet::db_planet_by_gspt($pos_galaxy, $pos_system, $pos_planet, PT_MOON, false, 'id');
-  if(!$moon['id']) {
+  if (!$moon['id']) {
     $moon_planet = DBStaticPlanet::db_planet_by_gspt($pos_galaxy, $pos_system, $pos_planet, PT_PLANET, true, '`id`, `temp_min`, `temp_max`, `name`, `debris_metal`, `debris_crystal`');
 
-    if($moon_planet['id']) {
+    if ($moon_planet['id']) {
       $base_storage_size = BASE_STORAGE_SIZE;
 
-      if(!$moon_chance) {
+      if (!$moon_chance) {
         $size = mt_rand(1100, 8999);
-      } elseif($moon_chance <= 100) {
+      } elseif ($moon_chance <= 100) {
         $size = mt_rand($moon_chance * 100 + 1000, $moon_chance * 200 + 2999);
       } else {
         $size = $moon_chance;
@@ -194,22 +194,22 @@ 
 
       $field_max = ceil($size / 1000);
 
-      if(isset($options['image']) && $options['image']) {
+      if (isset($options['image']) && $options['image']) {
         $moon_image = $options['image'];
       } else {
         $moon_image = 'mond';
       }
 
       $moon_row = classSupernova::db_ins_record(LOC_PLANET,
-        "`id_owner` = '{$user_id}', `parent_planet` = '{$moon_planet['id']}', `name` = '{$moon_name_safe}', `last_update` = " . SN_TIME_NOW . ", `image` = '{$moon_image}',
-          `galaxy` = '{$pos_galaxy}', `system` = '{$pos_system}', `planet` = '{$pos_planet}', `planet_type` = " . PT_MOON . ",
+        "`id_owner` = '{$user_id}', `parent_planet` = '{$moon_planet['id']}', `name` = '{$moon_name_safe}', `last_update` = ".SN_TIME_NOW.", `image` = '{$moon_image}',
+          `galaxy` = '{$pos_galaxy}', `system` = '{$pos_system}', `planet` = '{$pos_planet}', `planet_type` = ".PT_MOON.",
           `diameter` = '{$size}', `field_max` = '{$field_max}', `density` = 2500, `density_index` = 2, `temp_min` = '{$temp_min}', `temp_max` = '{$temp_max}',
           `metal` = '0', `metal_perhour` = '0', `metal_max` = '{$base_storage_size}',
           `crystal` = '0', `crystal_perhour` = '0', `crystal_max` = '{$base_storage_size}',
           `deuterium` = '0', `deuterium_perhour` = '0', `deuterium_max` = '{$base_storage_size}'"
       );
 
-      if($update_debris) {
+      if ($update_debris) {
         $debris_spent = $moon_chance * 1000000;
         $metal_spent = round(min($moon_planet['debris_metal'], $debris_spent * mt_rand(50, 75) / 100));
         $crystal_spent = min($moon_planet['debris_crystal'], $debris_spent - $metal_spent);
@@ -244,28 +244,28 @@ 
   $planet_row['id'] = $user['current_planet'];
 
   // Пытаемся переключить на новую планету
-  if(($selected_planet = sys_get_param_id('cp')) && $selected_planet != $user['current_planet']) {
+  if (($selected_planet = sys_get_param_id('cp')) && $selected_planet != $user['current_planet']) {
     $planet_row = DBStaticPlanet::db_planet_by_id_and_owner($selected_planet, $user['id'], false, 'id');
   } else {
     $planet_row = DBStaticPlanet::db_planet_by_id($planet_row['id']);
   }
 
   // Если новая планета не найдена или было переключения - проверяем текущую выбранную планету
-  if(!isset($planet_row['id'])) // || $planet_row['id'] != $user['current_planet']
+  if (!isset($planet_row['id'])) // || $planet_row['id'] != $user['current_planet']
   {
     $planet_row = DBStaticPlanet::db_planet_by_id_and_owner($user['current_planet'], $user['id'], false, 'id');
     // Если текущей планеты не существует - выставляем Столицу
-    if(!isset($planet_row['id'])) {
+    if (!isset($planet_row['id'])) {
       $planet_row = DBStaticPlanet::db_planet_by_id_and_owner($user['id_planet'], $user['id'], false, 'id');
       // Если и столицы не существует - значит что-то очень не так с записью пользователя
-      if(!isset($planet_row['id'])) {
+      if (!isset($planet_row['id'])) {
         classSupernova::$debug->error("User ID {$user['id']} has Capital planet {$user['id_planet']} but this planet does not exists", 'User record error', 502);
       }
     }
   }
 
   // Если производилось переключение планеты - делаем запись в юзере
-  if($user['current_planet'] != $planet_row['id']) {
+  if ($user['current_planet'] != $planet_row['id']) {
     DBStaticUser::db_user_set_by_id($user['id'], "`current_planet` = '{$planet_row['id']}'");
     $user['current_planet'] = $planet_row['id'];
   }
@@ -282,7 +282,7 @@ 
 
 // ----------------------------------------------------------------------------------------------------------------
 function uni_render_coordinates($from, $prefix = '') {
-  return "[{$from[$prefix . 'galaxy']}:{$from[$prefix . 'system']}:{$from[$prefix . 'planet']}]";
+  return "[{$from[$prefix.'galaxy']}:{$from[$prefix.'system']}:{$from[$prefix.'planet']}]";
 }
 
 function uni_render_planet($from) {
@@ -290,17 +290,17 @@ 
 }
 
 function uni_render_planet_full($from, $prefix = '', $html_safe = true, $include_id = false) {
-  if(!$from['id']) {
+  if (!$from['id']) {
     $result = classLocale::$lang['sys_planet_expedition'];
   } else {
     $from_planet_id = $include_id ? (
-      'ID {' . ($from['id'] ? $from['id'] : ($from[$prefix . 'planet_id'] ? $from[$prefix . 'planet_id'] : 0)) . '} '
+      'ID {'.($from['id'] ? $from['id'] : ($from[$prefix.'planet_id'] ? $from[$prefix.'planet_id'] : 0)).'} '
     ) : '';
 
-    $from_planet_type = $from['planet_type'] ? $from['planet_type'] : ($from[$prefix . 'type'] ? $from[$prefix . 'type'] : 0);
-    $from_planet_type = ($from_planet_type ? ' ' . classLocale::$lang['sys_planet_type_sh'][$from_planet_type] : '');
+    $from_planet_type = $from['planet_type'] ? $from['planet_type'] : ($from[$prefix.'type'] ? $from[$prefix.'type'] : 0);
+    $from_planet_type = ($from_planet_type ? ' '.classLocale::$lang['sys_planet_type_sh'][$from_planet_type] : '');
 
-    $result = $from_planet_id . uni_render_coordinates($from, $prefix) . $from_planet_type . ($from['name'] ? ' ' . $from['name'] : '');
+    $result = $from_planet_id.uni_render_coordinates($from, $prefix).$from_planet_type.($from['name'] ? ' '.$from['name'] : '');
     $result = $html_safe ? str_replace(' ', '&nbsp;', htmlentities($result, ENT_COMPAT, 'UTF-8')) : $result;
   }
 
@@ -308,11 +308,11 @@ 
 }
 
 function uni_render_coordinates_url($from, $prefix = '', $page = 'galaxy.php') {
-  return $page . (strpos($page, '?') === false ? '?' : '&') . "galaxy={$from[$prefix . 'galaxy']}&system={$from[$prefix . 'system']}&planet={$from[$prefix . 'planet']}";
+  return $page.(strpos($page, '?') === false ? '?' : '&')."galaxy={$from[$prefix.'galaxy']}&system={$from[$prefix.'system']}&planet={$from[$prefix.'planet']}";
 }
 
 function uni_render_coordinates_href($from, $prefix = '', $mode = 0, $fleet_type = '') {
-  return '<a href="' . uni_render_coordinates_url($from, $prefix, "galaxy.php?mode={$mode}") . '"' . ($fleet_type ? " {$fleet_type}" : '') . '>' . uni_render_coordinates($from, $prefix) . '</a>';
+  return '<a href="'.uni_render_coordinates_url($from, $prefix, "galaxy.php?mode={$mode}").'"'.($fleet_type ? " {$fleet_type}" : '').'>'.uni_render_coordinates($from, $prefix).'</a>';
 }
 
 function uni_get_time_to_jump($moon_row) {
@@ -340,30 +340,30 @@ 
   $coordinates["{$prefix}planet"] = intval($coordinates["{$prefix}planet"]);
 
   return
-    isset($coordinates["{$prefix}galaxy"]) && $coordinates["{$prefix}galaxy"] > 0 && $coordinates["{$prefix}galaxy"] <= Vector::$knownGalaxies&&
-    isset($coordinates["{$prefix}system"]) && $coordinates["{$prefix}system"] > 0 && $coordinates["{$prefix}system"] <= Vector::$knownSystems&&
+    isset($coordinates["{$prefix}galaxy"]) && $coordinates["{$prefix}galaxy"] > 0 && $coordinates["{$prefix}galaxy"] <= Vector::$knownGalaxies &&
+    isset($coordinates["{$prefix}system"]) && $coordinates["{$prefix}system"] > 0 && $coordinates["{$prefix}system"] <= Vector::$knownSystems &&
     isset($coordinates["{$prefix}planet"]) && $coordinates["{$prefix}planet"] > 0 && $coordinates["{$prefix}planet"] <= Vector::$knownPlanets;
 }
 
 function uni_planet_teleport_check($user, $planetrow, $new_coordinates = null) {
   try {
-    if($planetrow['planet_teleport_next'] && $planetrow['planet_teleport_next'] > SN_TIME_NOW) {
+    if ($planetrow['planet_teleport_next'] && $planetrow['planet_teleport_next'] > SN_TIME_NOW) {
       throw new exception(classLocale::$lang['ov_teleport_err_cooldown'], ERR_ERROR);
     }
 
-    if(mrc_get_level($user, null, RES_DARK_MATTER) < classSupernova::$config->planet_teleport_cost) {
+    if (mrc_get_level($user, null, RES_DARK_MATTER) < classSupernova::$config->planet_teleport_cost) {
       throw new exception(classLocale::$lang['ov_teleport_err_no_dark_matter'], ERR_ERROR);
     }
 
     // TODO: Replace quick-check with using gathered flying fleet data
-    if(FleetList::fleet_count_incoming($planetrow['galaxy'], $planetrow['system'], $planetrow['planet'])) {
+    if (FleetList::fleet_count_incoming($planetrow['galaxy'], $planetrow['system'], $planetrow['planet'])) {
       throw new exception(classLocale::$lang['ov_teleport_err_fleet'], ERR_ERROR);
     }
 
-    if(is_array($new_coordinates)) {
+    if (is_array($new_coordinates)) {
       $new_coordinates['planet_type'] = PT_PLANET;
       $incoming = DBStaticPlanet::db_planet_by_vector($new_coordinates, '', true, 'id');
-      if($incoming['id']) {
+      if ($incoming['id']) {
         throw new exception(classLocale::$lang['ov_teleport_err_destination_busy'], ERR_ERROR);
       }
     }
@@ -372,7 +372,7 @@ 
       'result'  => ERR_NONE,
       'message' => '',
     );
-  } catch(exception $e) {
+  } catch (exception $e) {
     $response = array(
       'result'  => $e->getCode(),
       'message' => $e->getMessage(),

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/DBStaticFleetACS.php

Spacing +10 added lines, -10 removed lines

@@ -51,16 +51,16 @@
    */
   public static function db_acs_insert($fleetid, $user, $objFleet) {
     doquery("INSERT INTO {{aks}} SET
-          `name` = '" . db_escape(classLocale::$lang['flt_acs_prefix'] . $fleetid) . "',
-          `teilnehmer` = '" . $user['id'] . "',
-          `flotten` = '" . $fleetid . "',
-          `ankunft` = '" . $objFleet->time_arrive_to_target . "',
-          `galaxy` = '" . $objFleet->fleet_end_galaxy . "',
-          `system` = '" . $objFleet->fleet_end_system . "',
-          `planet` = '" . $objFleet->fleet_end_planet . "',
-          `planet_type` = '" . $objFleet->fleet_end_type . "',
-          `eingeladen` = '" . $user['id'] . "',
-          `fleet_end_time` = '" . $objFleet->time_return_to_source . "'");
+          `name` = '" . db_escape(classLocale::$lang['flt_acs_prefix'].$fleetid)."',
+          `teilnehmer` = '" . $user['id']."',
+          `flotten` = '" . $fleetid."',
+          `ankunft` = '" . $objFleet->time_arrive_to_target."',
+          `galaxy` = '" . $objFleet->fleet_end_galaxy."',
+          `system` = '" . $objFleet->fleet_end_system."',
+          `planet` = '" . $objFleet->fleet_end_planet."',
+          `planet_type` = '" . $objFleet->fleet_end_type."',
+          `eingeladen` = '" . $user['id']."',
+          `fleet_end_time` = '" . $objFleet->time_return_to_source."'");
   }
 
   /**

includes/classes/DBStaticNews.php

Spacing +2 added lines, -2 removed lines

@@ -12,7 +12,7 @@ 
 function db_news_insert_set($announce_time, $text, $detail_url, $user) {
   doquery("INSERT INTO {{announce}}
         SET `tsTimeStamp` = FROM_UNIXTIME({$announce_time}), `strAnnounce`='{$text}', detail_url = '{$detail_url}',
-        `user_id` = {$user['id']}, `user_name` = '" . db_escape($user['username']) . "'");
+        `user_id` = {$user['id']}, `user_name` = '".db_escape($user['username'])."'");
 }
 
 function db_survey_insert($announce_id, $survey_question, $survey_until) {
@@ -93,7 +93,7 @@ 
       LEFT JOIN {{survey}} AS s ON s.survey_announce_id = a.idAnnounce
       LEFT JOIN {{users}} AS u ON u.id = a.user_id
     {$query_where}
-    ORDER BY `tsTimeStamp` DESC, idAnnounce" .
+    ORDER BY `tsTimeStamp` DESC, idAnnounce".
     ($query_limit ? " LIMIT {$query_limit}" : ''));
 
   $template->assign_var('NEWS_COUNT', db_num_rows($announce_list));

includes/includes/flt_flying_fleet_handler2.php

Spacing +7 added lines, -11 removed lines

@@ -19,15 +19,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 // Вообще сюда доходить не должно - будет отсекаться на равенстве событий
@@ -45,13 +41,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');
     }
@@ -177,7 +173,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('Обработка миссий');

admin/adm_user_analyze.php

Spacing +2 added lines, -2 removed lines

@@ -10,7 +10,7 @@ 
 define('INSTALL', false);
 define('IN_ADMIN', true);
 
-require('../common.' . substr(strrchr(__FILE__, '.'), 1));
+require('../common.'.substr(strrchr(__FILE__, '.'), 1));
 
 if ($user['authlevel'] < 3) {
   AdminMessage(classLocale::$lang['adm_err_denied']);
@@ -111,7 +111,7 @@ 
   foreach ($value as $interval_data) {
     print("<tr>");
     print("<td>{$user_id}</td><td>{$user_record['username']}</td><td>{$interval_data[0]}</td><td>{$interval_data[1]}</td><td>{$interval_data[2]}</td>");
-    print("<td>" . date(FMT_DATE_TIME_SQL, $user_record['onlinetime']) . "</td>");
+    print("<td>".date(FMT_DATE_TIME_SQL, $user_record['onlinetime'])."</td>");
     print("</tr>");
   }
 }

includes/classes/DbSqlAware.php

Spacing +2 added lines, -2 removed lines

@@ -45,8 +45,8 @@
    */
   protected function quoteStringAsFieldByRef(&$string) {
     $string = $this->stringEscape($string);
-    if ((string)$string && '*' != $string) {
-      $string = '`' . $string . '`';
+    if ((string) $string && '*' != $string) {
+      $string = '`'.$string.'`';
     }
   }
 

includes/classes/DbSqlLiteral.php

Spacing +5 added lines, -5 removed lines

@@ -31,7 +31,7 @@ 
    * @return $this
    */
   public function literal($value) {
-    $this->literal = (string)$value;
+    $this->literal = (string) $value;
 
     return $this;
   }
@@ -64,10 +64,10 @@ 
       $alias = $this->aliasFromField($functionName, $field);
     }
 
-    $this->literal = strtoupper($functionName) . '(' . $this->quoteField($field) . ')';
+    $this->literal = strtoupper($functionName).'('.$this->quoteField($field).')';
 
     if (self::SQL_LITERAL_ALIAS_NONE !== $alias && !empty($alias)) {
-      $this->literal .= ' AS `' . $alias . '`';
+      $this->literal .= ' AS `'.$alias.'`';
     }
 
     return $this;
@@ -124,10 +124,10 @@ 
       $alias = $this->aliasFromField($functionName, $field);
     }
 
-    $this->literal = $this->quoteField($field) . ' IS NULL';
+    $this->literal = $this->quoteField($field).' IS NULL';
 
     if (!empty($alias)) {
-      $this->literal .= ' AS `' . $alias . '`';
+      $this->literal .= ' AS `'.$alias.'`';
     }
 
     return $this;