supernova-ws / SuperNova

includes/init/init_functions.php

Spacing +12 added lines, -12 removed lines

@@ -2,25 +2,25 @@ 
 
 // ------------------------------------------------------------------------------------------------------------------------------
 function sn_sys_load_php_files($dir_name, $load_extension = 'php', $modules = false) {
-  if(file_exists($dir_name)) {
+  if (file_exists($dir_name)) {
     $dir = opendir($dir_name);
-    while(($file = readdir($dir)) !== false) {
-      if($file == '..' || $file == '.') {
+    while (($file = readdir($dir)) !== false) {
+      if ($file == '..' || $file == '.') {
         continue;
       }
 
       $full_filename = $dir_name . $file;
-      if($modules && is_dir($full_filename)) {
-        if(file_exists($full_filename = "{$full_filename}/{$file}.{$load_extension}")) {
+      if ($modules && is_dir($full_filename)) {
+        if (file_exists($full_filename = "{$full_filename}/{$file}.{$load_extension}")) {
           require_once($full_filename);
           // Registering module
-          if(class_exists($file)) {
+          if (class_exists($file)) {
             new $file($full_filename);
           }
         }
       } else {
         $extension = substr($full_filename, -strlen($load_extension));
-        if($extension == $load_extension) {
+        if ($extension == $load_extension) {
           require_once($full_filename);
         }
       }
@@ -39,11 +39,11 @@ 
  */
 function init_update() {
   $update_file = SN_ROOT_PHYSICAL . "includes/update" . DOT_PHP_EX;
-  if(file_exists($update_file)) {
-    if(filemtime($update_file) > classSupernova::$config->db_loadItem('var_db_update') || classSupernova::$config->db_loadItem('db_version') < DB_VERSION) {
-      if(defined('IN_ADMIN')) {
+  if (file_exists($update_file)) {
+    if (filemtime($update_file) > classSupernova::$config->db_loadItem('var_db_update') || classSupernova::$config->db_loadItem('db_version') < DB_VERSION) {
+      if (defined('IN_ADMIN')) {
         sn_db_transaction_start(); // Для защиты от двойного запуска апдейта - начинаем транзакцию. Так запись в базе будет блокирована
-        if(SN_TIME_NOW >= classSupernova::$config->db_loadItem('var_db_update_end')) {
+        if (SN_TIME_NOW >= classSupernova::$config->db_loadItem('var_db_update_end')) {
           classSupernova::$config->db_saveItem('var_db_update_end', SN_TIME_NOW + (classSupernova::$config->upd_lock_time ? classSupernova::$config->upd_lock_time : 300));
           sn_db_transaction_commit();
 
@@ -53,7 +53,7 @@ 
           $current_time = time();
           classSupernova::$config->db_saveItem('var_db_update', $current_time);
           classSupernova::$config->db_saveItem('var_db_update_end', $current_time);
-        } elseif(filemtime($update_file) > classSupernova::$config->var_db_update) {
+        } elseif (filemtime($update_file) > classSupernova::$config->var_db_update) {
           $timeout = classSupernova::$config->var_db_update_end - SN_TIME_NOW;
           die(
             "Обновляется база данных. Рассчетное время окончания - {$timeout} секунд (время обновления может увеличиваться). Пожалуйста, подождите...<br />

alliance.php

Spacing +14 added lines, -14 removed lines

@@ -2,7 +2,7 @@ 
 
 include('common.' . substr(strrchr(__FILE__, '.'), 1));
 
-if(classSupernova::$config->game_mode == GAME_BLITZ) {
+if (classSupernova::$config->game_mode == GAME_BLITZ) {
   message(classLocale::$lang['sys_blitz_page_disabled'], classLocale::$lang['sys_error'], 'overview.php', 10);
   die();
 }
@@ -14,16 +14,16 @@ 
 
 $mode = sys_get_param_str('mode');
 
-if($mode == 'ainfo') {
+if ($mode == 'ainfo') {
   include('includes/alliance/ali_info.inc');
 }
 
-if(!$user['ally_id']) {
+if (!$user['ally_id']) {
   $user_request = db_ally_request_get_by_user_id($user['id']);
-  if($user_request['id_user']) {
+  if ($user_request['id_user']) {
     require('includes/alliance/ali_external_request.inc');
   } else {
-    switch($mode) {
+    switch ($mode) {
       case 'search':
         require('includes/alliance/ali_external_search.inc');
       break;
@@ -44,7 +44,7 @@ 
 }
 
 sn_ali_fill_user_ally($user);
-if(!isset($user['ally'])) {
+if (!isset($user['ally'])) {
   db_user_set_by_id($user['id'], "`ally_id` = null, `ally_name` = null, `ally_register_time` = 0, `ally_rank_id` = 0");
   message(classLocale::$lang['ali_sys_notFound'], classLocale::$lang['your_alliance'], 'alliance.php');
 }
@@ -72,18 +72,18 @@ 
 
 // This piece converting old ally data to new one
 //  unset($ally['ranklist']);
-if(!$ally['ranklist'] && $ally['ally_ranks']) {
+if (!$ally['ranklist'] && $ally['ally_ranks']) {
   $ally_ranks = unserialize($ally['ally_ranks']);
   $i = 0;
-  foreach($ally_ranks as $rank_id => $rank) {
-    foreach($ally_rights as $key => $value) {
+  foreach ($ally_ranks as $rank_id => $rank) {
+    foreach ($ally_rights as $key => $value) {
       $ranks[$i][$value] = $rank[$rights_old[$key]];
     }
     db_user_list_set_ally_deprecated_convert_ranks($user['ally_id'], $i, $rank_id);
     $i++;
   }
 
-  if(!empty($ranks)) {
+  if (!empty($ranks)) {
     ali_rank_list_save($ranks);
   }
 }
@@ -101,15 +101,15 @@ 
 
 $edit = sys_get_param_str('edit');
 ally_pre_call();
-switch($mode) {
+switch ($mode) {
   case 'admin':
-    if(!array_key_exists($edit, $sn_ali_admin_internal)) {
+    if (!array_key_exists($edit, $sn_ali_admin_internal)) {
       $edit = 'default';
     }
-    if($sn_ali_admin_internal[$edit]['include']) {
+    if ($sn_ali_admin_internal[$edit]['include']) {
       require("includes/{$sn_ali_admin_internal[$edit]['include']}");
     }
-    if(isset($sn_ali_admin_internal[$edit]['function']) && is_callable($sn_ali_admin_internal[$edit]['function'])) {
+    if (isset($sn_ali_admin_internal[$edit]['function']) && is_callable($sn_ali_admin_internal[$edit]['function'])) {
       call_user_func($sn_ali_admin_internal[$edit]['function']);
     }
   break;

overview.php

Spacing +37 added lines, -37 removed lines

@@ -78,7 +78,7 @@ 
 
 $result = array();
 
-switch($mode = sys_get_param_str('mode')) {
+switch ($mode = sys_get_param_str('mode')) {
   case 'manage':
     sn_sys_sector_buy('overview.php?mode=manage');
 
@@ -88,11 +88,11 @@ 
     $template  = gettemplate('planet_manage', true);
     $planet_id = sys_get_param_id('planet_id');
 
-    if(sys_get_param_str('rename') && $new_name = sys_get_param_str('new_name')) {
+    if (sys_get_param_str('rename') && $new_name = sys_get_param_str('new_name')) {
       $planetrow['name'] = $new_name;
 //      $new_name = db_escape($new_name);
       db_planet_set_by_id($planetrow['id'], "`name` = '{$new_name}'");
-    } elseif(sys_get_param_str('action') == 'make_capital') {
+    } elseif (sys_get_param_str('action') == 'make_capital') {
       try {
         sn_db_transaction_start();
         $user = db_user_by_id($user['id'], true, '*');
@@ -101,15 +101,15 @@ 
 //        $user = $global_data['user'];
 //        $planetrow = $global_data['planet'];
 
-        if($planetrow['planet_type'] != PT_PLANET) {
+        if ($planetrow['planet_type'] != PT_PLANET) {
           throw new exception(classLocale::$lang['ov_capital_err_not_a_planet'], ERR_ERROR);
         }
 
-        if($planetrow['id'] == $user['id_planet']) {
+        if ($planetrow['id'] == $user['id_planet']) {
           throw new exception(classLocale::$lang['ov_capital_err_capital_already'], ERR_ERROR);
         }
 
-        if($user_dark_matter < classSupernova::$config->planet_capital_cost) {
+        if ($user_dark_matter < classSupernova::$config->planet_capital_cost) {
           throw new exception(classLocale::$lang['ov_capital_err_no_dark_matter'], ERR_ERROR);
         }
 
@@ -126,16 +126,16 @@ 
         );
         sn_db_transaction_commit();
         sys_redirect('overview.php?mode=manage');
-      } catch(exception $e) {
+      } catch (exception $e) {
         sn_db_transaction_rollback();
         $result[] = array(
           'STATUS'  => $e->getCode(),
           'MESSAGE' => $e->getMessage(),
         );
       }
-    } elseif(sys_get_param_str('action') == 'planet_teleport') {
+    } elseif (sys_get_param_str('action') == 'planet_teleport') {
       try {
-        if(!uni_coordinates_valid($new_coordinates = array(
+        if (!uni_coordinates_valid($new_coordinates = array(
           'galaxy' => sys_get_param_int('new_galaxy'),
           'system' => sys_get_param_int('new_system'),
           'planet' => sys_get_param_int('new_planet')))
@@ -152,7 +152,7 @@ 
 //        $planetrow = $global_data['planet'];
 
         $can_teleport = uni_planet_teleport_check($user, $planetrow, $new_coordinates);
-        if($can_teleport['result'] != ERR_NONE) {
+        if ($can_teleport['result'] != ERR_NONE) {
           throw new exception($can_teleport['message'], $can_teleport['result']);
         }
 
@@ -163,7 +163,7 @@ 
         db_planet_set_by_gspt($planetrow['galaxy'], $planetrow['system'], $planetrow['planet'], PT_ALL,
           "galaxy = {$new_coordinates['galaxy']}, system = {$new_coordinates['system']}, planet = {$new_coordinates['planet']}, planet_teleport_next = {$planet_teleport_next}");
 
-        if($planetrow['id'] == $user['id_planet']) {
+        if ($planetrow['id'] == $user['id_planet']) {
           db_user_set_by_id($user['id'], "galaxy = {$new_coordinates['galaxy']}, system = {$new_coordinates['system']}, planet = {$new_coordinates['planet']}");
         }
 
@@ -176,17 +176,17 @@ 
           'MESSAGE' => classLocale::$lang['ov_teleport_err_none'],
         );
         sys_redirect('overview.php?mode=manage');
-      } catch(exception $e) {
+      } catch (exception $e) {
         sn_db_transaction_rollback();
         $result[] = array(
           'STATUS'  => $e->getCode(),
           'MESSAGE' => $e->getMessage(),
         );
       }
-    } elseif(sys_get_param_str('action') == 'planet_abandon') {
+    } elseif (sys_get_param_str('action') == 'planet_abandon') {
       // if(sec_password_check($user['id'], sys_get_param('abandon_confirm'))) {
-      if(classSupernova::$auth->password_check(sys_get_param('abandon_confirm'))) {
-        if($user['id_planet'] != $user['current_planet'] && $user['current_planet'] == $planet_id) {
+      if (classSupernova::$auth->password_check(sys_get_param('abandon_confirm'))) {
+        if ($user['id_planet'] != $user['current_planet'] && $user['current_planet'] == $planet_id) {
           $destroyed = SN_TIME_NOW + 60 * 60 * 24;
           db_planet_set_by_id($user['current_planet'], "`destruyed`='{$destroyed}', `id_owner`=0");
           db_planet_set_by_parent($user['current_planet'], "`destruyed`='{$destroyed}', `id_owner`=0");
@@ -196,9 +196,9 @@ 
           message(classLocale::$lang['ov_delete_wrong_planet'], classLocale::$lang['colony_abandon'], 'overview.php?mode=manage');
         }
       } else {
-        message(classLocale::$lang['ov_delete_wrong_pass'] , classLocale::$lang['colony_abandon'], 'overview.php?mode=manage');
+        message(classLocale::$lang['ov_delete_wrong_pass'], classLocale::$lang['colony_abandon'], 'overview.php?mode=manage');
       }
-    } elseif(
+    } elseif (
       ($hire = sys_get_param_int('hire')) && in_array($hire, sn_get_groups('governors'))
       && (
         !get_unit_param($hire, P_MAX_STACK) ||
@@ -213,8 +213,8 @@ 
       $user = db_user_by_id($user['id'], true);
       $planetrow = db_planet_by_id($planetrow['id'], true);
       $build_data = eco_get_build_data($user, $planetrow, $hire, $planetrow['PLANET_GOVERNOR_ID'] == $hire ? $planetrow['PLANET_GOVERNOR_LEVEL'] : 0);
-      if($build_data['CAN'][BUILD_CREATE]) {
-        if($planetrow['PLANET_GOVERNOR_ID'] == $hire) {
+      if ($build_data['CAN'][BUILD_CREATE]) {
+        if ($planetrow['PLANET_GOVERNOR_ID'] == $hire) {
           $planetrow['PLANET_GOVERNOR_LEVEL']++;
           $query = '`PLANET_GOVERNOR_LEVEL` + 1';
         } else {
@@ -240,8 +240,8 @@ 
 
     lng_include('mrc_mercenary');
     int_planet_pretemplate($planetrow, $template);
-    foreach(sn_get_groups('governors') as $governor_id) {
-      if($planetrow['planet_type'] == PT_MOON && $governor_id == MRC_TECHNOLOGIST) {
+    foreach (sn_get_groups('governors') as $governor_id) {
+      if ($planetrow['planet_type'] == PT_MOON && $governor_id == MRC_TECHNOLOGIST) {
         continue;
       }
 
@@ -293,7 +293,7 @@ 
       'PAGE_HINT'   => classLocale::$lang['ov_manage_page_hint'],
     ));
 
-    foreach($result as &$a_result) {
+    foreach ($result as &$a_result) {
       $template->assign_block_vars('result', $a_result);
     }
 
@@ -303,7 +303,7 @@ 
   default:
     sn_sys_sector_buy();
 
-    if(sys_get_param_str('rename') && $new_name = sys_get_param_str('new_name')) {
+    if (sys_get_param_str('rename') && $new_name = sys_get_param_str('new_name')) {
       $planetrow['name'] = $new_name;
       $new_name_safe = db_escape($new_name);
       db_planet_set_by_id($planetrow['id'], "`name` = '{$new_name_safe}'");
@@ -333,7 +333,7 @@ 
 
     $planet_count = 0;
     $planets_query = db_planet_list_sorted($user, false, '*');
-    foreach($planets_query as $an_id => $UserPlanet) {
+    foreach ($planets_query as $an_id => $UserPlanet) {
       sn_db_transaction_start();
       $UserPlanet = sys_o_get_updated($user, $UserPlanet['id'], SN_TIME_NOW, false, true);
       sn_db_transaction_commit();
@@ -344,16 +344,16 @@ 
 
       $planet_fleet_id = 0;
       $fleet_list = $template_planet['fleet_list'];
-      if($fleet_list['own']['count']) {
+      if ($fleet_list['own']['count']) {
         $planet_fleet_id = "p{$UserPlanet['id']}";
         $fleets_to_planet[$UserPlanet['id']] = tpl_parse_fleet_sn($fleet_list['own']['total'], $planet_fleet_id);
 //        $fleet_id++;tpl_parse_fleet_sn
       }
-      if($UserPlanet['planet_type'] == PT_MOON) {
+      if ($UserPlanet['planet_type'] == PT_MOON) {
         continue;
       }
       $moon = db_planet_by_parent($UserPlanet['id']);
-      if($moon) {
+      if ($moon) {
         $moon_fill = min(100, floor($moon['field_current'] / eco_planet_fields_max($moon) * 100));
       } else {
         $moon_fill = 0;
@@ -393,7 +393,7 @@ 
     tpl_assign_fleet($template, $fleets);
 
     $lune = $planetrow['planet_type'] == PT_PLANET ? db_planet_by_parent($planetrow['id']) : db_planet_by_id($planetrow['parent_planet']);
-    if($lune) {
+    if ($lune) {
       $template->assign_vars(array(
         'MOON_ID' => $lune['id'],
         'MOON_IMG' => $lune['image'],
@@ -405,15 +405,15 @@ 
     $planet_fill = $planet_fill > 100 ? 100 : $planet_fill;
 
     $planet_recyclers_orbiting = 0;
-    foreach(sn_get_groups('flt_recyclers') as $recycler_id) {
+    foreach (sn_get_groups('flt_recyclers') as $recycler_id) {
       $planet_recyclers_orbiting += mrc_get_level($user, $planetrow, $recycler_id);
     }
 
     int_planet_pretemplate($planetrow, $template);
 
     $sn_group_ques = sn_get_groups('ques');
-    if(!defined('GAME_STRUCTURES_DISABLED') || !GAME_STRUCTURES_DISABLED) {
-      foreach(array(QUE_STRUCTURES => $sn_group_ques[QUE_STRUCTURES]) as $que_id => $que_type_data) {
+    if (!defined('GAME_STRUCTURES_DISABLED') || !GAME_STRUCTURES_DISABLED) {
+      foreach (array(QUE_STRUCTURES => $sn_group_ques[QUE_STRUCTURES]) as $que_id => $que_type_data) {
         $this_que = $que['ques'][$que_id][$user['id']][$planetrow['id']];
         $template->assign_block_vars('ques', array(
           'ID'     => $que_id,
@@ -421,8 +421,8 @@ 
           'LENGTH' => empty($this_que) ? 0 : count($this_que),
         ));
 
-        if(!empty($this_que)) {
-          foreach($this_que as $que_item) {
+        if (!empty($this_que)) {
+          foreach ($this_que as $que_item) {
             $template->assign_block_vars('que', que_tpl_parse_element($que_item));
           }
         }
@@ -436,7 +436,7 @@ 
       'LENGTH' => $que_hangar_length,
     ));
 
-    if(!defined('GAME_DEFENSE_DISABLED') || !GAME_DEFENSE_DISABLED) {
+    if (!defined('GAME_DEFENSE_DISABLED') || !GAME_DEFENSE_DISABLED) {
       $que_hangar_length = tpl_assign_hangar($template, $planetrow, SUBQUE_DEFENSE);
       $template->assign_block_vars('ques', array(
         'ID'     => SUBQUE_DEFENSE,
@@ -448,12 +448,12 @@ 
     $overview_planet_rows = $user['opt_int_overview_planet_rows'];
     $overview_planet_columns = $user['opt_int_overview_planet_columns'];
 
-    if($overview_planet_rows <= 0 && $overview_planet_columns <= 0) {
+    if ($overview_planet_rows <= 0 && $overview_planet_columns <= 0) {
       $overview_planet_rows = $user_option_list[OPT_INTERFACE]['opt_int_overview_planet_rows'];
       $overview_planet_columns = $user_option_list[OPT_INTERFACE]['opt_int_overview_planet_columns'];
     }
 
-    if($overview_planet_rows > 0 && $overview_planet_columns <= 0) {
+    if ($overview_planet_rows > 0 && $overview_planet_columns <= 0) {
       $overview_planet_columns = ceil($planet_count / $overview_planet_rows);
     }
 
@@ -510,7 +510,7 @@ 
     ));
     tpl_set_resource_info($template, $planetrow, $fleets_to_planet, 2);
 
-    foreach($result as &$a_result) {
+    foreach ($result as &$a_result) {
       $template->assign_block_vars('result', $a_result);
     }
 

admin/settings.php

Spacing +11 added lines, -11 removed lines

@@ -8,18 +8,18 @@ 
  * @copyright 2008 by ??????? for XNova
  */
 
-define('INSIDE'  , true);
-define('INSTALL' , false);
+define('INSIDE', true);
+define('INSTALL', false);
 define('IN_ADMIN', true);
 require('../common.' . substr(strrchr(__FILE__, '.'), 1));
 
-if($user['authlevel'] < 3) {
+if ($user['authlevel'] < 3) {
   AdminMessage(classLocale::$lang['adm_err_denied']);
 }
 
 $template = gettemplate('admin/settings', true);
 
-if(sys_get_param('save')) {
+if (sys_get_param('save')) {
   classSupernova::$config->game_name               = sys_get_param_str_unsafe('game_name');
   classSupernova::$config->game_mode               = sys_get_param_int('game_mode');
   classSupernova::$config->game_speed              = sys_get_param_float('game_speed', 1);
@@ -29,7 +29,7 @@ 
   classSupernova::$config->url_faq                 = sys_get_param_str_unsafe('url_faq');
   classSupernova::$config->url_forum               = sys_get_param_str_unsafe('url_forum');
   classSupernova::$config->url_rules               = sys_get_param_str_unsafe('url_rules');
-  classSupernova::$config->url_purchase_metamatter         = sys_get_param_str_unsafe('url_purchase_metamatter');
+  classSupernova::$config->url_purchase_metamatter = sys_get_param_str_unsafe('url_purchase_metamatter');
   classSupernova::$config->game_disable            = sys_get_param_int('game_disable');
   classSupernova::$config->game_disable_reason     = sys_get_param_str_unsafe('game_disable_reason');
   classSupernova::$config->server_updater_check_auto = sys_get_param_int('server_updater_check_auto');
@@ -96,8 +96,8 @@ 
   classSupernova::$config->stats_schedule          = sys_get_param_str('stats_schedule');
 
   classSupernova::$config->empire_mercenary_base_period = sys_get_param_int('empire_mercenary_base_period');
-  if(classSupernova::$config->empire_mercenary_temporary != sys_get_param_int('empire_mercenary_temporary')) {
-    if(classSupernova::$config->empire_mercenary_temporary) {
+  if (classSupernova::$config->empire_mercenary_temporary != sys_get_param_int('empire_mercenary_temporary')) {
+    if (classSupernova::$config->empire_mercenary_temporary) {
       db_unit_list_admin_delete_mercenaries_finished();
     } else {
       db_unit_list_admin_set_mercenaries_expire_time(classSupernova::$config->empire_mercenary_base_period);
@@ -138,21 +138,21 @@ 
   'STATS_HIDE_PM_LINK' => classSupernova::$config->stats_hide_pm_link,
 ));
 
-foreach(classLocale::$lang['sys_game_disable_reason'] as $id => $name) {
+foreach (classLocale::$lang['sys_game_disable_reason'] as $id => $name) {
   $template->assign_block_vars('sys_game_disable_reason', array(
     'ID'   => $id,
     'NAME' => $name,
   ));
 }
 
-foreach(classLocale::$lang['sys_game_mode'] as $mode_id => $mode_name) {
+foreach (classLocale::$lang['sys_game_mode'] as $mode_id => $mode_name) {
   $template->assign_block_vars('game_modes', array(
     'ID'   => $mode_id,
     'NAME' => $mode_name,
   ));
 }
 
-foreach(classLocale::$lang['adm_opt_ver_response'] as $ver_id => $ver_response) {
+foreach (classLocale::$lang['adm_opt_ver_response'] as $ver_id => $ver_response) {
   $template->assign_block_vars('ver_response', array(
     'ID'   => $ver_id,
     'NAME' => js_safe_string($ver_response),
@@ -160,7 +160,7 @@ 
 }
 
 $lang_list = lng_get_list();
-foreach($lang_list as $lang_id => $lang_data) {
+foreach ($lang_list as $lang_id => $lang_data) {
   $template->assign_block_vars('game_languages', array(
     'ID'   => $lang_id,
     'NAME' => "{$lang_data['LANG_NAME_NATIVE']} ({$lang_data['LANG_NAME_ENGLISH']})",

ajax_version_check.php

Switch Indentation +8 added lines, -8 removed lines

@@ -13,15 +13,15 @@
   . '&id=' . urlencode(classSupernova::$config->server_updater_id);
 
 switch($mode) {
-  case SNC_MODE_REGISTER:
-    if(classSupernova::$config->server_updater_key || classSupernova::$config->server_updater_id) {
-      if($ajax) {
-        print(SNC_VER_REGISTER_ERROR_REGISTERED);
+    case SNC_MODE_REGISTER:
+      if(classSupernova::$config->server_updater_key || classSupernova::$config->server_updater_id) {
+        if($ajax) {
+          print(SNC_VER_REGISTER_ERROR_REGISTERED);
+        }
+        die();
       }
-      die();
-    }
-    $url .= "&name=" . urlencode(classSupernova::$config->game_name) . "&url=" . urlencode(SN_ROOT_VIRTUAL);
-  break;
+      $url .= "&name=" . urlencode(classSupernova::$config->game_name) . "&url=" . urlencode(SN_ROOT_VIRTUAL);
+    break;
 }
 
 $check_result = sn_get_url_contents($url);

Spacing +8 added lines, -8 removed lines

@@ -12,10 +12,10 @@ 
   . '&key=' . urlencode(classSupernova::$config->server_updater_key)
   . '&id=' . urlencode(classSupernova::$config->server_updater_id);
 
-switch($mode) {
+switch ($mode) {
   case SNC_MODE_REGISTER:
-    if(classSupernova::$config->server_updater_key || classSupernova::$config->server_updater_id) {
-      if($ajax) {
+    if (classSupernova::$config->server_updater_key || classSupernova::$config->server_updater_id) {
+      if ($ajax) {
         print(SNC_VER_REGISTER_ERROR_REGISTERED);
       }
       die();
@@ -25,18 +25,18 @@ 
 }
 
 $check_result = sn_get_url_contents($url);
-if(!$check_result) {
+if (!$check_result) {
   $version_check = SNC_VER_ERROR_CONNECT;
-} elseif(($version_check = intval($check_result)) && $version_check == $check_result) {
+} elseif (($version_check = intval($check_result)) && $version_check == $check_result) {
   $version_check = $check_result;
 } else {
   // JSON decode if string
   $check_result = json_decode($check_result, true);
   $version_check = $check_result === null ? SNC_VER_UNKNOWN_RESPONSE : $check_result['version_check'];
 
-  switch($mode) {
+  switch ($mode) {
     case SNC_MODE_REGISTER:
-      if($check_result['site']['site_key'] && $check_result['site']['site_id'] && $check_result['site']['result'] == SNC_VER_REGISTER_REGISTERED) {
+      if ($check_result['site']['site_key'] && $check_result['site']['site_id'] && $check_result['site']['result'] == SNC_VER_REGISTER_REGISTERED) {
         classSupernova::$config->db_saveItem('server_updater_key', $check_result['site']['site_key']);
         classSupernova::$config->db_saveItem('server_updater_id', $check_result['site']['site_id']);
       }
@@ -49,7 +49,7 @@ 
 classSupernova::$config->db_saveItem('server_updater_check_last', SN_TIME_NOW);
 classSupernova::$config->db_saveItem('server_updater_check_result', $version_check);
 
-if($ajax) {
+if ($ajax) {
   define('IN_AJAX', true);
   print($version_check);
 }

includes/classes/db_mysql.php

Doc Comments +10 added lines, -3 removed lines

@@ -124,7 +124,7 @@ 
   }
 
   /**
-   * @param $query
+   * @param string $query
    *
    * @return mixed
    */
@@ -140,8 +140,8 @@ 
   }
 
   /**
-   * @param       $query
-   * @param       $fetch
+   * @param       string $query
+   * @param       boolean $fetch
    */
   public function logQuery($query, $fetch) {
     if(!classSupernova::$config->debug) {
@@ -204,6 +204,10 @@ 
 
 
   // TODO Заменить это на новый логгер
+
+  /**
+   * @param string $query
+   */
   function security_watch_user_queries($query) {
     global $user;
 
@@ -227,6 +231,9 @@ 
   }
 
 
+  /**
+   * @param string $query
+   */
   function security_query_check_bad_words($query) {
     global $user, $dm_change_legit, $mm_change_legit;
 

Spacing +26 added lines, -26 removed lines

@@ -73,23 +73,23 @@ 
   public function sn_db_connect($external_db_settings = null) {
     $this->db_disconnect();
 
-    if(!empty($external_db_settings) && is_array($external_db_settings)) {
+    if (!empty($external_db_settings) && is_array($external_db_settings)) {
       $this->dbsettings = $external_db_settings;
     }
 
-    if(empty($this->dbsettings)) {
+    if (empty($this->dbsettings)) {
       $this->load_db_settings();
     }
 
     // TODO - фатальные (?) ошибки на каждом шагу. Хотя - скорее Эксепшны
-    if(!empty($this->dbsettings)) {
+    if (!empty($this->dbsettings)) {
       $driver_name = empty($this->dbsettings['sn_driver']) ? 'db_mysql_v5' : $this->dbsettings['sn_driver'];
       $this->driver = new $driver_name();
       $this->db_prefix = $this->dbsettings['prefix'];
 
       $this->connected = $this->connected || $this->driver_connect();
 
-      if($this->connected) {
+      if ($this->connected) {
         $this->table_list = $this->db_get_table_list();
         // TODO Проверка на пустоту
       }
@@ -103,11 +103,11 @@ 
   protected function driver_connect() {
     global $debug;
 
-    if(!is_object($this->driver)) {
+    if (!is_object($this->driver)) {
       $debug->error_fatal('DB Error - No driver for MySQL found!');
     }
 
-    if(!method_exists($this->driver, 'mysql_connect')) {
+    if (!method_exists($this->driver, 'mysql_connect')) {
       $debug->error_fatal('DB Error - WRONG MySQL driver!');
     }
 
@@ -115,7 +115,7 @@ 
   }
 
   public function db_disconnect() {
-    if($this->connected) {
+    if ($this->connected) {
       $this->connected = !$this->driver_disconnect();
       $this->connected = false;
     }
@@ -130,8 +130,8 @@ 
    */
   public function replaceTablePlaceholders($query) {
     $sql = $query;
-    if(strpos($sql, '{{') !== false) {
-      foreach($this->table_list as $tableName) {
+    if (strpos($sql, '{{') !== false) {
+      foreach ($this->table_list as $tableName) {
         $sql = str_replace("{{{$tableName}}}", $this->db_prefix . $tableName, $sql);
       }
     }
@@ -144,7 +144,7 @@ 
    * @param       $fetch
    */
   protected function logQuery($query, $fetch) {
-    if(!classSupernova::$config->debug) {
+    if (!classSupernova::$config->debug) {
       return;
     }
 
@@ -162,18 +162,18 @@ 
    * @return void
    */
   protected function commentQuery(&$sql) {
-    if(!defined('DEBUG_SQL_COMMENT')) {
+    if (!defined('DEBUG_SQL_COMMENT')) {
       return;
     }
     $backtrace = debug_backtrace();
     $sql_comment = classSupernova::$debug->compact_backtrace($backtrace, defined('DEBUG_SQL_COMMENT_LONG'));
 
     $sql_commented = '/* ' . implode("<br />", $sql_comment) . '<br /> */ ' . preg_replace("/\s+/", ' ', $sql);
-    if(defined('DEBUG_SQL_ONLINE')) {
+    if (defined('DEBUG_SQL_ONLINE')) {
       classSupernova::$debug->warning($sql_commented, 'SQL Debug', LOG_DEBUG_SQL);
     }
 
-    if(defined('DEBUG_SQL_ERROR')) {
+    if (defined('DEBUG_SQL_ERROR')) {
       array_unshift($sql_comment, preg_replace("/\s+/", ' ', $sql));
       classSupernova::$debug->add_to_array($sql_comment);
     }
@@ -182,11 +182,11 @@ 
   }
 
   public function doquery($query, $table = '', $fetch = false, $skip_query_check = false) {
-    if(!is_string($table)) {
+    if (!is_string($table)) {
       $fetch = $table;
     }
 
-    if(!$this->connected) {
+    if (!$this->connected) {
       $this->sn_db_connect();
     }
 
@@ -207,7 +207,7 @@ 
   protected function security_watch_user_queries($query) {
     global $user;
 
-    if(
+    if (
       !$this->isWatching // Not already watching
       && !empty(classSupernova::$config->game_watchlist_array) // There is some players in watchlist
       && in_array($user['id'], classSupernova::$config->game_watchlist_array) // Current player is in watchlist
@@ -215,10 +215,10 @@ 
     ) {
       $this->isWatching = true;
       $msg = "\$query = \"{$query}\"\n\r";
-      if(!empty($_POST)) {
+      if (!empty($_POST)) {
         $msg .= "\n\r" . dump($_POST, '$_POST');
       }
-      if(!empty($_GET)) {
+      if (!empty($_GET)) {
         $msg .= "\n\r" . dump($_GET, '$_GET');
       }
       classSupernova::$debug->warning($msg, "Watching user {$user['id']}", 399, array('base_dump' => true));
@@ -230,7 +230,7 @@ 
   public function security_query_check_bad_words($query) {
     global $user, $dm_change_legit, $mm_change_legit;
 
-    switch(true) {
+    switch (true) {
       case stripos($query, 'RUNCATE TABL') != false:
       case stripos($query, 'ROP TABL') != false:
       case stripos($query, 'ENAME TABL') != false:
@@ -292,11 +292,11 @@ 
     $prefix_length = strlen($this->db_prefix);
 
     $tl = array();
-    while($row = $this->db_fetch($query)) {
-      foreach($row as $table_name) {
-        if(strpos($table_name, $this->db_prefix) === 0) {
+    while ($row = $this->db_fetch($query)) {
+      foreach ($row as $table_name) {
+        if (strpos($table_name, $this->db_prefix) === 0) {
           $table_name = substr($table_name, $prefix_length);
-        } elseif($prefixed_only) {
+        } elseif ($prefixed_only) {
           continue;
         }
         // $table_name = str_replace($db_prefix, '', $table_name);
@@ -391,7 +391,7 @@ 
     $result = array();
 
     $status = explode('  ', $this->driver->mysql_stat());
-    foreach($status as $value) {
+    foreach ($status as $value) {
       $row = explode(': ', $value);
       $result[$row[0]] = $row[1];
     }
@@ -407,10 +407,10 @@ 
     $result = array();
 
     $query = $this->db_sql_query('SHOW STATUS;');
-    if(is_bool($query)) {
+    if (is_bool($query)) {
       throw new Exception('Result of SHOW STATUS command is boolean - which should never happen. Connection to DB is lost?');
     }
-    while($row = db_fetch($query)) {
+    while ($row = db_fetch($query)) {
       $result[$row['Variable_name']] = $row['Value'];
     }
 

includes/debug.class.php

Doc Comments +3 added lines

@@ -70,6 +70,9 @@
     $this->numqueries = 0;
   }
 
+  /**
+   * @param string $mes
+   */
   function add($mes) {
     $this->log .= $mes;
     $this->numqueries++;

Spacing +38 added lines, -39 removed lines

@@ -30,7 +30,7 @@ 
 
 defined('INSIDE') || die();
 
-if(php_sapi_name() == "cli") {
+if (php_sapi_name() == "cli") {
   // In cli-mode
   define('__DEBUG_CRLF', "\r\n");
   define('__DEBUG_LINE', '-------------------------------------------------' . __DEBUG_CRLF);
@@ -50,16 +50,16 @@ 
   function log_file($message, $ident_change = 0) {
     static $ident = 0;
 
-    if(!defined('SN_DEBUG_LOG')) {
+    if (!defined('SN_DEBUG_LOG')) {
       return;
     }
 
-    if($this->log_file_handler === null) {
+    if ($this->log_file_handler === null) {
       $this->log_file_handler = @fopen(SN_ROOT_PHYSICAL . '/.logs/supernova.log', 'a+');
       @fwrite($this->log_file_handler, "\r\n\r\n");
     }
     $ident_change < 0 ? $ident += $ident_change * 2 : false;
-    if($this->log_file_handler) {
+    if ($this->log_file_handler) {
       @fwrite($this->log_file_handler, date(FMT_DATE_TIME_SQL, time()) . str_repeat(' ', $ident + 1) . $message . "\r\n");
     }
     $ident_change > 0 ? $ident += $ident_change * 2 : false;
@@ -90,8 +90,8 @@ 
     $result = array();
     $transaction_id = classSupernova::db_transaction_check(false) ? classSupernova::$transaction_id : classSupernova::$transaction_id++;
     $result[] = "tID {$transaction_id}";
-    foreach($backtrace as $a_trace) {
-      if(in_array($a_trace['function'], $exclude_functions)) {
+    foreach ($backtrace as $a_trace) {
+      if (in_array($a_trace['function'], $exclude_functions)) {
         continue;
       }
       $function =
@@ -108,7 +108,7 @@ 
       // $result[] = "{$function} ({$a_trace['line']})'{$file}'";
       $result[] = "{$function} - '{$file}' Line {$a_trace['line']}";
 
-      if(!$long_comment) {
+      if (!$long_comment) {
         break;
       }
     }
@@ -122,26 +122,26 @@ 
   function dump($dump = false, $force_base = false, $deadlock = false) {
     global $user, $planetrow;
 
-    if($dump === false) {
+    if ($dump === false) {
       return;
     }
 
     $error_backtrace = array();
     $base_dump = false;
 
-    if($force_base === true) {
+    if ($force_base === true) {
       $base_dump = true;
     }
 
-    if($dump === true) {
+    if ($dump === true) {
       $base_dump = true;
     } else {
-      if(!is_array($dump)) {
+      if (!is_array($dump)) {
         $dump = array('var' => $dump);
       }
 
-      foreach($dump as $dump_var_name => $dump_var) {
-        if($dump_var_name == 'base_dump') {
+      foreach ($dump as $dump_var_name => $dump_var) {
+        if ($dump_var_name == 'base_dump') {
           $base_dump = $dump_var;
         } else {
           $error_backtrace[$dump_var_name] = $dump_var;
@@ -149,22 +149,21 @@ 
       }
     }
 
-    if($deadlock && ($q = db_fetch(classSupernova::$db->mysql_get_innodb_status()))) {
+    if ($deadlock && ($q = db_fetch(classSupernova::$db->mysql_get_innodb_status()))) {
       $error_backtrace['deadlock'] = explode("\n", $q['Status']);
       $error_backtrace['locks'] = classSupernova::$locks;
       $error_backtrace['cSN_data'] = classSupernova::$data;
-      foreach($error_backtrace['cSN_data'] as &$location) {
-        foreach($location as $location_id => &$location_data) {
-          $location_data = isset($location_data['username']) ? $location_data['username'] :
-            (isset($location_data['name']) ? $location_data['name'] : $location_id);
+      foreach ($error_backtrace['cSN_data'] as &$location) {
+        foreach ($location as $location_id => &$location_data) {
+          $location_data = isset($location_data['username']) ? $location_data['username'] : (isset($location_data['name']) ? $location_data['name'] : $location_id);
         }
       }
       $error_backtrace['cSN_queries'] = classSupernova::$queries;
     }
 
-    if($base_dump) {
-      if(is_array($this->log_array) && count($this->log_array) > 0) {
-        foreach($this->log_array as $log) {
+    if ($base_dump) {
+      if (is_array($this->log_array) && count($this->log_array) > 0) {
+        foreach ($this->log_array as $log) {
           $error_backtrace['queries'][] = $log;
         }
       }
@@ -193,14 +192,14 @@ 
   function error($message = 'There is a error on page', $title = 'Internal Error', $error_code = 500, $dump = true) {
     global $sys_stop_log_hit, $sys_log_disabled, $user;
 
-    if(empty(classSupernova::$db->connected)) {
+    if (empty(classSupernova::$db->connected)) {
       // TODO - писать ошибку в файл
       die('SQL server currently unavailable. Please contact Administration...');
     }
 
     sn_db_transaction_rollback();
 
-    if(classSupernova::$config->debug == 1) {
+    if (classSupernova::$config->debug == 1) {
       echo "<h2>{$title}</h2><br><font color=red>{$message}</font><br><hr>";
       echo "<table>{$this->log}</table>";
     }
@@ -210,7 +209,7 @@ 
     $error_text = db_escape($message);
     $error_backtrace = $this->dump($dump, true, strpos($message, 'Deadlock') !== false);
 
-    if(!$sys_log_disabled) {
+    if (!$sys_log_disabled) {
       $query = "INSERT INTO `{{logs}}` SET
         `log_time` = '" . time() . "', `log_code` = '" . db_escape($error_code) . "', `log_sender` = '" . db_escape($user['id']) . "',
         `log_username` = '" . db_escape($user['user_name']) . "', `log_title` = '" . db_escape($title) . "',  `log_text` = '" . db_escape($message) . "',
@@ -228,7 +227,7 @@ 
       ob_start();
       print("<hr>User ID {$user['id']} raised error code {$error_code} titled '{$title}' with text '{$error_text}' on page {$_SERVER['SCRIPT_NAME']}");
 
-      foreach($error_backtrace as $name => $value) {
+      foreach ($error_backtrace as $name => $value) {
         print(__DEBUG_LINE);
         pdump($value, $name);
       }
@@ -240,14 +239,14 @@ 
   function warning($message, $title = 'System Message', $log_code = 300, $dump = false) {
     global $user, $sys_log_disabled;
 
-    if(empty(classSupernova::$db->connected)) {
+    if (empty(classSupernova::$db->connected)) {
       // TODO - писать ошибку в файл
       die('SQL server currently unavailable. Please contact Administration...');
     }
 
     $error_backtrace = $this->dump($dump, false);
 
-    if(!$sys_log_disabled) {
+    if (!$sys_log_disabled) {
       $query = "INSERT INTO `{{logs}}` SET
         `log_time` = '" . time() . "', `log_code` = '" . db_escape($log_code) . "', `log_sender` = '" . db_escape($user['id']) . "',
         `log_username` = '" . db_escape($user['user_name']) . "', `log_title` = '" . db_escape($title) . "',  `log_text` = '" . db_escape($message) . "',
@@ -265,11 +264,11 @@ 
 // Dump variables nicer then var_dump()
 
 function dump($value, $varname = null, $level = 0, $dumper = '') {
-  if(isset($varname)) {
+  if (isset($varname)) {
     $varname .= " = ";
   }
 
-  if($level == -1) {
+  if ($level == -1) {
     $trans[' '] = '&there4;';
     $trans["\t"] = '&rArr;';
     $trans["\n"] = '&para;;';
@@ -278,7 +277,7 @@ 
 
     return strtr(htmlspecialchars($value), $trans);
   }
-  if($level == 0) {
+  if ($level == 0) {
 //    $dumper = '<pre>' . mt_rand(10, 99) . '|' . $varname;
     $dumper = mt_rand(10, 99) . '|' . $varname;
   }
@@ -286,22 +285,22 @@ 
   $type = gettype($value);
   $dumper .= $type;
 
-  if($type == 'string') {
+  if ($type == 'string') {
     $dumper .= '(' . strlen($value) . ')';
     $value = dump($value, '', -1);
-  } elseif($type == 'boolean') {
+  } elseif ($type == 'boolean') {
     $value = ($value ? 'true' : 'false');
-  } elseif($type == 'object') {
+  } elseif ($type == 'object') {
     $props = get_class_vars(get_class($value));
     $dumper .= '(' . count($props) . ') <u>' . get_class($value) . '</u>';
-    foreach($props as $key => $val) {
+    foreach ($props as $key => $val) {
       $dumper .= "\n" . str_repeat("\t", $level + 1) . $key . ' => ';
       $dumper .= dump($value->$key, '', $level + 1);
     }
     $value = '';
-  } elseif($type == 'array') {
+  } elseif ($type == 'array') {
     $dumper .= '(' . count($value) . ')';
-    foreach($value as $key => $val) {
+    foreach ($value as $key => $val) {
       $dumper .= "\n" . str_repeat("\t", $level + 1) . dump($key, '', -1) . ' => ';
       $dumper .= dump($val, '', $level + 1);
     }
@@ -321,7 +320,7 @@ 
 //  $backtrace = $backtrace[1];
 
   $caller = '';
-  if(defined('SN_DEBUG_PDUMP_CALLER') && SN_DEBUG_PDUMP_CALLER) {
+  if (defined('SN_DEBUG_PDUMP_CALLER') && SN_DEBUG_PDUMP_CALLER) {
     $caller = (!empty($backtrace[1]['class']) ? $backtrace[1]['class'] : '') .
       (!empty($backtrace[1]['type']) ? $backtrace[1]['type'] : '') .
       $backtrace[1]['function'] .
@@ -348,7 +347,7 @@ 
 }
 
 function pr($prePrint = false) {
-  if($prePrint) {
+  if ($prePrint) {
     print(__DEBUG_CRLF);
   }
   print(mt_rand() . __DEBUG_CRLF);
@@ -358,7 +357,7 @@ 
   global $_PRINT_COUNT_VALUE;
   $_PRINT_COUNT_VALUE++;
 
-  if($prePrint) {
+  if ($prePrint) {
     print(__DEBUG_CRLF);
   }
   print($_PRINT_COUNT_VALUE . __DEBUG_CRLF);

includes/init_secondary.php

Spacing +18 added lines, -18 removed lines

@@ -2,19 +2,19 @@ 
 
 $classLocale = classLocale::$lang;
 
-if(classSupernova::$config->server_updater_check_auto && classSupernova::$config->server_updater_check_last + classSupernova::$config->server_updater_check_period <= SN_TIME_NOW) {
+if (classSupernova::$config->server_updater_check_auto && classSupernova::$config->server_updater_check_last + classSupernova::$config->server_updater_check_period <= SN_TIME_NOW) {
   include(SN_ROOT_PHYSICAL . 'ajax_version_check' . DOT_PHP_EX);
 }
 
-if(classSupernova::$config->user_birthday_gift && SN_TIME_NOW - classSupernova::$config->user_birthday_celebrate > PERIOD_DAY) {
+if (classSupernova::$config->user_birthday_gift && SN_TIME_NOW - classSupernova::$config->user_birthday_celebrate > PERIOD_DAY) {
   require_once(SN_ROOT_PHYSICAL . "includes/includes/user_birthday_celebrate" . DOT_PHP_EX);
   sn_user_birthday_celebrate();
 }
 
-if(!classSupernova::$config->var_online_user_count || classSupernova::$config->var_online_user_time + 30 < SN_TIME_NOW) {
+if (!classSupernova::$config->var_online_user_count || classSupernova::$config->var_online_user_time + 30 < SN_TIME_NOW) {
   classSupernova::$config->db_saveItem('var_online_user_count', db_user_count(true));
   classSupernova::$config->db_saveItem('var_online_user_time', SN_TIME_NOW);
-  if(classSupernova::$config->server_log_online) {
+  if (classSupernova::$config->server_log_online) {
     db_log_online_insert();
   }
 }
@@ -41,7 +41,7 @@ 
 $template_result[F_ACCOUNT_IS_AUTHORIZED] = $sys_user_logged_in = !empty($user) && isset($user['id']) && $user['id'];
 //pdump($template_result[F_ACCOUNT_IS_AUTHORIZED]);die();
 
-if(!empty($user['id'])) {
+if (!empty($user['id'])) {
   classSupernova::$user_options->user_change($user['id']);
 }
 
@@ -54,15 +54,15 @@ 
     : false
   );
 
-if($template_result[F_LOGIN_STATUS] == LOGIN_ERROR_USERNAME_RESTRICTED_CHARACTERS) {
-  $prohibited_characters = array_map(function ($value) {
+if ($template_result[F_LOGIN_STATUS] == LOGIN_ERROR_USERNAME_RESTRICTED_CHARACTERS) {
+  $prohibited_characters = array_map(function($value) {
     return "'" . htmlentities($value, ENT_QUOTES, 'UTF-8') . "'";
   }, str_split(LOGIN_REGISTER_CHARACTERS_PROHIBITED));
   $template_result[F_LOGIN_MESSAGE] .= implode(', ', $prohibited_characters);
 }
 
 
-if(defined('DEBUG_AUTH') && DEBUG_AUTH && !defined('IN_AJAX')) {
+if (defined('DEBUG_AUTH') && DEBUG_AUTH && !defined('IN_AJAX')) {
   pdump("Отключи отладку перед продакшном!");
 }
 
@@ -76,17 +76,17 @@ 
   ? define('INSTALL_MODE', GAME_DISABLE_INSTALL)
   : false;
 
-if($template_result[F_GAME_DISABLE] = classSupernova::$config->game_disable) {
+if ($template_result[F_GAME_DISABLE] = classSupernova::$config->game_disable) {
   $template_result[F_GAME_DISABLE_REASON] = sys_bbcodeParse(
     classSupernova::$config->game_disable == GAME_DISABLE_REASON
       ? classSupernova::$config->game_disable_reason
       : classLocale::$lang['sys_game_disable_reason'][classSupernova::$config->game_disable]
   );
-  if(defined('IN_API')) {
+  if (defined('IN_API')) {
     return;
   }
 
-  if(
+  if (
     ($user['authlevel'] < 1 || !(defined('IN_ADMIN') && IN_ADMIN))
     &&
     !(defined('INSTALL_MODE') && defined('LOGIN_LOGOUT'))
@@ -100,8 +100,8 @@ 
 
 // TODO ban
 // TODO $skip_ban_check
-if($template_result[F_BANNED_STATUS] && !$skip_ban_check) {
-  if(defined('IN_API')) {
+if ($template_result[F_BANNED_STATUS] && !$skip_ban_check) {
+  if (defined('IN_API')) {
     return;
   }
 
@@ -119,13 +119,13 @@ 
 // pdump($allow_anonymous, '$allow_anonymous');
 // pdump($sys_user_logged_in, '$sys_user_logged_in');
 
-if($sys_user_logged_in && INITIAL_PAGE == 'login') {
+if ($sys_user_logged_in && INITIAL_PAGE == 'login') {
   sys_redirect(SN_ROOT_VIRTUAL . 'overview.php');
-} elseif($account_logged_in && !$sys_user_logged_in) { // empty(core_auth::$user['id'])
+} elseif ($account_logged_in && !$sys_user_logged_in) { // empty(core_auth::$user['id'])
 //  pdump($sn_page_name);
 //  pdump(INITIAL_PAGE);
 //  die('{Тут должна быть ваша реклама. Точнее - ввод имени игрока}');
-} elseif(!$allow_anonymous && !$sys_user_logged_in) {
+} elseif (!$allow_anonymous && !$sys_user_logged_in) {
   // sn_setcookie(SN_COOKIE, '', time() - PERIOD_WEEK, SN_ROOT_RELATIVE);
   sys_redirect(SN_ROOT_VIRTUAL . 'login.php');
 }
@@ -146,7 +146,7 @@ 
 
 global $skip_fleet_update;
 $skip_fleet_update = $skip_fleet_update || $supernova->options['fleet_update_skip'] || defined('IN_ADMIN');
-if(
+if (
   !$skip_fleet_update
   && !(defined('IN_AJAX') && IN_AJAX === true)
   && SN_TIME_NOW - strtotime(classSupernova::$config->fleet_update_last) > classSupernova::$config->fleet_update_interval
@@ -155,7 +155,7 @@ 
   flt_flying_fleet_handler($skip_fleet_update);
 }
 
-if(!defined('IN_AJAX')) {
+if (!defined('IN_AJAX')) {
   print("Scheduled processes is disabled<br />");
 }
 // scheduler_process();

admin/tools.php

Switch Indentation +63 added lines, -63 removed lines

@@ -34,69 +34,69 @@
 }
 
 switch($mode) {
-  case ADM_TOOL_CONFIG_RELOAD:
-    classSupernova::$config->db_loadAll();
-    sys_refresh_tablelist();
-
-    classSupernova::$config->db_loadItem('game_watchlist');
-    if(classSupernova::$config->game_watchlist) {
-      classSupernova::$config->game_watchlist_array = explode(';', classSupernova::$config->game_watchlist);
-    } else {
-      unset(classSupernova::$config->game_watchlist_array);
-    }
-  break;
-
-  case ADM_TOOL_MD5:
-    $template = gettemplate("admin/md5enc", true);
-    $password_seed = sys_get_param_str_unsafe('seed', SN_SYS_SEC_CHARS_ALLOWED);
-    $password_length = sys_get_param_int('length', 16);
-    $string = ($string = sys_get_param_str_unsafe('string')) ? $string : sys_random_string($password_length, $password_seed);
-
-    $template->assign_vars(array(
-      'SEED'   => $password_seed,
-      'LENGTH' => $password_length,
-      'STRING' => htmlentities($string),
-      'MD5'    => md5($string),
-    ));
-    display($template, classLocale::$lang['adm_tools_md5_header'], false, '', true);
-  break;
-
-  case ADM_TOOL_FORCE_ALL:
-    classSupernova::$config->db_saveItem('db_version', 0);
-    require_once('../includes/update.php');
-  break;
-
-  case ADM_TOOL_FORCE_LAST:
-    classSupernova::$config->db_saveItem('db_version', floor(classSupernova::$config->db_version - 1));
-    require_once('../includes/update.php');
-  break;
-
-  case ADM_TOOL_INFO_PHP:
-    phpinfo();
-  break;
-
-  case ADM_TOOL_INFO_SQL:
-    $template = gettemplate("simple_table", true);
-
-    $status = array(
-      classLocale::$lang['adm_tool_sql_server_version'] => classSupernova::$db->db_get_server_info(),
-      classLocale::$lang['adm_tool_sql_client_version'] => classSupernova::$db->db_get_client_info(),
-      classLocale::$lang['adm_tool_sql_host_info']      => classSupernova::$db->db_get_host_info(),
-    );
-    templateAssignTable($template, 'server', $status);
-
-    templateAssignTable($template, 'status', classSupernova::$db->db_get_server_stat());
-    templateAssignTable($template, 'params', classSupernova::$db->db_core_show_status());
-
-    $template->assign_vars(array(
-      'PAGE_HEADER'   => classLocale::$lang['adm_tool_sql_page_header'],
-      'COLUMN_NAME_1' => classLocale::$lang['adm_tool_sql_param_name'],
-      'COLUMN_NAME_2' => classLocale::$lang['adm_tool_sql_param_value'],
-      'TABLE_FOOTER'  => 'test',
-    ));
-
-    display($template, classLocale::$lang['adm_bn_ttle'], false, '', true);
-  break;
+    case ADM_TOOL_CONFIG_RELOAD:
+      classSupernova::$config->db_loadAll();
+      sys_refresh_tablelist();
+
+      classSupernova::$config->db_loadItem('game_watchlist');
+      if(classSupernova::$config->game_watchlist) {
+        classSupernova::$config->game_watchlist_array = explode(';', classSupernova::$config->game_watchlist);
+      } else {
+        unset(classSupernova::$config->game_watchlist_array);
+      }
+    break;
+
+    case ADM_TOOL_MD5:
+      $template = gettemplate("admin/md5enc", true);
+      $password_seed = sys_get_param_str_unsafe('seed', SN_SYS_SEC_CHARS_ALLOWED);
+      $password_length = sys_get_param_int('length', 16);
+      $string = ($string = sys_get_param_str_unsafe('string')) ? $string : sys_random_string($password_length, $password_seed);
+
+      $template->assign_vars(array(
+        'SEED'   => $password_seed,
+        'LENGTH' => $password_length,
+        'STRING' => htmlentities($string),
+        'MD5'    => md5($string),
+      ));
+      display($template, classLocale::$lang['adm_tools_md5_header'], false, '', true);
+    break;
+
+    case ADM_TOOL_FORCE_ALL:
+      classSupernova::$config->db_saveItem('db_version', 0);
+      require_once('../includes/update.php');
+    break;
+
+    case ADM_TOOL_FORCE_LAST:
+      classSupernova::$config->db_saveItem('db_version', floor(classSupernova::$config->db_version - 1));
+      require_once('../includes/update.php');
+    break;
+
+    case ADM_TOOL_INFO_PHP:
+      phpinfo();
+    break;
+
+    case ADM_TOOL_INFO_SQL:
+      $template = gettemplate("simple_table", true);
+
+      $status = array(
+        classLocale::$lang['adm_tool_sql_server_version'] => classSupernova::$db->db_get_server_info(),
+        classLocale::$lang['adm_tool_sql_client_version'] => classSupernova::$db->db_get_client_info(),
+        classLocale::$lang['adm_tool_sql_host_info']      => classSupernova::$db->db_get_host_info(),
+      );
+      templateAssignTable($template, 'server', $status);
+
+      templateAssignTable($template, 'status', classSupernova::$db->db_get_server_stat());
+      templateAssignTable($template, 'params', classSupernova::$db->db_core_show_status());
+
+      $template->assign_vars(array(
+        'PAGE_HEADER'   => classLocale::$lang['adm_tool_sql_page_header'],
+        'COLUMN_NAME_1' => classLocale::$lang['adm_tool_sql_param_name'],
+        'COLUMN_NAME_2' => classLocale::$lang['adm_tool_sql_param_value'],
+        'TABLE_FOOTER'  => 'test',
+      ));
+
+      display($template, classLocale::$lang['adm_bn_ttle'], false, '', true);
+    break;
 
 }
 

Spacing +4 added lines, -4 removed lines

@@ -12,7 +12,7 @@ 
 require('../common.' . substr(strrchr(__FILE__, '.'), 1));
 
 // if($user['authlevel'] < 1)
-if($user['authlevel'] < 3) {
+if ($user['authlevel'] < 3) {
   AdminMessage(classLocale::$lang['adm_err_denied']);
 }
 
@@ -25,7 +25,7 @@ 
  */
 function templateAssignTable($template, $str, $status) {
   $template->assign_block_vars('table', classLocale::$lang['adm_tool_sql_table'][$str]);
-  foreach($status as $key => $value) {
+  foreach ($status as $key => $value) {
     $template->assign_block_vars('table.row', array(
       'VALUE_1' => $key,
       'VALUE_2' => $value,
@@ -33,13 +33,13 @@ 
   }
 }
 
-switch($mode) {
+switch ($mode) {
   case ADM_TOOL_CONFIG_RELOAD:
     classSupernova::$config->db_loadAll();
     sys_refresh_tablelist();
 
     classSupernova::$config->db_loadItem('game_watchlist');
-    if(classSupernova::$config->game_watchlist) {
+    if (classSupernova::$config->game_watchlist) {
       classSupernova::$config->game_watchlist_array = explode(';', classSupernova::$config->game_watchlist);
     } else {
       unset(classSupernova::$config->game_watchlist_array);