supernova-ws / SuperNova

time_probe.php

Spacing +4 added lines, -4 removed lines

@@ -10,11 +10,11 @@ 
 $time_server = $time_local  - $time_diff
 */
 
-if($font_size = sys_get_param_str('font_size')) {
-  if(strpos($font_size, '%') !== false) {
+if ($font_size = sys_get_param_str('font_size')) {
+  if (strpos($font_size, '%') !== false) {
     // Размер шрифта в процентах
     $font_size = min(max(floatval($font_size), FONT_SIZE_PERCENT_MIN), FONT_SIZE_PERCENT_MAX) . '%';
-  } elseif(strpos($font_size, 'px') !== false) {
+  } elseif (strpos($font_size, 'px') !== false) {
     // Размер шрифта в пикселях
     $font_size = min(max(floatval($font_size), FONT_SIZE_PIXELS_MIN), FONT_SIZE_PIXELS_MAX) . 'px';
   } else {
@@ -26,7 +26,7 @@ 
   SN::$user_options[PLAYER_OPTION_BASE_FONT_SIZE] = $font_size;
 } else {
   $user_time_diff = playerTimeDiff::user_time_diff_get();
-  if($user_time_diff[PLAYER_OPTION_TIME_DIFF_FORCED]) {
+  if ($user_time_diff[PLAYER_OPTION_TIME_DIFF_FORCED]) {
     $time_diff = intval($user_time_diff[PLAYER_OPTION_TIME_DIFF]);
   } else {
     $user_time_diff = playerTimeDiff::user_time_diff_probe();

classes/SN.php

Braces +12 added lines, -4 removed lines

@@ -419,7 +419,8 @@ 
     $location_info = &static::$location_info[$location_type];
     $id_field = $location_info[P_ID];
     $table_name = $location_info[P_TABLE_NAME];
-    if ($result = static::db_query_update("UPDATE {{{$table_name}}} SET {$set} WHERE `{$id_field}` = {$record_id}")) // TODO Как-то вернуть может быть LIMIT 1 ?
+    if ($result = static::db_query_update("UPDATE {{{$table_name}}} SET {$set} WHERE `{$id_field}` = {$record_id}")) {
+      // TODO Как-то вернуть может быть LIMIT 1 ?
     {
       if (static::$db->db_affected_rows()) {
         // Обновляем данные только если ряд был затронут
@@ -427,6 +428,7 @@ 
 
         // Тут именно так, а не cache_unset - что бы в кэшах автоматически обновилась запись. Будет нужно на будущее
         _SnCacheInternal::$data[$location_type][$record_id] = null;
+    }
         // Вытаскиваем обновленную запись
         static::db_get_record_by_id($location_type, $record_id);
         _SnCacheInternal::cache_clear($location_type, false); // Мягкий сброс - только $queries
@@ -460,9 +462,11 @@ 
     $set = trim($set);
     $table_name = static::$location_info[$location_type][P_TABLE_NAME];
     if ($result = static::db_query_insert("INSERT INTO `{{{$table_name}}}` SET {$set}")) {
-      if (static::$db->db_affected_rows()) // Обновляем данные только если ряд был затронут
+      if (static::$db->db_affected_rows()) {
+        // Обновляем данные только если ряд был затронут
       {
         $record_id = db_insert_id();
+      }
         // Вытаскиваем запись целиком, потому что в $set могли быть "данные по умолчанию"
         $result = static::db_get_record_by_id($location_type, $record_id);
         // Очищаем второстепенные кэши - потому что вставленная запись могла повлиять на результаты запросов или локация или еще чего
@@ -483,10 +487,12 @@ 
     $id_field = $location_info[P_ID];
     $table_name = $location_info[P_TABLE_NAME];
     if ($result = static::db_query_delete("DELETE FROM `{{{$table_name}}}` WHERE `{$id_field}` = {$safe_record_id}")) {
-      if (static::$db->db_affected_rows()) // Обновляем данные только если ряд был затронут
+      if (static::$db->db_affected_rows()) {
+        // Обновляем данные только если ряд был затронут
       {
         _SnCacheInternal::cache_unset($location_type, $safe_record_id);
       }
+      }
     }
 
     return $result;
@@ -500,11 +506,13 @@ 
     $table_name = static::$location_info[$location_type][P_TABLE_NAME];
 
     if ($result = static::db_query_delete("DELETE FROM `{{{$table_name}}}` WHERE {$condition}")) {
-      if (static::$db->db_affected_rows()) // Обновляем данные только если ряд был затронут
+      if (static::$db->db_affected_rows()) {
+        // Обновляем данные только если ряд был затронут
       {
         // Обнуление кэша, потому что непонятно, что поменялось
         _SnCacheInternal::cache_clear($location_type);
       }
+      }
     }
 
     return $result;

common.php

Spacing +7 added lines, -7 removed lines

@@ -12,24 +12,24 @@ 
 global $debug, $template_result, $user, $lang, $planetrow;
 
 // Напоминание для Администрации, что игра отключена
-if($template_result[F_GAME_DISABLE]) {
+if ($template_result[F_GAME_DISABLE]) {
   echo '<div class="global_admin_warning">', $template_result[F_GAME_DISABLE_REASON], '</div>';
 }
 unset($disable_reason);
 
 
-if(defined('IN_ADMIN') && IN_ADMIN === true) {
+if (defined('IN_ADMIN') && IN_ADMIN === true) {
   lng_include('admin');
-} elseif($sys_user_logged_in) {
+} elseif ($sys_user_logged_in) {
   sys_user_vacation($user);
 
   $planet_id = SetSelectedPlanet($user);
 
   // TODO НЕ НУЖНО АЛЬЯНС КАЖДЫЙ РАЗ ОБНОВЛЯТЬ!!!
-  if($user['ally_id']) {
+  if ($user['ally_id']) {
     sn_db_transaction_start();
     \Alliance\Alliance::sn_ali_fill_user_ally($user);
-    if(!$user['ally']['player']['id']) {
+    if (!$user['ally']['player']['id']) {
       // sn_sys_logout(false, true);
       // core_auth::logout(false);
       SN::$auth->logout(false);
@@ -48,7 +48,7 @@ 
   sn_db_transaction_commit();
 
   $planetrow = $global_data['planet'];
-  if(!($planetrow && isset($planetrow['id']) && $planetrow['id'])) {
+  if (!($planetrow && isset($planetrow['id']) && $planetrow['id'])) {
     // sn_sys_logout(false, true);
     // core_auth::logout(false);
     SN::$auth->logout(false);
@@ -63,7 +63,7 @@ 
 sys_user_options_unpack($user);
 
 global $sn_page_name, $sn_mvc;
-if(!empty($sn_mvc['pages'][INITIAL_PAGE][PAGE_OPTION_EARLY_HEADER])) {
+if (!empty($sn_mvc['pages'][INITIAL_PAGE][PAGE_OPTION_EARLY_HEADER])) {
   $title = !empty($sn_mvc['pages'][INITIAL_PAGE][PAGE_OPTION_TITLE]) ? $sn_mvc['pages'][INITIAL_PAGE][PAGE_OPTION_TITLE] : '';
   renderHeader($page, $title, $template_result, false, $user, SN::$config, $lang, $planetrow);
 }

buildings.php

Spacing +2 added lines, -2 removed lines

@@ -21,8 +21,8 @@
 $mode = sys_get_param_escaped('mode');
 $mode = (!$mode || $mode == 'buildings') ? QUE_STRUCTURES : ($mode == 'fleet' ? SUBQUE_FLEET : ($mode == 'defense' ? SUBQUE_DEFENSE : ($mode == 'research' ? QUE_RESEARCH : $mode)));
 
-if($building_sort = sys_get_param_id('sort_elements')) {
-  if(!empty($lang['player_option_building_sort'][$building_sort])) {
+if ($building_sort = sys_get_param_id('sort_elements')) {
+  if (!empty($lang['player_option_building_sort'][$building_sort])) {
     SN::$user_options[array(PLAYER_OPTION_BUILDING_SORT, $mode)] = $building_sort;
     SN::$user_options[array(PLAYER_OPTION_BUILDING_SORT_INVERSE, $mode)] = sys_get_param_id('sort_elements_inverse', 0);
   }

notes.php

Spacing +20 added lines, -20 removed lines

@@ -15,34 +15,34 @@ 
 $template = gettemplate('notes', true);
 
 $result = array();
-if(($result_message = sys_get_param_str('MESSAGE')) && isset($lang[$result_message])) {
+if (($result_message = sys_get_param_str('MESSAGE')) && isset($lang[$result_message])) {
   $result[] = array('STATUS' => sys_get_param_int('STATUS'), 'MESSAGE' => $lang[$result_message]);
 }
 
 $note_id_edit = sys_get_param_id('note_id_edit');
-if(sys_get_param('note_delete')) {
+if (sys_get_param('note_delete')) {
   try {
     $not = '';
     $query_where = '';
-    switch(sys_get_param_str('note_delete_range')) {
+    switch (sys_get_param_str('note_delete_range')) {
       case 'all':
       break;
 
       case 'marked_not':
         $not = 'NOT';
       case 'marked':
-        if(!is_array($notes_marked = sys_get_param('note'))) {
+        if (!is_array($notes_marked = sys_get_param('note'))) {
           throw new exception('note_err_none_selected', ERR_WARNING);
         }
 
         $notes_marked_filtered = array();
-        foreach($notes_marked as $note_id => $note_select) {
-          if($note_select == 'on' && $note_id = idval($note_id)) {
+        foreach ($notes_marked as $note_id => $note_select) {
+          if ($note_select == 'on' && $note_id = idval($note_id)) {
             $notes_marked_filtered[] = $note_id;
           }
         }
 
-        if(empty($notes_marked_filtered)) {
+        if (empty($notes_marked_filtered)) {
           throw new exception('note_err_none_selected', ERR_WARNING);
         }
 
@@ -59,7 +59,7 @@ 
     doquery("DELETE FROM {{notes}} WHERE `owner` = {$user['id']} {$query_where};");
     sn_db_transaction_commit();
     throw new exception($note_id_edit ? 'note_err_none_changed' : 'note_err_none_added', ERR_NONE);
-  } catch(exception $e) {
+  } catch (exception $e) {
     $note_id_edit = 0;
     sn_db_transaction_rollback();
     $result[] = array(
@@ -67,7 +67,7 @@ 
       'MESSAGE' => $lang[$e->getMessage()],
     );
   }
-} elseif(($note_title = sys_get_param_str('note_title')) || ($note_text = sys_get_param_str('note_text'))) {
+} elseif (($note_title = sys_get_param_str('note_title')) || ($note_text = sys_get_param_str('note_text'))) {
   $note_title == db_escape($lang['note_new_title']) ? $note_title = '' : false;
   ($note_text = sys_get_param_str('note_text')) == db_escape($lang['note_new_text']) ? $note_text = '' : false;
 
@@ -76,7 +76,7 @@ 
     $note_system = max(0, min(sys_get_param_id('note_system'), SN::$config->game_maxSystem));
     $note_planet = max(0, min(sys_get_param_id('note_planet'), SN::$config->game_maxPlanet + 1));
 
-    if(!$note_text && !$note_title && !$note_galaxy && !$note_system && !$note_planet) {
+    if (!$note_text && !$note_title && !$note_galaxy && !$note_system && !$note_planet) {
       throw new exception('note_err_note_empty', ERR_WARNING);
     }
 
@@ -85,15 +85,15 @@ 
     $note_sticky = intval(sys_get_param_id('note_sticky')) ? 1 : 0;
 
     sn_db_transaction_start();
-    if($note_id_edit) {
+    if ($note_id_edit) {
       $check_note_id = doquery("SELECT `id`, `owner` FROM {{notes}} WHERE `id` = {$note_id_edit} LIMIT 1 FOR UPDATE", true);
-      if(!$check_note_id) {
+      if (!$check_note_id) {
         throw new exception('note_err_note_not_found', ERR_ERROR);
       }
     }
 
-    if($note_id_edit) {
-      if($check_note_id['owner'] != $user['id']) {
+    if ($note_id_edit) {
+      if ($check_note_id['owner'] != $user['id']) {
         throw new exception('note_err_owner_wrong', ERR_ERROR);
       }
 
@@ -108,7 +108,7 @@ 
     sn_db_transaction_commit();
     sys_redirect('notes.php?STATUS=' . ERR_NONE . '&MESSAGE=' . ($note_id_edit ? 'note_err_none_changed' : 'note_err_none_added'));
 //    throw new exception($note_id_edit ? 'note_err_none_changed' : 'note_err_none_added', ERR_NONE);
-  } catch(exception $e) {
+  } catch (exception $e) {
     $note_id_edit = 0;
     sn_db_transaction_rollback();
     $result[] = array(
@@ -118,7 +118,7 @@ 
   }
 }
 
-if(!$note_id_edit) {
+if (!$note_id_edit) {
   \Note\Note::note_assign($template, array(
     'id' => 0,
     'time' => SN_TIME_NOW,
@@ -131,13 +131,13 @@ 
 
 $note_exist = false;
 $notes_query = doquery("SELECT * FROM {{notes}} WHERE owner={$user['id']} ORDER BY priority DESC, galaxy ASC, system ASC, planet ASC, planet_type ASC, `time` DESC");
-while($note_row = db_fetch($notes_query)) {
+while ($note_row = db_fetch($notes_query)) {
   \Note\Note::note_assign($template, $note_row);
   $note_exist = $note_exist || $note_row['id'] == $note_id_edit;
 }
 $note_id_edit = $note_exist ? $note_id_edit : 0;
 
-foreach($note_priority_classes as $note_priority_id => $note_priority_class) {
+foreach ($note_priority_classes as $note_priority_id => $note_priority_class) {
   $template->assign_block_vars('note_priority', array(
     'ID' => $note_priority_id,
     'CLASS' => $note_priority_classes[$note_priority_id],
@@ -145,14 +145,14 @@ 
   ));
 }
 
-foreach($lang['sys_planet_type'] as $planet_type_id => $planet_type_string) {
+foreach ($lang['sys_planet_type'] as $planet_type_id => $planet_type_string) {
   $template->assign_block_vars('planet_type', array(
     'ID' => $planet_type_id,
     'TEXT' => $planet_type_string,
   ));
 }
 
-foreach($result as $result_data) {
+foreach ($result as $result_data) {
   $template->assign_block_vars('result', $result_data);
 }
 

includes/includes/eco_bld_structures.php

Spacing +35 added lines, -35 removed lines

@@ -18,10 +18,10 @@ 
 function sn_eco_build($que_type, &$auser, &$planet) {
   global $lang, $config, $template_result;
 
-  if($ally_id = sys_get_param_id('ally_id')) {
+  if ($ally_id = sys_get_param_id('ally_id')) {
     define('SN_IN_ALLY', true);
     $ranks = \Alliance\Alliance::ally_get_ranks($auser['ally']);
-    if($ranks[$auser['ally_rank_id']]['admin'] || $auser['ally']['ally_owner'] == $auser['id']) {
+    if ($ranks[$auser['ally_rank_id']]['admin'] || $auser['ally']['ally_owner'] == $auser['id']) {
       $user = &$auser['ally']['player'];
       $planet = array(
         'metal'     => $user['metal'],
@@ -31,11 +31,11 @@ 
     }
   }
 
-  if(!$user) {
+  if (!$user) {
     $user = &$auser;
   }
 
-  switch($action = sys_get_param_escaped('action')) {
+  switch ($action = sys_get_param_escaped('action')) {
     case 'create': // Add unit to que for build
     case 'create_autoconvert': // Add unit to que for build
     case 'destroy': // Add unit to que for remove
@@ -52,23 +52,23 @@ 
 
   $group_missile = sn_get_groups('missile');
   $silo_capacity_free = 0;
-  if($que_type == QUE_STRUCTURES) {
+  if ($que_type == QUE_STRUCTURES) {
     $build_unit_list = sn_get_groups('build_allow');
     $build_unit_list = $build_unit_list[$planet['planet_type']];
     $artifact_id = ART_NANO_BUILDER;
     $page_header = $lang['tech'][UNIT_STRUCTURES];
-  } elseif($que_type == QUE_RESEARCH) {
-    if(!mrc_get_level($user, $planet, STRUC_LABORATORY)) {
+  } elseif ($que_type == QUE_RESEARCH) {
+    if (!mrc_get_level($user, $planet, STRUC_LABORATORY)) {
       messageBox($lang['no_laboratory'], $lang['tech'][UNIT_TECHNOLOGIES]);
     }
 
-    if(eco_unit_busy($user, $planet, UNIT_TECHNOLOGIES)) {
+    if (eco_unit_busy($user, $planet, UNIT_TECHNOLOGIES)) {
       messageBox($lang['eco_bld_msg_err_laboratory_upgrading'], $lang['tech'][UNIT_TECHNOLOGIES]);
     }
     $build_unit_list = sn_get_groups('tech');
     $artifact_id = ART_HEURISTIC_CHIP;
     $page_header = $lang['eco_bld_research_page_name'] . ($user['user_as_ally'] ? " {$lang['sys_of_ally']} {$user['username']}" : '');
-  } elseif($que_type == QUE_MERCENARY) {
+  } elseif ($que_type == QUE_MERCENARY) {
 //    if(!mrc_get_level($user, $planet, STRUC_LABORATORY)) {
 //      messageBox($lang['no_laboratory'], $lang['tech'][UNIT_TECHNOLOGIES]);
 //    }
@@ -80,7 +80,7 @@ 
     $artifact_id = 0;
     $page_header = $lang['tech'][UNIT_MERCENARIES] . ($user['user_as_ally'] ? " {$lang['sys_of_ally']} {$user['username']}" : '');
   } else {
-    if(mrc_get_level($user, $planet, STRUC_FACTORY_HANGAR) == 0) {
+    if (mrc_get_level($user, $planet, STRUC_FACTORY_HANGAR) == 0) {
       messageBox($lang['need_hangar'], $lang['tech'][STRUC_FACTORY_HANGAR]);
     }
 
@@ -89,7 +89,7 @@ 
     $artifact_id = 0;
 
     $silo_capacity_free = mrc_get_level($user, $planet, STRUC_SILO) * get_unit_param(STRUC_SILO, P_CAPACITY);
-    foreach($group_missile as $unit_id) {
+    foreach ($group_missile as $unit_id) {
       $silo_capacity_free -= (mrc_get_level($user, $planet, $unit_id, false, true) + (isset($in_que[$unit_id]) && $in_que[$unit_id] ? $in_que[$unit_id] : 0)) * get_unit_param($unit_id, P_UNIT_SIZE);
     }
     $silo_capacity_free = max(0, $silo_capacity_free);
@@ -106,7 +106,7 @@ 
   */
 
   $template = gettemplate('buildings_builds', true);
-  if(!empty($operation_result)) {
+  if (!empty($operation_result)) {
     $template_result['.']['result'][] = $operation_result;
   }
 
@@ -136,7 +136,7 @@ 
 
   $record_index = 0;
 
-  foreach($build_unit_list as $unit_id) {
+  foreach ($build_unit_list as $unit_id) {
     $level_base = mrc_get_level($user, $planet, $unit_id, false, true);
     $level_effective = mrc_get_level($user, $planet, $unit_id);
     $level_in_que = $in_que[$unit_id];
@@ -159,12 +159,12 @@ 
     $can_build = $unit_info[P_MAX_STACK] ? max(0, $unit_info[P_MAX_STACK] - $level_in_que - $level_effective) : $build_data['CAN'][BUILD_CREATE];
     // Restricting $can_build by free silo capacity
     $can_build = ($unit_is_missile = in_array($unit_id, $group_missile)) ? min($can_build, floor($silo_capacity_free / $unit_info[P_UNIT_SIZE])) : $can_build;
-    if(!$can_build) {
-      if(!$build_data['CAN'][BUILD_CREATE]) {
+    if (!$can_build) {
+      if (!$build_data['CAN'][BUILD_CREATE]) {
         $build_data['RESULT'][BUILD_CREATE] = BUILD_NO_RESOURCES;
-      } elseif($unit_is_missile && $silo_capacity_free < $unit_info[P_UNIT_SIZE]) {
+      } elseif ($unit_is_missile && $silo_capacity_free < $unit_info[P_UNIT_SIZE]) {
         $build_data['RESULT'][BUILD_CREATE] = BUILD_SILO_FULL;
-      } elseif($unit_info[P_MAX_STACK]) {
+      } elseif ($unit_info[P_MAX_STACK]) {
         $build_data['RESULT'][BUILD_CREATE] = BUILD_MAX_REACHED;
       }
     }
@@ -232,14 +232,14 @@ 
       'MAP_IS_RESOURCE' => !empty($unit_info[P_UNIT_PRODUCTION]),
     );
 
-    if($unit_stackable) {
+    if ($unit_stackable) {
       $level_production_base = array(
         'ACTUAL_SHIELD' => HelperString::numberFloorAndFormat(mrc_modify_value($user, false, array(MRC_ADMIRAL, TECH_SHIELD), $unit_info['shield'])),
         'ACTUAL_ARMOR'  => HelperString::numberFloorAndFormat(mrc_modify_value($user, false, array(MRC_ADMIRAL, TECH_ARMOR), $unit_info['armor'])),
         'ACTUAL_WEAPON' => HelperString::numberFloorAndFormat(mrc_modify_value($user, false, array(MRC_ADMIRAL, TECH_WEAPON), $unit_info['attack'])),
       );
 
-      if($unit_info[P_UNIT_TYPE] == UNIT_SHIPS) {
+      if ($unit_info[P_UNIT_TYPE] == UNIT_SHIPS) {
         $ship_data = get_ship_data($unit_id, $user);
 
         $level_production_base += array(
@@ -249,9 +249,9 @@ 
         );
       }
 
-      if($unit_info[P_UNIT_PRODUCTION]) {
-        foreach($unit_info[P_UNIT_PRODUCTION] as $resource_id => $resource_calc) {
-          if($resource_income =
+      if ($unit_info[P_UNIT_PRODUCTION]) {
+        foreach ($unit_info[P_UNIT_PRODUCTION] as $resource_id => $resource_calc) {
+          if ($resource_income =
             floor(mrc_modify_value($user, $planet, $sn_modifiers_resource, $resource_calc(1, 10, $user, $planet)
               * ($resource_id == RES_ENERGY ? $config_resource_multiplier_plain : $config_resource_multiplier)
               * (isset($density_info[$resource_id]) ? $density_info[$resource_id] : 1)))
@@ -261,11 +261,11 @@ 
         }
       }
       $production['.']['resource'][] = $level_production_base;
-    } elseif($unit_info[P_UNIT_PRODUCTION]) {
+    } elseif ($unit_info[P_UNIT_PRODUCTION]) {
       $level_production_base = array();
       $element_level_start = $level_effective + $in_que[$unit_id];
-      foreach($unit_info[P_UNIT_PRODUCTION] as $resource_id => $resource_calc) {
-        if($resource_income =
+      foreach ($unit_info[P_UNIT_PRODUCTION] as $resource_id => $resource_calc) {
+        if ($resource_income =
           floor(mrc_modify_value($user, $planet, $sn_modifiers_resource, $resource_calc($element_level_start, 10, $user, $planet)
             * ($resource_id == RES_ENERGY ? $config_resource_multiplier_plain : $config_resource_multiplier)
             * (isset($density_info[$resource_id]) ? $density_info[$resource_id] : 1)))
@@ -275,24 +275,24 @@ 
       }
 
       $level_start = $level_base_and_que > 1 ? $level_effective + $level_in_que - 1 : 1;
-      for($i = 0; $i < 6; $i++) {
+      for ($i = 0; $i < 6; $i++) {
         $level_production = array('LEVEL' => $level_start + $i);
-        foreach($unit_info[P_UNIT_PRODUCTION] as $resource_id => $resource_calc) {
-          if(
+        foreach ($unit_info[P_UNIT_PRODUCTION] as $resource_id => $resource_calc) {
+          if (
           $resource_income = floor(mrc_modify_value($user, $planet, $sn_modifiers_resource, $resource_calc($level_start + $i, 10, $user, $planet)
             * ($resource_id == RES_ENERGY ? $config_resource_multiplier_plain : $config_resource_multiplier)
             * (isset($density_info[$resource_id]) ? $density_info[$resource_id] : 1)))
           ) {
             $level_production['R' . $resource_id] = $resource_income;
             $level_production['D' . $resource_id] = $resource_income - $level_production_base[$resource_id];
-            if($level_production['D' . $resource_id] == 0) {
+            if ($level_production['D' . $resource_id] == 0) {
               $level_production['D' . $resource_id] = '-';
             }
           }
         }
         $production['.']['resource'][] = $level_production;
       }
-    } elseif($unit_id == TECH_ASTROTECH) {
+    } elseif ($unit_id == TECH_ASTROTECH) {
       $element_level_start = $level_effective + $in_que[$unit_id];
       $level_production_base = array(
         UNIT_PLAYER_EXPEDITIONS_MAX => get_player_max_expeditons($user, $element_level_start),
@@ -300,7 +300,7 @@ 
       );
 
       $level_start = $level_base_and_que > 1 ? $level_effective + $level_in_que - 1 : 1;
-      for($i = 0; $i < 6; $i++) {
+      for ($i = 0; $i < 6; $i++) {
         $level_production = array('LEVEL' => $level_start + $i);
         $level_production['R' . UNIT_PLAYER_EXPEDITIONS_MAX] = get_player_max_expeditons($user, $level_start + $i);
         $level_production['D' . UNIT_PLAYER_EXPEDITIONS_MAX] = $level_production['R' . UNIT_PLAYER_EXPEDITIONS_MAX] - $level_production_base[UNIT_PLAYER_EXPEDITIONS_MAX];
@@ -321,7 +321,7 @@ 
     $template_result['.']['production'][] = $production;
   }
 
-  foreach($lang['player_option_building_sort'] as $sort_id => $sort_text) {
+  foreach ($lang['player_option_building_sort'] as $sort_id => $sort_text) {
     $template->assign_block_vars('sort_values', array(
       'VALUE' => $sort_id,
       'TEXT'  => $sort_text,
@@ -330,8 +330,8 @@ 
 
   $sort_option = SN::$user_options[array(PLAYER_OPTION_BUILDING_SORT, $que_type)];
   $sort_option_inverse = SN::$user_options[array(PLAYER_OPTION_BUILDING_SORT_INVERSE, $que_type)];
-  if($sort_option || $sort_option_inverse != PLAYER_OPTION_SORT_ORDER_PLAIN) {
-    switch($sort_option) {
+  if ($sort_option || $sort_option_inverse != PLAYER_OPTION_SORT_ORDER_PLAIN) {
+    switch ($sort_option) {
       case PLAYER_OPTION_SORT_NAME:
         $sort_option_field = 'NAME';
       break;
@@ -346,7 +346,7 @@ 
       break;
     }
     $sort_option_inverse_closure = $sort_option_inverse ? -1 : 1;
-    usort($template_result['.']['production'], function ($a, $b) use ($sort_option_field, $sort_option_inverse_closure) {
+    usort($template_result['.']['production'], function($a, $b) use ($sort_option_field, $sort_option_inverse_closure) {
       return $a[$sort_option_field] < $b[$sort_option_field] ? -1 * $sort_option_inverse_closure : (
       $a[$sort_option_field] > $b[$sort_option_field] ? 1 * $sort_option_inverse_closure : 0
       );

includes/includes/flt_page0.inc

Spacing +10 added lines, -10 removed lines

@@ -5,9 +5,9 @@ 
 // @version 1.0
 // @copyright 2008 by Chlorel for XNova
 
-if($fleet_ship_sort = sys_get_param_id('sort_elements')) {
+if ($fleet_ship_sort = sys_get_param_id('sort_elements')) {
   define('IN_AJAX', true);
-  if(!empty($lang['player_option_fleet_ship_sort'][$fleet_ship_sort])) {
+  if (!empty($lang['player_option_fleet_ship_sort'][$fleet_ship_sort])) {
     // player_save_option($user, PLAYER_OPTION_FLEET_SHIP_SORT, $fleet_ship_sort);
     // player_save_option($user, PLAYER_OPTION_FLEET_SHIP_SORT_INVERSE, sys_get_param_id('fleet_ship_sort_inverse', 0));
     SN::$user_options[PLAYER_OPTION_FLEET_SHIP_SORT] = $fleet_ship_sort;
@@ -16,13 +16,13 @@ 
   die();
 }
 
-if(SN_IN_FLEET !== true) {
+if (SN_IN_FLEET !== true) {
   $debug->error("Attempt to call FLEET page mode {$mode} directly - not from fleet.php", 'Forbidden', 403);
 }
 
 lng_include('overview');
 
-if(!$planetrow) {
+if (!$planetrow) {
   messageBox($lang['fl_noplanetrow'], $lang['fl_error']);
 }
 
@@ -30,9 +30,9 @@ 
 
 $record_index = 0;
 $ship_list = array();
-foreach(sn_get_groups('fleet') as $n => $unit_id) {
+foreach (sn_get_groups('fleet') as $n => $unit_id) {
   $unit_level = mrc_get_level($user, $planetrow, $unit_id, false, true);
-  if($unit_level > 0) {
+  if ($unit_level > 0) {
     $ship_data = get_ship_data($unit_id, $user);
     $ship_list[$unit_id] = array(
       '__INDEX'     => $record_index++,
@@ -52,8 +52,8 @@ 
 
 $fleet_ship_sort = SN::$user_options[PLAYER_OPTION_FLEET_SHIP_SORT];
 $fleet_ship_sort_inverse = SN::$user_options[PLAYER_OPTION_FLEET_SHIP_SORT_INVERSE];
-if($fleet_ship_sort || $fleet_ship_sort_inverse != PLAYER_OPTION_SORT_ORDER_PLAIN) {
-  switch($fleet_ship_sort) {
+if ($fleet_ship_sort || $fleet_ship_sort_inverse != PLAYER_OPTION_SORT_ORDER_PLAIN) {
+  switch ($fleet_ship_sort) {
     case PLAYER_OPTION_SORT_NAME: $fleet_ship_sort_field = 'NAME'; break;
     case PLAYER_OPTION_SORT_SPEED: $fleet_ship_sort_field = 'SPEED'; break;
     case PLAYER_OPTION_SORT_COUNT: $fleet_ship_sort_field = 'AMOUNT'; break;
@@ -68,11 +68,11 @@ 
   });
 }
 
-foreach($ship_list as $ship_data) {
+foreach ($ship_list as $ship_data) {
   $template->assign_block_vars('ships', $ship_data);
 }
 
-foreach($lang['player_option_fleet_ship_sort'] as $sort_id => $sort_text) {
+foreach ($lang['player_option_fleet_ship_sort'] as $sort_id => $sort_text) {
   $template->assign_block_vars('ship_sort_list', array(
     'VALUE' => $sort_id,
     'TEXT' => $sort_text,

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 = SN::$config->game_mode == GAME_BLITZ ? 'sys_blitz_page_disabled' : (
     !SN::$config->game_blitz_register ? 'sys_blitz_registration_disabled' : ''
   );
 
-  if($error_message) {
+  if ($error_message) {
     messageBox($lang[$error_message], $lang['sys_error'], 'overview.php', 10);
     die();
   }
@@ -17,12 +17,12 @@ 
 $current_round = intval(SN::$config->db_loadItem('game_blitz_register_round'));
 $current_price = intval(SN::$config->db_loadItem('game_blitz_register_price'));
 
-if(SN::$config->db_loadItem('game_blitz_register') == BLITZ_REGISTER_OPEN && (sys_get_param_str('register_me') || sys_get_param_str('register_me_not'))) {
+if (SN::$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 = doquery("SELECT `id` FROM {{blitz_registrations}} WHERE `user_id` = {$user['id']} AND `round_number` = {$current_round} FOR UPDATE;", true);
-  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) {
       doquery("INSERT IGNORE INTO {{blitz_registrations}} SET `user_id` = {$user['id']}, `round_number` = {$current_round};");
       //mm_points_change($user['id'], RPG_BLITZ_REGISTRATION, -$current_price, "Регистрация в раунде {$current_round} Блица");
       SN::$auth->account->metamatter_change(RPG_BLITZ_REGISTRATION, -$current_price, "Регистрация в раунде {$current_round} Блица");
@@ -43,17 +43,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 = doquery("SELECT `id` FROM {{blitz_registrations}} WHERE `round_number` = {$current_round} ORDER BY RAND();");
-    while($row = db_fetch($query)) {
+    while ($row = db_fetch($query)) {
       $next_id++;
       $blitz_name = 'Игрок' . $next_id;
       $blitz_password = sys_random_string(8);
       doquery("UPDATE {{blitz_registrations}} SET blitz_name = '{$blitz_name}', blitz_password = '{$blitz_password}' WHERE `id` = {$row['id']} AND `round_number` = {$current_round};");
     }
-  } elseif(sys_get_param_str('import_generated')) {
+  } elseif (sys_get_param_str('import_generated')) {
     // ЭТО НА БЛИЦЕ!!!
     doquery("DELETE FROM {{users}} WHERE username like 'Игрок%';");
     doquery("DELETE FROM {{planets}} WHERE id_owner not in (SELECT `id` FROM {{users}});");
@@ -75,7 +75,7 @@ 
     $system = $system_step;
     $planet = round(SN::$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];
 
@@ -89,7 +89,7 @@ 
 
       $moon_row = uni_create_moon($galaxy, $system, $planet, $user_new['id'], Universe::MOON_MAX_SIZE, false);
 
-      if(($system += $system_step) >= SN::$config->game_maxSystem) {
+      if (($system += $system_step) >= SN::$config->game_maxSystem) {
         $galaxy++;
         $system = $system_step;
       }
@@ -98,13 +98,13 @@ 
 
     SN::$config->db_saveItem('users_amount', SN::$config->users_amount + $new_players);
     // 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]);
         doquery(
           "UPDATE `{{blitz_registrations}}` SET
@@ -118,15 +118,15 @@ 
     $blitz_result = array();
   }
 
-  if(SN::$config->game_mode == GAME_BLITZ) {
+  if (SN::$config->game_mode == GAME_BLITZ) {
     $blitz_result = array(SN::$config->db_loadItem('var_stat_update'));
     $query = doquery("SELECT id, username, total_rank, total_points, onlinetime FROM {{users}} ORDER BY `id`;");
-    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 = doquery("SELECT blitz_name, blitz_password, blitz_online FROM {{blitz_registrations}} WHERE `round_number` = {$current_round} ORDER BY `id`;");
-    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++;
@@ -141,13 +141,13 @@ 
     'Игрок40'
     */
 
-    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 = doquery("SELECT * FROM {{blitz_registrations}} WHERE `round_number` = {$current_round} ORDER BY `blitz_place` FOR UPDATE;");
-      while($row = db_fetch($query)) {
-        if(!$row['blitz_place']) {
+      while ($row = db_fetch($query)) {
+        if (!$row['blitz_place']) {
           continue;
         }
 
@@ -155,15 +155,15 @@ 
         $blitz_prize_places_actual--;
 
         $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) {
+pdump("{{$row['id']}} {$row['blitz_name']}, Place {$row['blitz_place']}, Prize places {$blitz_prize_places_actual}, Prize {$reward}", $row['id']);
+        if ($reward) {
           rpg_points_change($row['user_id'], RPG_BLITZ, $reward, sprintf(
             $lang['sys_blitz_reward_log_message'], $row['blitz_place'], $row['blitz_name']
           ));
           doquery("UPDATE {{blitz_registrations}} SET blitz_reward_dark_matter = blitz_reward_dark_matter + ($reward) WHERE id = {$row['id']} AND `round_number` = {$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;
         }
       }
@@ -183,12 +183,12 @@ 
     JOIN {{users}} AS u ON u.id = br.user_id
   WHERE br.`round_number` = {$current_round}
   order by `blitz_place`, `timestamp`;");
-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(SN::$config->game_blitz_register == BLITZ_REGISTER_DISCLOSURE_NAMES) {
+  if (SN::$config->game_blitz_register == BLITZ_REGISTER_DISCLOSURE_NAMES) {
     // Вот так хитро, что бы не было не единого шанса попадания на страницу данных об игроках Блиц-сервера до закрытия раунда
     $tpl_player_data = array_merge($tpl_player_data, array(
       'ID' => $row['id'],
@@ -201,7 +201,7 @@ 
   }
 
   $template->assign_block_vars('registrations', $tpl_player_data);
-  if($row['id'] == $user['id']) {
+  if ($row['id'] == $user['id']) {
     $player_registered = $row;
   }
 }

includes/pages/options.php

Spacing +2 added lines, -2 removed lines

@@ -401,7 +401,7 @@ 
     unset($player_options[PLAYER_OPTION_TUTORIAL_CURRENT]);
   }
 
-  array_walk($player_options, function (&$value) {
+  array_walk($player_options, function(&$value) {
     // TODO - Когда будет больше параметров - сделать больше проверок
     $value = intval($value);
   });
@@ -450,7 +450,7 @@ 
           $user['id'],
           RPG_NAME_CHANGE,
           -$config->game_user_changename_cost,
-          vsprintf('Пользователь ID %1$d сменил имя с "%2$s" на "%3$s"', [$user['id'], $user['username'], $username,])
+          vsprintf('Пользователь ID %1$d сменил имя с "%2$s" на "%3$s"', [$user['id'], $user['username'], $username, ])
         );
 
       case SERVER_PLAYER_NAME_CHANGE_FREE: