supernova-ws / SuperNova

phalanx.php

Spacing +8 added lines, -8 removed lines

@@ -18,17 +18,17 @@ 
 
 $sensorLevel = mrc_get_level($user, $planetrow, STRUC_MOON_PHALANX);
 if (!intval($sensorLevel)) {
-  messageBox ($lang['phalanx_nosensoravailable'], $lang['tech'][STRUC_MOON_PHALANX], '', 3);
+  messageBox($lang['phalanx_nosensoravailable'], $lang['tech'][STRUC_MOON_PHALANX], '', 3);
 }
 
 if ($planetrow['planet_type'] != PT_MOON) {
-  messageBox ($lang['phalanx_onlyformoons'], $lang['tech'][STRUC_MOON_PHALANX], '', 3);
+  messageBox($lang['phalanx_onlyformoons'], $lang['tech'][STRUC_MOON_PHALANX], '', 3);
 }
 
 $scan_galaxy  = sys_get_param_int('galaxy');
 $scan_system  = sys_get_param_int('system');
 $scan_planet  = sys_get_param_int('planet');
-$scan_planet_type  = 1; // sys_get_param_int('planettype');
+$scan_planet_type = 1; // sys_get_param_int('planettype');
 $id = sys_get_param_id('id');
 
 $source_galaxy = $planetrow['galaxy'];
@@ -38,9 +38,9 @@ 
 $sensorRange = GetPhalanxRange($sensorLevel);
 
 $system_distance = abs($source_system - $scan_system);
-if($system_distance > $sensorRange || $scan_galaxy != $source_galaxy)
+if ($system_distance > $sensorRange || $scan_galaxy != $source_galaxy)
 {
-  messageBox ($lang['phalanx_rangeerror'], $lang['tech'][STRUC_MOON_PHALANX], '', 3);
+  messageBox($lang['phalanx_rangeerror'], $lang['tech'][STRUC_MOON_PHALANX], '', 3);
 }
 
 $cost = $sensorLevel * 1000;
@@ -51,14 +51,14 @@ 
 }
 
 $planet_scanned = DBStaticPlanet::db_planet_by_gspt($scan_galaxy, $scan_system, $scan_planet, $scan_planet_type);
-if(!$planet_scanned['id'])
+if (!$planet_scanned['id'])
 {
   messageBox($lang['phalanx_planet_not_exists'], $lang['tech'][STRUC_MOON_PHALANX], '', 3);
 }
 
-if($planet_scanned['destruyed'])
+if ($planet_scanned['destruyed'])
 {
-  messageBox ($lang['phalanx_planet_destroyed'], $lang['tech'][STRUC_MOON_PHALANX], '', 3);
+  messageBox($lang['phalanx_planet_destroyed'], $lang['tech'][STRUC_MOON_PHALANX], '', 3);
 }
 
 DBStaticPlanet::db_planet_set_by_id($user['current_planet'], "deuterium = deuterium - {$cost}");

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 @@ 
 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,

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)
 {
   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'];
   }
 }
@@ -185,16 +185,16 @@ 
 
 function sn_maintenance_pack_user_list($user_list) {
   $user_list = explode(',', $user_list);
-  foreach($user_list as $key => $user_id) {
-    if(!ceil(floatval($user_id))) {
+  foreach ($user_list as $key => $user_id) {
+    if (!ceil(floatval($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'];
     }
   }
@@ -209,11 +209,11 @@ 
 $old_server_status == GAME_DISABLE_NONE ? classSupernova::$config->db_saveItem('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/statbuilder.php

Spacing +3 added lines, -3 removed lines

@@ -9,8 +9,8 @@ 
  * @copyright 2008 by Chlorel for XNova
  */
 
-define('INSIDE'  , true);
-define('INSTALL' , false);
+define('INSIDE', true);
+define('INSTALL', false);
 define('IN_ADMIN', true);
 require_once('../common.' . substr(strrchr(__FILE__, '.'), 1));
 
@@ -18,7 +18,7 @@ 
 
 messageBoxAdminAccessDenied(AUTH_LEVEL_ADMINISTRATOR);
 
-if(SN_TIME_NOW >= classSupernova::$config->db_loadItem('var_stat_update_admin_forced') && SN_TIME_NOW >= classSupernova::$config->db_loadItem('var_stat_update_end'))
+if (SN_TIME_NOW >= classSupernova::$config->db_loadItem('var_stat_update_admin_forced') && SN_TIME_NOW >= classSupernova::$config->db_loadItem('var_stat_update_end'))
 {
   classSupernova::$config->db_saveItem('var_stat_update_admin_forced', SN_TIME_NOW + 120);
 

Braces +1 added lines, -2 removed lines

@@ -37,8 +37,7 @@
   </script>';
 
   messageBoxAdmin("{$script}<img src=\"design/images/progressbar.gif\"><br>{$lang['sys_wait']}", $lang['adm_stat_title'], '', 0);
-}
-else
+} else
 {
   messageBoxAdmin($lang['adm_stat_already_started'], $lang['adm_stat_title'], 'admin/overview.php');
 }

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 = classSupernova::$config->game_mode == GAME_BLITZ ? 'sys_blitz_page_disabled' : (
     !classSupernova::$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(classSupernova::$config->db_loadItem('game_blitz_register_round'));
 $current_price = intval(classSupernova::$config->db_loadItem('game_blitz_register_price'));
 
-if(classSupernova::$config->db_loadItem('game_blitz_register') == BLITZ_REGISTER_OPEN && (sys_get_param_str('register_me') || sys_get_param_str('register_me_not'))) {
+if (classSupernova::$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} Блица");
       classSupernova::$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(classSupernova::$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];
 
@@ -95,7 +95,7 @@ 
 
       $moon_row = uni_create_moon($galaxy, $system, $planet, $user_new['id'], 30, '', false);
 
-      if(($system += $system_step) >= classSupernova::$config->game_maxSystem) {
+      if (($system += $system_step) >= classSupernova::$config->game_maxSystem) {
         $galaxy++;
         $system = $system_step;
       }
@@ -104,13 +104,13 @@ 
 
     classSupernova::$config->db_saveItem('users_amount', classSupernova::$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
@@ -124,15 +124,15 @@ 
     $blitz_result = array();
   }
 
-  if(classSupernova::$config->game_mode == GAME_BLITZ) {
+  if (classSupernova::$config->game_mode == GAME_BLITZ) {
     $blitz_result = array(classSupernova::$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++;
@@ -147,13 +147,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;
         }
 
@@ -161,15 +161,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;
         }
       }
@@ -189,12 +189,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(classSupernova::$config->game_blitz_register == BLITZ_REGISTER_DISCLOSURE_NAMES) {
+  if (classSupernova::$config->game_blitz_register == BLITZ_REGISTER_DISCLOSURE_NAMES) {
     // Вот так хитро, что бы не было не единого шанса попадания на страницу данных об игроках Блиц-сервера до закрытия раунда
     $tpl_player_data = array_merge($tpl_player_data, array(
       'ID' => $row['id'],
@@ -207,7 +207,7 @@ 
   }
 
   $template->assign_block_vars('registrations', $tpl_player_data);
-  if($row['id'] == $user['id']) {
+  if ($row['id'] == $user['id']) {
     $player_registered = $row;
   }
 }

classes/DBStaticPlanet.php

Spacing +12 added lines, -13 removed lines

@@ -39,8 +39,7 @@ 
     $galaxy = isset($vector[$prefix . 'galaxy']) ? intval($vector[$prefix . 'galaxy']) : 0;
     $system = isset($vector[$prefix . 'system']) ? intval($vector[$prefix . 'system']) : 0;
     $planet = isset($vector[$prefix . 'planet']) ? intval($vector[$prefix . 'planet']) : 0;
-    $planet_type = isset($vector[$prefix . 'planet_type']) ? intval($vector[$prefix . 'planet_type']) :
-      (isset($vector[$prefix . 'type']) ? intval($vector[$prefix . 'type']) : 0);
+    $planet_type = isset($vector[$prefix . 'planet_type']) ? intval($vector[$prefix . 'planet_type']) : (isset($vector[$prefix . 'type']) ? intval($vector[$prefix . 'type']) : 0);
     $planet_type = $planet_type == PT_DEBRIS ? PT_PLANET : $planet_type;
 
     return DBStaticPlanet::db_planet_by_gspt_safe($galaxy, $system, $planet, $planet_type, $for_update, $fields);
@@ -61,7 +60,7 @@ 
 //  }
 
   public static function db_planet_by_parent($parent_id, $for_update = false, $fields = '*') {
-    if(!($parent_id = idval($parent_id))) {
+    if (!($parent_id = idval($parent_id))) {
       return false;
     }
 
@@ -70,7 +69,7 @@ 
   }
 
   public static function db_planet_by_id_and_owner($planet_id, $owner_id, $for_update = false, $fields = '*') {
-    if(!($planet_id = idval($planet_id)) || !($owner_id = idval($owner_id))) {
+    if (!($planet_id = idval($planet_id)) || !($owner_id = idval($owner_id))) {
       return false;
     }
     return classSupernova::db_get_record_list(LOC_PLANET,
@@ -79,7 +78,7 @@ 
 
 
   public static function db_planet_list_moon_other($user_id, $this_moon_id) {
-    if(!($user_id = idval($user_id)) || !($this_moon_id = idval($this_moon_id))) {
+    if (!($user_id = idval($user_id)) || !($this_moon_id = idval($this_moon_id))) {
       return false;
     }
     return classSupernova::db_get_record_list(LOC_PLANET,
@@ -94,7 +93,7 @@ 
   }
 
   public static function db_planet_list_sorted($user_row, $skip_planet_id = false, $field_list = '', $conditions = '') {
-    if(!is_array($user_row)) {
+    if (!is_array($user_row)) {
       return false;
     }
     $conditions .= $skip_planet_id ? " AND `id` <> {$skip_planet_id} " : '';
@@ -115,7 +114,7 @@ 
   }
 
   public static function db_planet_list_by_user_or_planet($user_id, $planet_id) {
-    if(!($user_id = idval($user_id)) && !($planet_id = idval($planet_id))) {
+    if (!($user_id = idval($user_id)) && !($planet_id = idval($planet_id))) {
       return false;
     }
 
@@ -124,14 +123,14 @@ 
   }
 
   public static function db_planet_set_by_id($planet_id, $set) {
-    if(!($planet_id = idval($planet_id))) {
+    if (!($planet_id = idval($planet_id))) {
       return false;
     }
     return classSupernova::db_upd_record_by_id(LOC_PLANET, $planet_id, $set);
   }
 
   public static function db_planet_set_by_gspt($ui_galaxy, $ui_system, $ui_planet, $ui_planet_type = PT_ALL, $set) {
-    if(!($set = trim($set))) {
+    if (!($set = trim($set))) {
       return false;
     }
 
@@ -144,14 +143,14 @@ 
   }
 
   public static function db_planet_set_by_parent($ui_parent_id, $ss_set) {
-    if(!($si_parent_id = idval($ui_parent_id)) || !($ss_set = trim($ss_set))) {
+    if (!($si_parent_id = idval($ui_parent_id)) || !($ss_set = trim($ss_set))) {
       return false;
     }
     return classSupernova::db_upd_record_list(LOC_PLANET, "`parent_planet` = {$si_parent_id}", $ss_set);
   }
 
   public static function db_planet_set_by_owner($ui_owner_id, $ss_set) {
-    if(!($si_owner_id = idval($ui_owner_id)) || !($ss_set = trim($ss_set))) {
+    if (!($si_owner_id = idval($ui_owner_id)) || !($ss_set = trim($ss_set))) {
       return false;
     }
     return classSupernova::db_upd_record_list(LOC_PLANET, "`id_owner` = {$si_owner_id}", $ss_set);
@@ -159,7 +158,7 @@ 
 
 
   public static function db_planet_delete_by_id($planet_id) {
-    if(!($planet_id = idval($planet_id))) {
+    if (!($planet_id = idval($planet_id))) {
       return false;
     }
     classSupernova::db_del_record_by_id(LOC_PLANET, $planet_id);
@@ -169,7 +168,7 @@ 
   }
 
   public static function db_planet_list_delete_by_owner($ui_owner_id) {
-    if(!($si_owner_id = idval($ui_owner_id))) {
+    if (!($si_owner_id = idval($ui_owner_id))) {
       return false;
     }
     classSupernova::db_del_record_list(LOC_PLANET, "`id_owner` = {$si_owner_id}");

classes/classLocale.php

Spacing +43 added lines, -43 removed lines

@@ -28,13 +28,13 @@ 
 
     $this->container = array();
 
-    if(classSupernova::$cache->getMode() != classCache::CACHER_NO_CACHE && !classSupernova::$config->locale_cache_disable) {
+    if (classSupernova::$cache->getMode() != classCache::CACHER_NO_CACHE && !classSupernova::$config->locale_cache_disable) {
       $this->cache = classSupernova::$cache;
       classSupernova::log_file('locale.__constructor: Cache is present');
 //$this->cache->unset_by_prefix($this->cache_prefix); // TODO - remove? 'cause debug!
     }
 
-    if($enable_stat_usage && empty($this->stat_usage)) {
+    if ($enable_stat_usage && empty($this->stat_usage)) {
       $this->enable_stat_usage = $enable_stat_usage;
       $this->usage_stat_load();
       // TODO shutdown function
@@ -60,9 +60,9 @@ 
     unset($fallback[$this->active]);
 
     // Проходим по оставшимся локалям
-    foreach($fallback as $try_language) {
+    foreach ($fallback as $try_language) {
       // Если нет такой строки - пытаемся вытащить из кэша
-      if(!isset($this->container[$try_language][$offset]) && $this->cache) {
+      if (!isset($this->container[$try_language][$offset]) && $this->cache) {
         $this->container[$try_language][$offset] = $this->cache->__get($this->cache_prefix . $try_language . '_' . $offset);
 // Записываем результат работы кэша
 $locale_cache_statistic['queries']++;
@@ -71,7 +71,7 @@ 
       }
 
       // Если мы как-то где-то нашли строку...
-      if(isset($this->container[$try_language][$offset])) {
+      if (isset($this->container[$try_language][$offset])) {
         // ...значит она получена в результате фоллбэка и записываем её в кэш и контейнер
         $this[$offset] = $this->container[$try_language][$offset];
         $locale_cache_statistic['fallbacks']++;
@@ -85,15 +85,15 @@ 
       $this->container[$this->active][] = $value;
     } else {
       $this->container[$this->active][$offset] = $value;
-      if($this->cache) {
+      if ($this->cache) {
         $this->cache->__set($this->cache_prefix_lang . $offset, $value);
       }
     }
   }
   public function offsetExists($offset) {
     // Шорткат если у нас уже есть строка в памяти PHP
-    if(!isset($this->container[$this->active][$offset])) {
-      if(!$this->cache || !($this->container[$this->active][$offset] = $this->cache->__get($this->cache_prefix_lang . $offset))) {
+    if (!isset($this->container[$this->active][$offset])) {
+      if (!$this->cache || !($this->container[$this->active][$offset] = $this->cache->__get($this->cache_prefix_lang . $offset))) {
         // Если нету такой строки - делаем фоллбэк
         $this->locale_string_fallback($offset);
       }
@@ -107,7 +107,7 @@ 
   }
   public function offsetGet($offset) {
     $value = $this->offsetExists($offset) ? $this->container[$this->active][$offset] : null;
-    if($this->enable_stat_usage) {
+    if ($this->enable_stat_usage) {
       $this->usage_stat_log($offset, $value);
     }
     return $value;
@@ -124,24 +124,24 @@ 
   public function usage_stat_load() {
     global $sn_cache;
 
-    $this->stat_usage = $sn_cache->lng_stat_usage  = array(); // TODO for debug
-    if(empty($this->stat_usage)) {
+    $this->stat_usage = $sn_cache->lng_stat_usage = array(); // TODO for debug
+    if (empty($this->stat_usage)) {
       $query = doquery("SELECT * FROM {{lng_usage_stat}}");
-      while($row = db_fetch($query)) {
+      while ($row = db_fetch($query)) {
         $this->stat_usage[$row['lang_code'] . ':' . $row['string_id'] . ':' . $row['file'] . ':' . $row['line']] = $row['is_empty'];
       }
     }
   }
   public function usage_stat_save() {
-    if(!empty($this->stat_usage_new)) {
+    if (!empty($this->stat_usage_new)) {
       global $sn_cache;
       $sn_cache->lng_stat_usage = $this->stat_usage;
       doquery("SELECT 1 FROM {{lng_usage_stat}} LIMIT 1");
-      foreach($this->stat_usage_new as &$value) {
-        foreach($value as &$value2) {
+      foreach ($this->stat_usage_new as &$value) {
+        foreach ($value as &$value2) {
           $value2 = '"' . db_escape($value2) . '"';
         }
-        $value = '(' . implode(',', $value) .')';
+        $value = '(' . implode(',', $value) . ')';
       }
       doquery("REPLACE INTO {{lng_usage_stat}} (lang_code,string_id,`file`,line,is_empty,locale) VALUES " . implode(',', $this->stat_usage_new));
     }
@@ -154,7 +154,7 @@ 
     $file = str_replace('\\', '/', substr($trace[1]['file'], strlen(SN_ROOT_PHYSICAL) - 1));
 
     $string_id = $this->active . ':' . $offset . ':' . $file . ':' . $trace[1]['line'];
-    if(!isset($this->stat_usage[$string_id]) || $this->stat_usage[$string_id] != $empty) {
+    if (!isset($this->stat_usage[$string_id]) || $this->stat_usage[$string_id] != $empty) {
       $this->stat_usage[$string_id] = empty($value);
       $this->stat_usage_new[] = array(
         'lang_code' => $this->active,
@@ -194,11 +194,11 @@ 
     $cache_file_key = $this->cache_prefix_lang . '__' . $filename;
 
     // Подключен ли внешний кэш?
-    if($this->cache) {
+    if ($this->cache) {
       // Загружен ли уже данный файл?
       $cache_file_status = $this->cache->__get($cache_file_key);
       classSupernova::log_file("locale.include: Cache - '{$filename}' has key '{$cache_file_key}' and is " . ($cache_file_status ? 'already loaded - EXIT' : 'EMPTY'), $cache_file_status ? -1 : 0);
-      if($cache_file_status) {
+      if ($cache_file_status) {
         // Если да - повторять загрузку нет смысла
         return null;
       }
@@ -212,35 +212,35 @@ 
     $this->make_fallback($language);
 
     $file_path = '';
-    foreach($this->fallback as $lang_try) {
-      if(!$lang_try /* || isset($language_tried[$lang_try]) */) {
+    foreach ($this->fallback as $lang_try) {
+      if (!$lang_try /* || isset($language_tried[$lang_try]) */) {
         continue;
       }
 
-      if($file_path = $this->lng_try_filepath($path, "language/{$lang_try}/{$filename_ext}")) {
+      if ($file_path = $this->lng_try_filepath($path, "language/{$lang_try}/{$filename_ext}")) {
         break;
       }
 
-      if($file_path = $this->lng_try_filepath($path, "language/{$filename}_{$lang_try}{$ext}")) {
+      if ($file_path = $this->lng_try_filepath($path, "language/{$filename}_{$lang_try}{$ext}")) {
         break;
       }
 
       $file_path = '';
     }
 
-    if($file_path) {
+    if ($file_path) {
       include($file_path);
 
-      if(!empty($a_lang_array)) {
+      if (!empty($a_lang_array)) {
         $this->merge($a_lang_array);
 
         // Загрузка данных из файла в кэш
-        if($this->cache) {
+        if ($this->cache) {
           classSupernova::log_file("Locale: loading '{$filename}' into cache");
-          foreach($a_lang_array as $key => $value) {
+          foreach ($a_lang_array as $key => $value) {
             $value_cache_key = $this->cache_prefix_lang . $key;
-            if($this->cache->__isset($value_cache_key)) {
-              if(is_array($value)) {
+            if ($this->cache->__isset($value_cache_key)) {
+              if (is_array($value)) {
                 $alt_value = $this->cache->__get($value_cache_key);
                 $value = array_replace_recursive($alt_value, $value);
               }
@@ -250,7 +250,7 @@ 
         }
       }
 
-      if($this->cache) {
+      if ($this->cache) {
         $this->cache->__set($cache_file_key, true);
       }
 
@@ -263,14 +263,14 @@ 
   }
 
   public function lng_load_i18n($i18n) {
-    if(!isset($i18n)) {
+    if (!isset($i18n)) {
       return;
     }
 
-    foreach($i18n as $i18n_data) {
-      if(is_string($i18n_data)) {
+    foreach ($i18n as $i18n_data) {
+      if (is_string($i18n_data)) {
         $this->lng_include($i18n_data);
-      } elseif(is_array($i18n_data)) {
+      } elseif (is_array($i18n_data)) {
         $this->lng_include($i18n_data['file'], $i18n_data['path']);
       }
     }
@@ -288,7 +288,7 @@ 
 
     classSupernova::log_file("locale.switch: Trying to switch language to '{$language_new}'");
 
-    if($language_new == $this->active) {
+    if ($language_new == $this->active) {
       classSupernova::log_file("locale.switch: New language '{$language_new}' is equal to current language '{$this->active}' - EXIT", -1);
       return false;
     }
@@ -299,10 +299,10 @@ 
     $this['LANG_INFO'] = $this->lng_get_info($this->active);
     $this->make_fallback($this->active);
 
-    if($this->cache) {
+    if ($this->cache) {
       $cache_lang_init_status = $this->cache->__get($this->cache_prefix_lang . '__INIT');
       classSupernova::log_file("locale.switch: Cache for '{$this->active}' prefixed '{$this->cache_prefix_lang}' is " . ($cache_lang_init_status ? 'already loaded. Doing nothing - EXIT' : 'EMPTY'), $cache_lang_init_status ? -1 : 0);
-      if($cache_lang_init_status) {
+      if ($cache_lang_init_status) {
         return false;
       }
 
@@ -318,7 +318,7 @@ 
     // Loading global language files
     $this->lng_load_i18n($sn_mvc['i18n']['']);
 
-    if($this->cache) {
+    if ($this->cache) {
       classSupernova::log_file("locale.switch: Cache - setting flag " . $this->cache_prefix_lang . '__INIT');
       $this->cache->__set($this->cache_prefix_lang . '__INIT', true);
     }
@@ -332,7 +332,7 @@ 
   public function lng_get_info($entry) {
     $file_name = SN_ROOT_PHYSICAL . 'language/' . $entry . '/language.mo.php';
     $lang_info = array();
-    if(file_exists($file_name)) {
+    if (file_exists($file_name)) {
       include($file_name);
     }
 
@@ -340,15 +340,15 @@ 
   }
 
   public function lng_get_list() {
-    if(empty($this->lang_list)) {
+    if (empty($this->lang_list)) {
       $this->lang_list = array();
 
       $path = SN_ROOT_PHYSICAL . 'language/';
       $dir = dir($path);
-      while(false !== ($entry = $dir->read())) {
-        if(is_dir($path . $entry) && $entry[0] != '.') {
+      while (false !== ($entry = $dir->read())) {
+        if (is_dir($path . $entry) && $entry[0] != '.') {
           $lang_info = $this->lng_get_info($entry);
-          if($lang_info['LANG_NAME_ISO2'] == $entry) {
+          if ($lang_info['LANG_NAME_ISO2'] == $entry) {
             $this->lang_list[$lang_info['LANG_NAME_ISO2']] = $lang_info;
           }
         }

classes/OldDbChangeSet.php

Braces +12 added lines, -7 removed lines

@@ -23,8 +23,7 @@ 
    * @return array
    * @deprecated
    */
-  public static function db_changeset_prepare_unit($unit_id, $unit_value, $user, $planet_id = null)
-  {
+  public static function db_changeset_prepare_unit($unit_id, $unit_value, $user, $planet_id = null) {
     if(!is_array($user))
     {
       // TODO - remove later
@@ -61,8 +60,7 @@ 
           ),
         ),
       );
-    }
-    else
+    } else
     {
       $db_changeset = array(
         'action' => SQL_OP_INSERT,
@@ -176,14 +174,21 @@ 
    */
   public static function db_changeset_apply($db_changeset) {
     $result = true;
-    if(!is_array($db_changeset) || empty($db_changeset)) return $result;
+    if(!is_array($db_changeset) || empty($db_changeset)) {
+      return $result;
+    }
 
     foreach($db_changeset as $table_name => &$table_data) {
       foreach($table_data as $record_id => &$conditions) {
         OldDbChangeSet::db_changeset_condition_compile($conditions, $table_name);
 
-        if($conditions['action'] != SQL_OP_DELETE && !$conditions[P_FIELDS_STR]) continue;
-        if($conditions['action'] == SQL_OP_DELETE && !$conditions[P_WHERE_STR]) continue; // Защита от случайного удаления всех данных в таблице
+        if($conditions['action'] != SQL_OP_DELETE && !$conditions[P_FIELDS_STR]) {
+          continue;
+        }
+        if($conditions['action'] == SQL_OP_DELETE && !$conditions[P_WHERE_STR]) {
+          continue;
+        }
+        // Защита от случайного удаления всех данных в таблице
 
         if($conditions[P_LOCATION] != LOC_NONE) {
           switch($conditions['action'])

Spacing +24 added lines, -26 removed lines

@@ -25,14 +25,14 @@ 
    */
   public static function db_changeset_prepare_unit($unit_id, $unit_value, $user, $planet_id = null)
   {
-    if(!is_array($user))
+    if (!is_array($user))
     {
       // TODO - remove later
       print('<h1>СООБЩИТЕ ЭТО АДМИНУ: OldDbChangeSet::db_changeset_prepare_unit() - USER is not ARRAY</h1>');
       pdump(debug_backtrace());
       die('USER is not ARRAY');
     }
-    if(!isset($user['id']) || !$user['id'])
+    if (!isset($user['id']) || !$user['id'])
     {
       // TODO - remove later
       print('<h1>СООБЩИТЕ ЭТО АДМИНУ: OldDbChangeSet::db_changeset_prepare_unit() - USER[id] пустой</h1>');
@@ -47,7 +47,7 @@ 
     $location_id = $location_id ? $location_id : 'NULL';
 
     $temp = DBStaticUnit::db_unit_by_location($user['id'], $unit_location, $location_id, $unit_id);
-    if(!empty($temp['unit_id']))
+    if (!empty($temp['unit_id']))
     {
       $db_changeset = array(
         'action' => SQL_OP_UPDATE,
@@ -93,9 +93,9 @@ 
   }
 
   public static function db_changeset_condition_compile(&$conditions, &$table_name = '') {
-    if(!$conditions[P_LOCATION] || $conditions[P_LOCATION] == LOC_NONE) {
+    if (!$conditions[P_LOCATION] || $conditions[P_LOCATION] == LOC_NONE) {
       $conditions[P_LOCATION] = LOC_NONE;
-      switch($table_name) {
+      switch ($table_name) {
         case 'users':
         case LOC_USER:
           $conditions[P_TABLE_NAME] = $table_name = 'users';
@@ -117,18 +117,18 @@ 
     }
 
     $conditions[P_FIELDS_STR] = '';
-    if($conditions['fields']) {
+    if ($conditions['fields']) {
       $fields = array();
-      foreach($conditions['fields'] as $field_name => $field_data) {
+      foreach ($conditions['fields'] as $field_name => $field_data) {
         $condition = "`{$field_name}` = ";
         $value = '';
-        if($field_data['delta']) {
+        if ($field_data['delta']) {
           $value = "`{$field_name}`" . ($field_data['delta'] >= 0 ? '+' : '') . $field_data['delta'];
-        } elseif($field_data['set']) {
-          $value = (is_string($field_data['set']) ? "'{$field_data['set']}'": $field_data['set']);
+        } elseif ($field_data['set']) {
+          $value = (is_string($field_data['set']) ? "'{$field_data['set']}'" : $field_data['set']);
         }
 
-        if($value) {
+        if ($value) {
           $fields[] = $condition . $value;
         }
       }
@@ -136,16 +136,14 @@ 
     }
 
     $conditions[P_WHERE_STR] = '';
-    if(!empty($conditions['where'])) {
-      if($conditions[P_VERSION] == 1) {
+    if (!empty($conditions['where'])) {
+      if ($conditions[P_VERSION] == 1) {
         $the_conditions = array();
-        foreach($conditions['where'] as $field_id => $field_value) {
+        foreach ($conditions['where'] as $field_id => $field_value) {
           // Простое условие - $field_id = $field_value
-          if(is_string($field_id)) {
+          if (is_string($field_id)) {
             $field_value =
-              $field_value === null ? 'NULL' :
-                (is_string($field_value) ? "'" . db_escape($field_value) . "'" :
-                  (is_bool($field_value) ? intval($field_value) : $field_value));
+              $field_value === null ? 'NULL' : (is_string($field_value) ? "'" . db_escape($field_value) . "'" : (is_bool($field_value) ? intval($field_value) : $field_value));
             $the_conditions[] = "`{$field_id}` = {$field_value}";
           } else {
             die('Неподдерживаемый тип условия');
@@ -157,7 +155,7 @@ 
       $conditions[P_WHERE_STR] = implode(' AND ', $the_conditions);
     }
 
-    switch($conditions['action']) {
+    switch ($conditions['action']) {
       case SQL_OP_DELETE: $conditions[P_ACTION_STR] = ("DELETE FROM {{{$table_name}}}"); break;
       case SQL_OP_UPDATE: $conditions[P_ACTION_STR] = ("UPDATE {{{$table_name}}} SET"); break;
       case SQL_OP_INSERT: $conditions[P_ACTION_STR] = ("INSERT INTO {{{$table_name}}} SET"); break;
@@ -176,17 +174,17 @@ 
    */
   public static function db_changeset_apply($db_changeset) {
     $result = true;
-    if(!is_array($db_changeset) || empty($db_changeset)) return $result;
+    if (!is_array($db_changeset) || empty($db_changeset)) return $result;
 
-    foreach($db_changeset as $table_name => &$table_data) {
-      foreach($table_data as $record_id => &$conditions) {
+    foreach ($db_changeset as $table_name => &$table_data) {
+      foreach ($table_data as $record_id => &$conditions) {
         OldDbChangeSet::db_changeset_condition_compile($conditions, $table_name);
 
-        if($conditions['action'] != SQL_OP_DELETE && !$conditions[P_FIELDS_STR]) continue;
-        if($conditions['action'] == SQL_OP_DELETE && !$conditions[P_WHERE_STR]) continue; // Защита от случайного удаления всех данных в таблице
+        if ($conditions['action'] != SQL_OP_DELETE && !$conditions[P_FIELDS_STR]) continue;
+        if ($conditions['action'] == SQL_OP_DELETE && !$conditions[P_WHERE_STR]) continue; // Защита от случайного удаления всех данных в таблице
 
-        if($conditions[P_LOCATION] != LOC_NONE) {
-          switch($conditions['action'])
+        if ($conditions[P_LOCATION] != LOC_NONE) {
+          switch ($conditions['action'])
           {
             case SQL_OP_DELETE: $result = classSupernova::db_del_record_list($conditions[P_LOCATION], $conditions[P_WHERE_STR]) && $result; break;
             case SQL_OP_UPDATE: $result = classSupernova::db_upd_record_list($conditions[P_LOCATION], $conditions[P_WHERE_STR], $conditions[P_FIELDS_STR]) && $result; break;

classes/Core/Watchdog.php

Spacing +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
     $configValue = $forceLoad ? $this->config->db_loadItem($configName) : $this->config[$configName];
     $configType == WATCHDOG_TIME_SQL ? $configValue = strtotime($configValue, SN_TIME_NOW) : false;
 
-    if(SN_TIME_NOW - $configValue > $timeDiff) {
+    if (SN_TIME_NOW - $configValue > $timeDiff) {
       $callable();
     }