supernova-ws / SuperNova

language/ru/buddy.mo.php

Braces +3 added lines, -1 removed lines

@@ -26,7 +26,9 @@
 * DO NOT CHANGE
 */
 
-if (!defined('INSIDE')) die();
+if (!defined('INSIDE')) {
+  die();
+}
 
 
 $a_lang_array = (array(

classes/oldArrayAccessNd.php

Spacing +13 added lines, -13 removed lines

@@ -38,8 +38,8 @@ 
     !is_array($offset) ? $offset = array($offset) : false;
 
     $current_leaf = $this->__get(reset($offset));
-    while(($leaf_index = next($offset)) !== false) {
-      if(!isset($current_leaf) || !is_array($current_leaf) || !isset($current_leaf[$leaf_index])) {
+    while (($leaf_index = next($offset)) !== false) {
+      if (!isset($current_leaf) || !is_array($current_leaf) || !isset($current_leaf[$leaf_index])) {
         unset($current_leaf);
         break;
       }
@@ -64,9 +64,9 @@ 
 
     !is_array($offset) ? $offset = array($offset) : false;
 
-    if($this->offsetExists($offset)) {
+    if ($this->offsetExists($offset)) {
       $result = $this->__get(reset($offset));
-      while(($leaf_index = next($offset)) !== false) {
+      while (($leaf_index = next($offset)) !== false) {
         $result = $result[$leaf_index];
       }
     }
@@ -91,12 +91,12 @@ 
    */
   public function offsetSet($offset, $value = null) {
     // Если нет никакого индекса - значит нечего записывать
-    if(!isset($offset) || (is_array($offset) && empty($offset))) {
+    if (!isset($offset) || (is_array($offset) && empty($offset))) {
       return;
     }
 
     // Если в массиве индекса только один элемент - значит это просто индекс
-    if(is_array($offset) && count($offset) == 1) {
+    if (is_array($offset) && count($offset) == 1) {
       // Разворачиваем его в индекс
       $offset = array(reset($offset) => $value);
       unset($value);
@@ -104,16 +104,16 @@ 
     }
 
     // Адресация многомерного массива через массив индексов в $option
-    if(is_array($offset) && isset($value)) {
+    if (is_array($offset) && isset($value)) {
       // TODO - а не переделать ли это всё на __isset() ??
       // Вытаскиваем корневой элемент
       $root = $this->__get(reset($offset));
       $current_leaf = &$root;
-      while(($leaf_index = next($offset)) !== false) {
+      while (($leaf_index = next($offset)) !== false) {
         !is_array($current_leaf[$leaf_index]) ? $current_leaf[$leaf_index] = array() : false;
         $current_leaf = &$current_leaf[$leaf_index];
       }
-      if($current_leaf != $value) {
+      if ($current_leaf != $value) {
         $current_leaf = $value;
         // Сохраняем данные с корня
         $this->__set(reset($offset), $root);
@@ -122,7 +122,7 @@ 
       // Пакетная запись из массива ключ -> значение
       !is_array($offset) ? $offset = array($offset => $value) : false;
 
-      foreach($offset as $key => $value) {
+      foreach ($offset as $key => $value) {
         $this->__get($key) !== $value ? $this->__set($key, $value) : false;
       }
     }
@@ -143,18 +143,18 @@ 
    */
   public function offsetUnset($offset) {
     // Если нет никакого индекса - значит нечего записывать
-    if(!isset($offset) || (is_array($offset) && empty($offset))) {
+    if (!isset($offset) || (is_array($offset) && empty($offset))) {
       return;
     }
 
     !is_array($offset) ? $offset = array($offset) : false;
 
-    if($this->offsetExists($offset)) {
+    if ($this->offsetExists($offset)) {
       // Перематываем массив в конец
       $key_to_delete = end($offset);
       $parent_offset = $offset;
       array_pop($parent_offset);
-      if(!count($parent_offset)) {
+      if (!count($parent_offset)) {
         // В массиве был один элемент - мы удаляем в корне. Просто удаляем элемент
         $this->__unset($key_to_delete);
       } else {

classes/RequestInfo.php

Spacing +9 added lines, -9 removed lines

@@ -89,15 +89,15 @@ 
     // Инфа об устройстве и браузере - общая для всех
     sn_db_transaction_start();
     $this->device_cypher = $_COOKIE[SN_COOKIE_D];
-    if($this->device_cypher) {
+    if ($this->device_cypher) {
       $cypher_safe = db_escape($this->device_cypher);
       $device_id = doquery("SELECT `device_id` FROM {{security_device}} WHERE `device_cypher` = '{$cypher_safe}' LIMIT 1 FOR UPDATE", true);
-      if(!empty($device_id['device_id'])) {
+      if (!empty($device_id['device_id'])) {
         $this->device_id = $device_id['device_id'];
       }
     }
 
-    if($this->device_id <= 0) {
+    if ($this->device_id <= 0) {
       do {
         $cypher_safe = db_escape($this->device_cypher = sys_random_string());
         $row = doquery("SELECT `device_id` FROM {{security_device}} WHERE `device_cypher` = '{$cypher_safe}' LIMIT 1 FOR UPDATE", true);
@@ -118,10 +118,10 @@ 
     $this->page_address_id = db_get_set_unique_id_value($this->page_address, 'url_id', 'security_url', 'url_string');
     sn_db_transaction_commit();
 
-    if($this->write_full_url) {
+    if ($this->write_full_url) {
       sn_db_transaction_start();
       $this->page_url = substr($_SERVER['REQUEST_URI'], strlen(SN_ROOT_RELATIVE));
-      if(strpos($_SERVER['REQUEST_URI'], '/simulator.php') === 0) {
+      if (strpos($_SERVER['REQUEST_URI'], '/simulator.php') === 0) {
         $this->page_url = '/simulator.php';
       }
       $this->page_url_id = db_get_set_unique_id_value($this->page_url, 'url_id', 'security_url', 'url_string');
@@ -144,7 +144,7 @@ 
    */
   public function db_security_entry_insert($user_id_unsafe) {
     // TODO $user_id = !empty(self::$user['id']) ? self::$user['id'] : 'NULL';
-    if(empty($user_id_unsafe)) {
+    if (empty($user_id_unsafe)) {
       // self::flog('Нет ИД пользователя');
       return true;
     }
@@ -167,7 +167,7 @@ 
   public function db_counter_insert($user_id_unsafe) {
     global $config, $sys_stop_log_hit, $is_watching;
 
-    if($sys_stop_log_hit || !$config->game_counter) {
+    if ($sys_stop_log_hit || !$config->game_counter) {
       return;
     }
 
@@ -183,14 +183,14 @@ 
 //      $this->ip_v4_int . ", '{$proxy_safe}', " . $this->page_address_id . ", " . $this->page_url_id . ");");
     doquery(
       "INSERT INTO {{counter}} SET
-        `visit_time` = '" . SN_TIME_SQL. "',
+        `visit_time` = '" . SN_TIME_SQL . "',
         `user_id` = {$user_id_safe},
         `device_id` = {$this->device_id},
         `browser_id` = {$this->browser_id},
         `user_ip` = {$this->ip_v4_int},
         `user_proxy` = '{$proxy_safe}',
         `page_url_id` = {$this->page_address_id}" .
-        ($this->write_full_url ? ", `plain_url_id` = {$this->page_url_id}" : '' ).
+        ($this->write_full_url ? ", `plain_url_id` = {$this->page_url_id}" : '') .
       ";");
 
     $is_watching = false;

includes/db/db_queries.php

Spacing +9 added lines, -9 removed lines

@@ -103,7 +103,7 @@ 
 
 function db_unit_records_sum($unit_id, $user_skip_list_unit)
 {
-  return doquery (
+  return doquery(
     "SELECT unit_player_id, username, sum(unit_level) as unit_level
           FROM {{unit}} JOIN {{users}} AS u ON u.id = unit_player_id
           WHERE unit_player_id != 0 AND unit_snid = {$unit_id} {$user_skip_list_unit}
@@ -115,7 +115,7 @@ 
 
 function db_unit_records_plain($unit_id, $user_skip_list_unit)
 {
-  return doquery (
+  return doquery(
     "SELECT unit_player_id, username, unit_level
           FROM {{unit}} JOIN {{users}} AS u ON u.id = unit_player_id
           WHERE unit_player_id != 0 AND unit_snid = {$unit_id} {$user_skip_list_unit}
@@ -125,7 +125,7 @@ 
 }
 
 function db_stat_list_statistic($who, $is_common_stat, $Rank, $start, $source = false) {
-  if(!$source) {
+  if (!$source) {
     $source = array(
       'statpoints' => 'statpoints',
       'users' => 'users',
@@ -146,8 +146,8 @@ 
     );
   }
 
-  if($who == 1) {
-    if($is_common_stat) { // , UNIX_TIMESTAMP(CONCAT(YEAR(CURRENT_DATE), DATE_FORMAT(`user_birthday`, '-%m-%d'))) AS `nearest_birthday`
+  if ($who == 1) {
+    if ($is_common_stat) { // , UNIX_TIMESTAMP(CONCAT(YEAR(CURRENT_DATE), DATE_FORMAT(`user_birthday`, '-%m-%d'))) AS `nearest_birthday`
       $query_str =
         "SELECT
       @rownum:=@rownum+1 rownum, subject.{$source['id']} as `id`, sp.{$Rank}_rank as rank, sp.{$Rank}_old_rank as rank_old, sp.{$Rank}_points as points, subject.{$source['username']} as `name`, subject.*
@@ -161,7 +161,7 @@ 
     ORDER BY
       sp.`{$Rank}_rank`, subject.{$source['id']}
     LIMIT
-      ". $start .",100;";
+      " . $start . ",100;";
     } else { // , UNIX_TIMESTAMP(CONCAT(YEAR(CURRENT_DATE), DATE_FORMAT(`user_birthday`, '-%m-%d'))) AS `nearest_birthday`
       $query_str =
         "SELECT
@@ -174,7 +174,7 @@ 
     ORDER BY
       subject.{$Rank} DESC, subject.{$source['id']}
     LIMIT
-      ". $start .",100;";
+      " . $start . ",100;";
     }
   } else {
     // TODO
@@ -191,7 +191,7 @@ 
   ORDER BY
     sp.`{$Rank}_rank`, subject.id
   LIMIT
-    ". $start .",100;";
+    " . $start . ",100;";
   }
 
   return doquery($query_str);
@@ -277,7 +277,7 @@ 
 function db_get_set_unique_id_value($current_value_unsafe, $db_id_field_name, $db_table_name, $db_value_field_name) {
   $current_value_safe = db_escape($current_value_unsafe);
   $value_id = doquery("SELECT `{$db_id_field_name}` AS id_field FROM {{{$db_table_name}}} WHERE `{$db_value_field_name}` = '{$current_value_safe}' LIMIT 1 FOR UPDATE", true);
-  if(!isset($value_id['id_field']) || !$value_id['id_field']) {
+  if (!isset($value_id['id_field']) || !$value_id['id_field']) {
     doquery("INSERT INTO {{{$db_table_name}}} (`{$db_value_field_name}`) VALUES ('{$current_value_safe}');");
     $variable_id = db_insert_id();
   } else {

Braces +11 added lines, -22 removed lines

@@ -6,8 +6,7 @@ 
 require_once('db_queries_fleet.php');
 
 
-function db_planet_list_admin_list($table_parent_columns, $planet_active, $active_time, $planet_type)
-{
+function db_planet_list_admin_list($table_parent_columns, $planet_active, $active_time, $planet_type) {
   return doquery(
     "SELECT p.*, u.username" . ($table_parent_columns ? ', p1.name AS parent_name' : '') .
     " FROM {{planets}} AS p
@@ -16,8 +15,7 @@ 
     " WHERE " . ($planet_active ? "p.last_update >= {$active_time}" : "p.planet_type = {$planet_type}"));
 }
 
-function db_planet_list_search($searchtext)
-{
+function db_planet_list_search($searchtext) {
   return doquery(
     "SELECT
       p.galaxy, p.system, p.planet, p.planet_type, p.name as planet_name,
@@ -37,8 +35,7 @@ 
 
 
 
-function db_user_list_search($searchtext)
-{
+function db_user_list_search($searchtext) {
   return doquery(
     "SELECT
       pn.player_name, u.id as uid, u.username, u.ally_id, u.id_planet, u.total_points, u.total_rank,
@@ -56,8 +53,7 @@ 
   );
 }
 
-function db_buddy_list_by_user($user_id)
-{
+function db_buddy_list_by_user($user_id) {
 //  return ($user_id = intval($user_id)) ? doquery(
   return ($user_id = idval($user_id)) ? doquery(
     "SELECT
@@ -87,8 +83,7 @@ 
 
 
 
-function db_unit_records_sum($unit_id, $user_skip_list_unit)
-{
+function db_unit_records_sum($unit_id, $user_skip_list_unit) {
   return doquery (
     "SELECT unit_player_id, username, sum(unit_level) as unit_level
           FROM {{unit}} JOIN {{users}} AS u ON u.id = unit_player_id
@@ -99,8 +94,7 @@ 
     , true);
 }
 
-function db_unit_records_plain($unit_id, $user_skip_list_unit)
-{
+function db_unit_records_plain($unit_id, $user_skip_list_unit) {
   return doquery (
     "SELECT unit_player_id, username, unit_level
           FROM {{unit}} JOIN {{users}} AS u ON u.id = unit_player_id
@@ -184,15 +178,13 @@ 
 }
 
 
-function db_stat_list_delete_ally_player()
-{
+function db_stat_list_delete_ally_player() {
   return doquery('DELETE s FROM `{{statpoints}}` AS s JOIN `{{users}}` AS u ON u.id = s.id_owner WHERE s.id_ally IS NULL AND u.user_as_ally IS NOT NULL');
 }
 
 
 
-function db_chat_player_list_online($chat_refresh_rate, $ally_add)
-{
+function db_chat_player_list_online($chat_refresh_rate, $ally_add) {
   $sql_date = SN_TIME_NOW - $chat_refresh_rate * 2;
 
   return doquery(
@@ -206,13 +198,11 @@ 
     ORDER BY authlevel DESC, `username`");
 }
 
-function db_referrals_list_by_id($user_id)
-{
+function db_referrals_list_by_id($user_id) {
   return doquery("SELECT r.*, u.username, u.register_time FROM {{referrals}} AS r LEFT JOIN {{users}} AS u ON u.id = r.id WHERE id_partner = {$user_id}");
 }
 
-function db_message_list_admin_by_type($int_type_selected, $StartRec)
-{
+function db_message_list_admin_by_type($int_type_selected, $StartRec) {
   return doquery("SELECT
   message_id as `ID`,
   message_from as `FROM`,
@@ -231,8 +221,7 @@ 
 }
 
 
-function db_message_insert_all($message_type, $from, $subject, $text)
-{
+function db_message_insert_all($message_type, $from, $subject, $text) {
   return doquery($QryInsertMessage = 'INSERT INTO {{messages}} (`message_owner`, `message_sender`, `message_time`, `message_type`, `message_from`, `message_subject`, `message_text`) ' .
     "SELECT `id`, 0, unix_timestamp(now()), {$message_type}, '{$from}', '{$subject}', '{$text}' FROM {{users}}");
 }

includes/db/db_helpers.php

Spacing +7 added lines, -7 removed lines

@@ -27,19 +27,19 @@ 
  */
 function db_set_make_safe_string($set, $delta = false) {
   $set_safe = array();
-  foreach($set as $field => $value) {
-    if(empty($field)) {
+  foreach ($set as $field => $value) {
+    if (empty($field)) {
       continue;
     }
 
     $field = '`' . db_escape($field) . '`';
     $new_value = $value;
-    if($value === null) {
+    if ($value === null) {
       $new_value = 'NULL';
-    } elseif(is_string($value) && (string)($new_value = floatval($value)) != (string)$value) {
+    } elseif (is_string($value) && (string) ($new_value = floatval($value)) != (string) $value) {
       // non-float
       $new_value = '"' . db_escape($value) . '"';
-    } elseif($delta) {
+    } elseif ($delta) {
       // float and DELTA-set
       $new_value = "{$field} + ({$new_value})";
     }
@@ -59,8 +59,8 @@ 
  */
 function missile_list_convert_to_fleet(&$missile_db_list, &$fleet_db_list) {
   // Missile attack
-  foreach($missile_db_list as $irak) {
-    if($irak['fleet_end_time'] >= SN_TIME_NOW) {
+  foreach ($missile_db_list as $irak) {
+    if ($irak['fleet_end_time'] >= SN_TIME_NOW) {
       $irak['fleet_start_type'] = PT_PLANET;
       $planet_start = DBStaticPlanet::db_planet_by_vector($irak, 'fleet_start_', false, 'name');
       $irak['fleet_id'] = -$irak['id'];

includes/general_pname.php

Braces +2 added lines, -4 removed lines

@@ -2,12 +2,10 @@
 
 // Эти функции будут переписаны по добавлению инфы в БД
 
-function pname_factory_production_field_name($factory_unit_id)
-{
+function pname_factory_production_field_name($factory_unit_id) {
   return get_unit_param($factory_unit_id, P_NAME) . '_porcent';
 }
 
-function pname_resource_name($resource_id)
-{
+function pname_resource_name($resource_id) {
   return get_unit_param($resource_id, P_NAME);
 }
\ No newline at end of file

includes/functions/int_fleet_events.php

Spacing +11 added lines, -11 removed lines

@@ -8,23 +8,23 @@ 
   $fleet_events = array();
   $fleet_number = 0;
 
-  if(empty($fleet_list))
+  if (empty($fleet_list))
   {
     return;
   }
 
-  foreach($fleet_list as $fleet)
+  foreach ($fleet_list as $fleet)
   {
     $planet_start_type = $fleet['fleet_start_type'] == PT_MOON ? PT_MOON : PT_PLANET;
     $planet_start = DBStaticPlanet::db_planet_by_gspt($fleet['fleet_start_galaxy'], $fleet['fleet_start_system'], $fleet['fleet_start_planet'], $planet_start_type, false, 'name');
     $fleet['fleet_start_name'] = $planet_start['name'];
 
     $planet_end_type = $fleet['fleet_end_type'] == PT_MOON ? PT_MOON : PT_PLANET;
-    if($fleet['fleet_end_planet'] > $config->game_maxPlanet)
+    if ($fleet['fleet_end_planet'] > $config->game_maxPlanet)
     {
       $fleet['fleet_end_name'] = $lang['ov_fleet_exploration'];
     }
-    elseif($fleet['fleet_mission'] == MT_COLONIZE)
+    elseif ($fleet['fleet_mission'] == MT_COLONIZE)
     {
       $fleet['fleet_end_name'] = $lang['ov_fleet_colonization'];
     }
@@ -34,7 +34,7 @@ 
       $fleet['fleet_end_name'] = $planet_end['name'];
     }
 
-    if($fleet['fleet_start_time'] > SN_TIME_NOW && $fleet['fleet_mess'] == 0 && $fleet['fleet_mission'] != MT_MISSILE &&
+    if ($fleet['fleet_start_time'] > SN_TIME_NOW && $fleet['fleet_mess'] == 0 && $fleet['fleet_mission'] != MT_MISSILE &&
       ($planet_scanned === false
         ||
         (
@@ -49,12 +49,12 @@ 
       $fleet_events[] = flt_register_fleet_event($fleet, 0, $planet_end_type);
     }
 
-    if($fleet['fleet_end_stay'] > SN_TIME_NOW && $fleet['fleet_mess'] == 0 && $planet_scanned === false && $fleet['fleet_mission'] != MT_MISSILE)
+    if ($fleet['fleet_end_stay'] > SN_TIME_NOW && $fleet['fleet_mess'] == 0 && $planet_scanned === false && $fleet['fleet_mission'] != MT_MISSILE)
     {
       $fleet_events[] = flt_register_fleet_event($fleet, 1, $planet_end_type);
     }
 
-    if(
+    if (
       $fleet['fleet_end_time'] > SN_TIME_NOW && $fleet['fleet_mission'] != MT_MISSILE && ($fleet['fleet_mess'] == 1 || ($fleet['fleet_mission'] != MT_RELOCATE && $fleet['fleet_mission'] != MT_COLONIZE)) &&
       (
         ($planet_scanned === false && $fleet['fleet_owner'] == $user['id'])
@@ -71,7 +71,7 @@ 
       $fleet_events[] = flt_register_fleet_event($fleet, 2, $planet_end_type);
     }
     
-    if($fleet['fleet_mission'] == MT_MISSILE)
+    if ($fleet['fleet_mission'] == MT_MISSILE)
     {
       $fleet_events[] = flt_register_fleet_event($fleet, 3, $planet_end_type);
     }
@@ -84,7 +84,7 @@ 
 {
   global $user, $planetrow, $fleet_number;
 
-  switch($fleet['ov_label'] = $ov_label)
+  switch ($fleet['ov_label'] = $ov_label)
   {
     case 0:
       $fleet['event_time'] = $fleet['fleet_start_time'];
@@ -116,9 +116,9 @@ 
 
   }
 
-  $fleet['ov_this_planet'] = $is_this_planet;// || $planet_scanned != false;
+  $fleet['ov_this_planet'] = $is_this_planet; // || $planet_scanned != false;
 
-  if($fleet['fleet_owner'] == $user['id'])
+  if ($fleet['fleet_owner'] == $user['id'])
   {
     $user_data = $user;
   }

Upper-Lower-Casing +9 added lines, -9 removed lines

@@ -89,18 +89,18 @@ 
     case 0:
       $fleet['event_time'] = $fleet['fleet_start_time'];
       $is_this_planet = (
-        ($planetrow['galaxy'] == $fleet['fleet_end_galaxy']) AND
-        ($planetrow['system'] == $fleet['fleet_end_system']) AND
-        ($planetrow['planet'] == $fleet['fleet_end_planet']) AND
+        ($planetrow['galaxy'] == $fleet['fleet_end_galaxy']) and
+        ($planetrow['system'] == $fleet['fleet_end_system']) and
+        ($planetrow['planet'] == $fleet['fleet_end_planet']) and
         ($planetrow['planet_type'] == $planet_end_type));
     break;
 
     case 1:
       $fleet['event_time'] = $fleet['fleet_end_stay'];
       $is_this_planet = (
-        ($planetrow['galaxy'] == $fleet['fleet_end_galaxy']) AND
-        ($planetrow['system'] == $fleet['fleet_end_system']) AND
-        ($planetrow['planet'] == $fleet['fleet_end_planet']) AND
+        ($planetrow['galaxy'] == $fleet['fleet_end_galaxy']) and
+        ($planetrow['system'] == $fleet['fleet_end_system']) and
+        ($planetrow['planet'] == $fleet['fleet_end_planet']) and
         ($planetrow['planet_type'] == $planet_end_type));
     break;
 
@@ -108,9 +108,9 @@ 
     case 3:
       $fleet['event_time'] = $fleet['fleet_end_time'];
       $is_this_planet = (
-        ($planetrow['galaxy'] == $fleet['fleet_start_galaxy']) AND
-        ($planetrow['system'] == $fleet['fleet_start_system']) AND
-        ($planetrow['planet'] == $fleet['fleet_start_planet']) AND
+        ($planetrow['galaxy'] == $fleet['fleet_start_galaxy']) and
+        ($planetrow['system'] == $fleet['fleet_start_system']) and
+        ($planetrow['planet'] == $fleet['fleet_start_planet']) and
         ($planetrow['planet_type'] == $fleet['fleet_start_type']));
     break;
 

Braces +6 added lines, -12 removed lines

@@ -1,8 +1,7 @@ 
 <?php
 
 
-function flt_parse_fleets_to_events($fleet_list, $planet_scanned = false)
-{
+function flt_parse_fleets_to_events($fleet_list, $planet_scanned = false) {
   global $config, $user, $fleet_number, $lang;
 
   $fleet_events = array();
@@ -23,12 +22,10 @@ 
     if($fleet['fleet_end_planet'] > $config->game_maxPlanet)
     {
       $fleet['fleet_end_name'] = $lang['ov_fleet_exploration'];
-    }
-    elseif($fleet['fleet_mission'] == MT_COLONIZE)
+    } elseif($fleet['fleet_mission'] == MT_COLONIZE)
     {
       $fleet['fleet_end_name'] = $lang['ov_fleet_colonization'];
-    }
-    else
+    } else
     {
       $planet_end = DBStaticPlanet::db_planet_by_gspt($fleet['fleet_end_galaxy'], $fleet['fleet_end_system'], $fleet['fleet_end_planet'], $planet_end_type, false, 'name');
       $fleet['fleet_end_name'] = $planet_end['name'];
@@ -80,8 +77,7 @@ 
   return $fleet_events;
 }
 
-function flt_register_fleet_event($fleet, $ov_label, $planet_end_type)
-{
+function flt_register_fleet_event($fleet, $ov_label, $planet_end_type) {
   global $user, $planetrow, $fleet_number;
 
   switch($fleet['ov_label'] = $ov_label)
@@ -121,8 +117,7 @@ 
   if($fleet['fleet_owner'] == $user['id'])
   {
     $user_data = $user;
-  }
-  else
+  } else
   {
     $user_data = db_user_by_id($fleet['fleet_owner']);
   }
@@ -134,8 +129,7 @@ 
  * @param array    $planetrow
  * @param template $template
  */
-function int_planet_pretemplate($planetrow, &$template)
-{
+function int_planet_pretemplate($planetrow, &$template) {
   global $lang, $user;
 
   $governor_id = $planetrow['PLANET_GOVERNOR_ID'];

includes/functions/flt_mission_missile.php

Braces +2 added lines, -4 removed lines

@@ -4,8 +4,7 @@ 
 // Open Source
 // V1
 //
-function COE_missileAttack($defenceTech, $attackerTech, $MIPs, $structures, $targetedStructure = '0')
-{
+function COE_missileAttack($defenceTech, $attackerTech, $MIPs, $structures, $targetedStructure = '0') {
   // Here we select which part of defense should take damage: structure or shield
   // $damageTo = P_SHIELD;
   // $damageTo = P_STRUCTURE;
@@ -34,8 +33,7 @@ 
     $structsDestroyed = min( floor($MIPDamage/$damageDone), $structures[$targetedStructure][0] );
     $structures[$targetedStructure][0] -= $structsDestroyed;
     $MIPDamage -= $structsDestroyed*$damageDone;
-  }
-  else
+  } else
   {
     // REALLY random attack
     $can_be_damaged = sn_get_groups('defense_active');

Spacing +18 added lines, -18 removed lines

@@ -13,7 +13,7 @@ 
 
   $mip_data = get_unit_param(UNIT_DEF_MISSILE_INTERPLANET);
   $MIPDamage = floor(mrc_modify_value($attackerTech, false, TECH_WEAPON, $MIPs * $mip_data[P_ATTACK] * mt_rand(80, 120) / 100));
-  foreach($structures as $key => $structure)
+  foreach ($structures as $key => $structure)
   {
     $unit_info = get_unit_param($key);
     $amplify = isset($mip_data[P_AMPLIFY][$key]) ? $mip_data[P_AMPLIFY][$key] : 1;
@@ -31,9 +31,9 @@ 
   {
     //attacking only selected structure
     $damageDone = $structures[$targetedStructure][$damageTo];
-    $structsDestroyed = min( floor($MIPDamage/$damageDone), $structures[$targetedStructure][0] );
+    $structsDestroyed = min(floor($MIPDamage / $damageDone), $structures[$targetedStructure][0]);
     $structures[$targetedStructure][0] -= $structsDestroyed;
-    $MIPDamage -= $structsDestroyed*$damageDone;
+    $MIPDamage -= $structsDestroyed * $damageDone;
   }
   else
   {
@@ -44,16 +44,16 @@ 
     do
     {
       // finding is there any structure that can be damaged with leftovers of $MIPDamage
-      foreach($can_be_damaged as $key => $unit_id)
+      foreach ($can_be_damaged as $key => $unit_id)
       {
 //debug($structures[$unit_id][0]);
 //debug($structures[$unit_id][$damageTo], $MIPDamage);
-        if($structures[$unit_id][0] <= 0 || $structures[$unit_id][$damageTo] > $MIPDamage)
+        if ($structures[$unit_id][0] <= 0 || $structures[$unit_id][$damageTo] > $MIPDamage)
         {
           unset($can_be_damaged[$key]);
         }
       }
-      if(empty($can_be_damaged))
+      if (empty($can_be_damaged))
       {
         break;
       }
@@ -72,7 +72,7 @@ 
 //debug($destroyed, 'Actually destroyed');
 
 //print('<hr>');
-    } while($MIPDamage > 0 && !empty($can_be_damaged));
+    } while ($MIPDamage > 0 && !empty($can_be_damaged));
 //debug($MIPDamage, 'MIPDamage left');
   }
 //debug($structures);//die();
@@ -87,8 +87,8 @@ 
     $crystal += $destroyed * $unit_info[P_COST][RES_CRYSTAL] / 4;
   }
 
-  $return['structures'] = $structures;     // Structures left after attack
-  $return['metal']      = floor($metal);   // Metal scraps
+  $return['structures'] = $structures; // Structures left after attack
+  $return['metal']      = floor($metal); // Metal scraps
   $return['crystal']    = floor($crystal); // Crystal scraps
 
   return $return;
@@ -112,7 +112,7 @@ 
 
   $iraks = doquery("SELECT * FROM {{iraks}} WHERE `fleet_end_time` <= " . SN_TIME_NOW . " FOR UPDATE;");
 
-  while($fleetRow = db_fetch($iraks)) {
+  while ($fleetRow = db_fetch($iraks)) {
     set_time_limit(15);
     $db_changeset = array();
 
@@ -128,9 +128,9 @@ 
 
     $rowAttacker = db_user_by_id($fleetRow['fleet_owner'], true);
 
-    if($target_planet_row['id']) {
+    if ($target_planet_row['id']) {
       $planetDefense = array();
-      foreach(sn_get_groups('defense_active') as $unit_id) {
+      foreach (sn_get_groups('defense_active') as $unit_id) {
         $planetDefense[$unit_id] = array(mrc_get_level($targetUser, $target_planet_row, $unit_id, true, true));
       }
 
@@ -141,23 +141,23 @@ 
         $message = $lang['mip_all_destroyed'];
         $db_changeset['unit'][] = OldDbChangeSet::db_changeset_prepare_unit(UNIT_DEF_MISSILE_INTERCEPTOR, -$missiles, $targetUser, $target_planet_row['id']);
       } else {
-        if($interceptors) {
+        if ($interceptors) {
           $message = sprintf($lang['mip_destroyed'], $interceptors);
           $db_changeset['unit'][] = OldDbChangeSet::db_changeset_prepare_unit(UNIT_DEF_MISSILE_INTERCEPTOR, -$interceptors, $targetUser, $target_planet_row['id']);
         }
 
         $attackResult = COE_missileAttack($targetUser, $rowAttacker, $missiles - $interceptors, $planetDefense, $fleetRow['primaer']);
 
-        foreach($attackResult['structures'] as $key => $structure) {
+        foreach ($attackResult['structures'] as $key => $structure) {
           $destroyed = $planetDefense[$key][0] - $structure[0];
-          if($destroyed) {
+          if ($destroyed) {
             $db_changeset['unit'][] = OldDbChangeSet::db_changeset_prepare_unit($key, -$destroyed, $targetUser, $target_planet_row['id']);
 
             $message .= "&nbsp;&nbsp;{$lang['tech'][$key]} - {$destroyed} {$lang['quantity']}<br>";
           }
         }
 
-        if(!empty($message)) {
+        if (!empty($message)) {
           $message = $lang['mip_defense_destroyed'] . $message . "{$lang['mip_recycled']}{$lang['Metal']}: {$attackResult['metal']}, {$lang['Crystal']}: {$attackResult['crystal']}<br>";
 
           DBStaticPlanet::db_planet_set_by_id($target_planet_row['id'], "`metal` = `metal` + {$attackResult['metal']}, `crystal` = `crystal` + {$attackResult['crystal']}");
@@ -174,8 +174,8 @@ 
 
       empty($message) ? $message = $lang['mip_no_defense'] : false;
 
-      msg_send_simple_message ( $fleetRow['fleet_owner'], '', SN_TIME_NOW, MSG_TYPE_SPY, $lang['mip_sender_amd'], $lang['mip_subject_amd'], $message_vorlage . $message );
-      msg_send_simple_message ( $fleetRow['fleet_target_owner'], '', SN_TIME_NOW, MSG_TYPE_SPY, $lang['mip_sender_amd'], $lang['mip_subject_amd'], $message_vorlage . $message );
+      msg_send_simple_message($fleetRow['fleet_owner'], '', SN_TIME_NOW, MSG_TYPE_SPY, $lang['mip_sender_amd'], $lang['mip_subject_amd'], $message_vorlage . $message);
+      msg_send_simple_message($fleetRow['fleet_target_owner'], '', SN_TIME_NOW, MSG_TYPE_SPY, $lang['mip_sender_amd'], $lang['mip_subject_amd'], $message_vorlage . $message);
     }
     doquery("DELETE FROM {{iraks}} WHERE id = '{$fleetRow['id']}';");
   }

includes/functions/rpg_points.php

Braces +6 added lines, -12 removed lines

@@ -161,8 +161,7 @@ 
   return $rows_affected;
 }
 
-function rpg_level_up(&$user, $type, $xp_to_add = 0)
-{
+function rpg_level_up(&$user, $type, $xp_to_add = 0) {
   $q = 1.03;
 
   switch($type)
@@ -223,27 +222,22 @@ 
   }
 }
 
-function rpg_xp_for_level($level, $b1, $q)
-{
+function rpg_xp_for_level($level, $b1, $q) {
   return floor($b1 * (pow($q, $level) - 1)/($q - 1));
 }
 
-function rpg_get_miner_xp($level)
-{
+function rpg_get_miner_xp($level) {
   return rpg_xp_for_level($level, 50, 1.03);
 }
 
-function RPG_get_raider_xp($level)
-{
+function RPG_get_raider_xp($level) {
   return rpg_xp_for_level($level, 10, 1.03);
 }
 
-function rpg_get_tech_xp($level)
-{
+function rpg_get_tech_xp($level) {
   return rpg_xp_for_level($level, 50, 1.03);
 }
 
-function rpg_get_explore_xp($level)
-{
+function rpg_get_explore_xp($level) {
   return rpg_xp_for_level($level, 10, 1.05);
 }

Spacing +17 added lines, -17 removed lines

@@ -22,28 +22,28 @@ 
 function rpg_points_change($user_id, $change_type, $dark_matter, $comment = false, $already_changed = false) {
   global $debug, $config, $dm_change_legit, $user;
 
-  if(!$user_id) {
+  if (!$user_id) {
     return false;
   }
 
   $dm_change_legit = true;
   $sn_data_dark_matter_db_name = pname_resource_name(RES_DARK_MATTER);
 
-  if($already_changed) {
+  if ($already_changed) {
     $rows_affected = 1;
   } else {
     $changeset = array();
     $a_user = db_user_by_id($user_id, true);
-    if($dark_matter < 0) {
+    if ($dark_matter < 0) {
       $dark_matter_exists = mrc_get_level($a_user, null, RES_DARK_MATTER, false, true);
       $dark_matter_exists < 0 ? $dark_matter_exists = 0 : false;
       $metamatter_to_reduce = -$dark_matter - $dark_matter_exists;
-      if($metamatter_to_reduce > 0) {
+      if ($metamatter_to_reduce > 0) {
         $metamatter_exists = mrc_get_level($a_user, null, RES_METAMATTER);
-        if($metamatter_exists < $metamatter_to_reduce) {
+        if ($metamatter_exists < $metamatter_to_reduce) {
           $debug->error('Ошибка снятия ТМ - ММ+ТМ меньше, чем сумма для снятия!', 'Ошибка снятия ТМ', LOG_ERR_INT_NOT_ENOUGH_DARK_MATTER);
         }
-        if(is_array($comment)) {
+        if (is_array($comment)) {
           $comment = call_user_func_array('sprintf', $comment);
         }
 //        mm_points_change($user_id, $change_type, -$metamatter_to_reduce, 'ММ в ТМ: ' . (-$dark_matter) . ' ТМ = ' . $dark_matter_exists . ' ТМ + ' . $metamatter_to_reduce . ' ММ. ' . $comment);
@@ -58,9 +58,9 @@ 
     $rows_affected = SN::$db->db_affected_rows();
   }
 
-  if($rows_affected || !$dark_matter) {
+  if ($rows_affected || !$dark_matter) {
     $page_url = db_escape($_SERVER['SCRIPT_NAME']);
-    if(is_array($comment)) {
+    if (is_array($comment)) {
       $comment = call_user_func_array('sprintf', $comment);
     }
     $comment = db_escape($comment);
@@ -74,18 +74,18 @@ 
         {$dark_matter}, '{$comment}', '{$page_url}', {$user_id}
       );");
 
-    if($user['id'] == $user_id) {
+    if ($user['id'] == $user_id) {
       $user['dark_matter'] += $dark_matter;
     }
 
-    if($dark_matter > 0) {
+    if ($dark_matter > 0) {
       $old_referral = doquery("SELECT * FROM {{referrals}} WHERE `id` = {$user_id} LIMIT 1 FOR UPDATE;", '', true);
-      if($old_referral['id']) {
+      if ($old_referral['id']) {
         doquery("UPDATE {{referrals}} SET dark_matter = dark_matter + '{$dark_matter}' WHERE `id` = {$user_id} LIMIT 1;");
         $new_referral = doquery("SELECT * FROM {{referrals}} WHERE `id` = {$user_id} LIMIT 1;", '', true);
 
         $partner_bonus = floor($new_referral['dark_matter'] / $config->rpg_bonus_divisor) - ($old_referral['dark_matter'] >= $config->rpg_bonus_minimum ? floor($old_referral['dark_matter'] / $config->rpg_bonus_divisor) : 0);
-        if($partner_bonus > 0 && $new_referral['dark_matter'] >= $config->rpg_bonus_minimum) {
+        if ($partner_bonus > 0 && $new_referral['dark_matter'] >= $config->rpg_bonus_minimum) {
           rpg_points_change($new_referral['id_partner'], RPG_REFERRAL, $partner_bonus, "Incoming From Referral ID {$user_id}");
         }
       }
@@ -102,7 +102,7 @@ 
 {
   $q = 1.03;
 
-  switch($type)
+  switch ($type)
   {
     case RPG_STRUCTURE:
       $field_level = 'lvl_minier';
@@ -140,19 +140,19 @@ 
 
   $xp = &$user[$field_xp];
 
-  if($xp_to_add)
+  if ($xp_to_add)
   {
     $xp += $xp_to_add;
     db_user_set_by_id($user['id'], "`{$field_xp}` = `{$field_xp}` + '{$xp_to_add}'");
   }
 
   $level = $user[$field_level];
-  while($xp > rpg_xp_for_level($level + 1, $b1, $q))
+  while ($xp > rpg_xp_for_level($level + 1, $b1, $q))
   {
     $level++;
   }
   $level -= $user[$field_level];
-  if($level > 0)
+  if ($level > 0)
   {
     db_user_set_by_id($user['id'], "`{$field_level}` = `{$field_level}` + '{$level}'");
     rpg_points_change($user['id'], $type, $level * 1000, $comment);
@@ -162,7 +162,7 @@ 
 
 function rpg_xp_for_level($level, $b1, $q)
 {
-  return floor($b1 * (pow($q, $level) - 1)/($q - 1));
+  return floor($b1 * (pow($q, $level) - 1) / ($q - 1));
 }
 
 function rpg_get_miner_xp($level)