supernova-ws / SuperNova

admin/ajax_maintenance.php

Spacing +9 added lines, -9 removed lines

@@ -4,7 +4,7 @@ 
 
 require('../includes/init.' . substr(strrchr(__FILE__, '.'), 1));
 
-if($user['authlevel'] < 3)
+if ($user['authlevel'] < 3)
 {
   SnTemplate::messageBox($lang['sys_noalloaw'], $lang['sys_noaccess']);
   die();
@@ -19,9 +19,9 @@ 
 
 // [#] info_best_battles 1b0
 $best_reports = array();
-if(defined('MODULE_INFO_BEST_BATTLES_QUERY')) {
+if (defined('MODULE_INFO_BEST_BATTLES_QUERY')) {
   $query = doquery(MODULE_INFO_BEST_BATTLES_QUERY);
-  while($row = db_fetch($query)) {
+  while ($row = db_fetch($query)) {
     $best_reports[] = $row['ube_report_id'];
   }
 }
@@ -204,16 +204,16 @@ 
 
 function sn_maintenance_pack_user_list($user_list) {
   $user_list = explode(',', $user_list);
-  foreach($user_list as $key => $user_id) {
-    if(!is_numeric($user_id)) {
+  foreach ($user_list as $key => $user_id) {
+    if (!is_numeric($user_id)) {
       unset($user_list[$key]);
     }
   }
 
   $result = array();
-  if(!empty($user_list)) {
+  if (!empty($user_list)) {
     $query = doquery("SELECT `id` FROM `{{users}}` WHERE `id` in (" . implode(',', $user_list) . ")");
-    while($row = db_fetch($query)) {
+    while ($row = db_fetch($query)) {
       $result[] = $row['id'];
     }
   }
@@ -228,11 +228,11 @@ 
 $old_server_status == GAME_DISABLE_NONE ? SN::$config->pass()->game_disable = GAME_DISABLE_MAINTENANCE : false;
 SN::db_transaction_commit();
 
-foreach($ques as $que_transaction) {
+foreach ($ques as $que_transaction) {
   SN::db_transaction_start();
 
   !is_array($que_transaction) ? $que_transaction = array($que_transaction) : false;
-  foreach($que_transaction as $que) {
+  foreach ($que_transaction as $que) {
     set_time_limit(120);
     $QryResult = doquery($que);
     //$msg .= '<hr>' . $que . '<hr>';

admin/adm_planet_list.php

Spacing +4 added lines, -5 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
-define('INSIDE'  , true);
-define('INSTALL' , false);
+define('INSIDE', true);
+define('INSTALL', false);
 define('IN_ADMIN', true);
 
 require('../common.' . substr(strrchr(__FILE__, '.'), 1));
@@ -11,7 +11,7 @@ 
 SnTemplate::messageBoxAdminAccessDenied(AUTH_LEVEL_ADMINISTRATOR);
 
 $planet_active = sys_get_param_int('planet_active');
-if(!$planet_active) {
+if (!$planet_active) {
   $planet_type = sys_get_param_int('planet_type', 1);
   $planet_type = $planet_type == 3 ? 3 : 1;
 } else {
@@ -40,8 +40,7 @@ 
 
 $page_title =
   $lang['adm_planet_list_title'] . ': ' .
-  ($planet_active ? $lang['adm_planet_active'] :
-    ($planet_type ? ($planet_type == 3 ? $lang['sys_moons'] : $lang['sys_planets']) : '')
+  ($planet_active ? $lang['adm_planet_active'] : ($planet_type ? ($planet_type == 3 ? $lang['sys_moons'] : $lang['sys_planets']) : '')
   );
 $template->assign_vars(array(
   'PAGE_TITLE' => $page_title,

dark_matter.php

Spacing +1 added lines, -1 removed lines

@@ -2,7 +2,7 @@
 
 include_once('common.' . substr(strrchr(__FILE__, '.'), 1));
 
-if(SN::$gc->modules->countModulesInGroup('payment') && !SN_GOOGLE) {
+if (SN::$gc->modules->countModulesInGroup('payment') && !SN_GOOGLE) {
   sys_redirect('metamatter.php');
 }
 

flotenajax.php

Spacing +13 added lines, -13 removed lines

@@ -35,14 +35,14 @@ 
   'planet' => $target_planet = sys_get_param_int('planet'),
 );
 
-if(!uni_coordinates_valid($target_coord))
+if (!uni_coordinates_valid($target_coord))
 {
   die($lang['gs_c02']);
 }
 
 $target_mission = sys_get_param_int('mission');
 $sn_group_missions = sn_get_groups('missions');
-if(!isset($sn_group_missions[$target_mission]['AJAX']) || !$sn_group_missions[$target_mission]['AJAX'])
+if (!isset($sn_group_missions[$target_mission]['AJAX']) || !$sn_group_missions[$target_mission]['AJAX'])
 {
   die($lang['gs_c00']);
 }
@@ -58,7 +58,7 @@ 
 $target_coord['planet_type'] = $target_planet_check;
 $target_row = DBStaticPlanet::db_planet_by_vector($target_coord);
 
-if(empty($target_row))
+if (empty($target_row))
 {
   $target_row = array(
     'galaxy' => $target_coord['galaxy'],
@@ -70,7 +70,7 @@ 
 }
 
 $fleet_array = array();
-switch($target_mission)
+switch ($target_mission)
 {
   case MT_SPY:
     // $fleet_array[SHIP_SPY] = min(mrc_get_level($user, $planetrow, SHIP_SPY), abs($user['spio_anz']));
@@ -79,9 +79,9 @@ 
   break;
 
   case MT_RECYCLE:
-    foreach(sn_get_groups('flt_recyclers') as $unit_id)
+    foreach (sn_get_groups('flt_recyclers') as $unit_id)
     {
-      if($unit_count = mrc_get_level($user, $planetrow, $unit_id))
+      if ($unit_count = mrc_get_level($user, $planetrow, $unit_id))
       {
         $fleet_array[$unit_id] = $unit_count;
       }
@@ -102,14 +102,14 @@ 
 $cant_attack = flt_can_attack($planetrow, $target_row, $fleet_array, $target_mission, $options);
 
 
-if($cant_attack != ATTACK_ALLOWED)
+if ($cant_attack != ATTACK_ALLOWED)
 {
   die($lang['fl_attack_error'][$cant_attack]);
 }
 
-$FleetDBArray   = array();
+$FleetDBArray = array();
 $db_changeset = array();
-foreach($fleet_array as $unit_id => $unit_count)
+foreach ($fleet_array as $unit_id => $unit_count)
 {
   $FleetDBArray[] = "{$unit_id},{$unit_count}";
   $db_changeset['unit'][] = OldDbChangeSet::db_changeset_prepare_unit($unit_id, -$unit_count, $user, $planetrow);
@@ -118,7 +118,7 @@ 
 
 $fleet_ship_count = array_sum($fleet_array);
 
-if($target_mission == MT_MISSILE)
+if ($target_mission == MT_MISSILE)
 {
   $distance = abs($target_coord['system'] - $planetrow['system']);
   $duration = round((30 + (60 * $distance)) / Universe::flt_server_flight_speed_multiplier());
@@ -136,7 +136,7 @@ 
 {
   $travel_data = flt_travel_data($user, $planetrow, $target_coord, $fleet_array, 10);
 
-  if($planetrow['deuterium'] < $travel_data['consumption'])
+  if ($planetrow['deuterium'] < $travel_data['consumption'])
   {
     die($lang['gs_c13']);
   }
@@ -174,7 +174,7 @@ 
 $ships_sent = array();
 //$ships_sent_js = array();
 $ships_sent_js = 0;
-foreach($fleet_array as $unit_id => $unit_count)
+foreach ($fleet_array as $unit_id => $unit_count)
 {
   $ships_sent[] = "{$unit_count} {$lang['tech'][$unit_id]}";
   $ships_sent_js += mrc_get_level($user, $planetrow, $unit_id, false, true);
@@ -183,6 +183,6 @@ 
 //$ships_sent_js = implode(',', $ships_sent_js);
 $ships_sent_js = "{$unit_group}={$ships_sent_js}";
 
-$ResultMessage  = "{$lang['gs_sending']} {$ships_sent} {$lang['gs_to']} {$target_coord['galaxy']}:{$target_coord['system']}:{$target_coord['planet']}|{$ships_sent_js}";
+$ResultMessage = "{$lang['gs_sending']} {$ships_sent} {$lang['gs_to']} {$target_coord['galaxy']}:{$target_coord['system']}:{$target_coord['planet']}|{$ships_sent_js}";
 
 die($ResultMessage);

stat.php

Spacing +5 added lines, -5 removed lines

@@ -15,8 +15,8 @@ 
   global $who, $lang;
 
   // $sn_group_stat_common = sn_get_groups('STAT_COMMON');
-  foreach($array as $key => $value) {
-    if($array_name == 'type' && $who == 2 && !in_array($key, $sn_group_stat_common)) {
+  foreach ($array as $key => $value) {
+    if ($array_name == 'type' && $who == 2 && !in_array($key, $sn_group_stat_common)) {
       continue;
     }
 
@@ -48,7 +48,7 @@ 
 $subject_list = array(
   1 => array('header' => $lang['stat_player']),
 );
-if(!$source) {
+if (!$source) {
   $subject_list[2] = array('header' => $lang['stat_allys']);
 }
 stat_tpl_assign($template, $who, 'subject', $subject_list, $sn_group_stat_common);
@@ -115,7 +115,7 @@ 
 
 $page_count = floor($record_count / 100);
 $pages = array();
-for($i = 0; $i <= $page_count; $i++) {
+for ($i = 0; $i <= $page_count; $i++) {
   $first_element = $i * 100 + 1;
   $last_element = $first_element + 99;
   $pages[$first_element] = array(
@@ -134,7 +134,7 @@ 
     'POINTS' => HelperString::numberFloorAndFormat($row['points']),
   );
 
-  if($who == WHO_IS_USER) {
+  if ($who == WHO_IS_USER) {
     $row_stat['ALLY_NAME'] = $row['ally_name'];
     $row_stat['ALLY_ID'] = $row['ally_id'];
     empty($row['username']) ? $row['username'] = $row['name'] : false;

classes/SN.php

Braces +12 added lines, -4 removed lines

@@ -457,7 +457,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()) {
         // Обновляем данные только если ряд был затронут
@@ -465,6 +466,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
@@ -498,9 +500,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 = SN::$db->db_insert_id();
+      }
         // Вытаскиваем запись целиком, потому что в $set могли быть "данные по умолчанию"
         $result = static::db_get_record_by_id($location_type, $record_id);
         // Очищаем второстепенные кэши - потому что вставленная запись могла повлиять на результаты запросов или локация или еще чего
@@ -521,10 +525,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;
@@ -538,11 +544,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;

classes/Fleet/FleetStatic.php

Spacing +2 added lines, -2 removed lines

@@ -18,7 +18,7 @@ 
    * @return DbMysqliResultIterator|EmptyCountableIterator
    */
   public static function dbFleetsOnHoldOnPlanetsByIds($planetIds, $time = SN_TIME_NOW) {
-    if(empty($planetIds) || !is_array($planetIds)) {
+    if (empty($planetIds) || !is_array($planetIds)) {
       return new EmptyCountableIterator();
     }
 
@@ -41,7 +41,7 @@ 
     $speeds = array();
     if (!empty($fleet)) {
       foreach ($fleet as $ship_id => $amount) {
-        if ($amount && in_array($ship_id, sn_get_groups(['fleet', 'missile',]))) {
+        if ($amount && in_array($ship_id, sn_get_groups(['fleet', 'missile', ]))) {
           $single_ship_data = !empty($shipData[$ship_id]) ? $shipData[$ship_id] : get_ship_data($ship_id, $user);
           $speeds[]         = $single_ship_data['speed'];
         }

classes/RequestInfo.php

Spacing +3 added lines, -3 removed lines

@@ -122,15 +122,15 @@
     SN::db_transaction_commit();
 
     $this->user_agent = !empty($_SERVER['HTTP_USER_AGENT']) ? $_SERVER['HTTP_USER_AGENT'] : '';
-    $this->browser_id = db_get_set_unique_id_value('security_browser', 'browser_id', ['browser_user_agent' => $this->user_agent,]);
+    $this->browser_id = db_get_set_unique_id_value('security_browser', 'browser_id', ['browser_user_agent' => $this->user_agent, ]);
 
     $this->page_address    = substr($_SERVER['PHP_SELF'], strlen(SN_ROOT_RELATIVE));
-    $this->page_address_id = db_get_set_unique_id_value('security_url', 'url_id', ['url_string' => $this->page_address,]);
+    $this->page_address_id = db_get_set_unique_id_value('security_url', 'url_id', ['url_string' => $this->page_address, ]);
 
     // Not a simulator - because it can have loooooong string
     if (strpos($_SERVER['REQUEST_URI'], '/simulator.php') !== 0 && !$skip_log_query) {
       $this->queryString = !empty($_SERVER['QUERY_STRING']) ? $_SERVER['QUERY_STRING'] : '';
-      $this->queryStringId = db_get_set_unique_id_value('security_query_strings', 'id', ['query_string' => $this->queryString,]);
+      $this->queryStringId = db_get_set_unique_id_value('security_query_strings', 'id', ['query_string' => $this->queryString, ]);
     }
 
     $ip                      = sec_player_ip();

classes/_SnCacheInternal.php

Spacing +1 added lines, -1 removed lines

@@ -52,7 +52,7 @@
     //print("<br />CACHE CLEAR {$cache_id} " . ($hard ? 'HARD' : 'SOFT') . "<br />");
     if ($hard && !empty(_SnCacheInternal::$data[$location_type])) {
       // Здесь нельзя делать unset - надо записывать NULL, что бы это отразилось на зависимых записях
-      array_walk(_SnCacheInternal::$data[$location_type], function (&$item) { $item = null; });
+      array_walk(_SnCacheInternal::$data[$location_type], function(&$item) { $item = null; });
     }
     _SnCacheInternal::$locator[$location_type] = [];
     _SnCacheInternal::cache_repack($location_type); // Перепаковываем внутренние структуры, если нужно