supernova-ws / SuperNova

classes/Entity/KeyedModel.php

Spacing +1 added lines, -1 removed lines

@@ -90,7 +90,7 @@
   /**
    * @param KeyedContainer $cEntity
    */
-  protected function onSaveUnchanged($cEntity){
+  protected function onSaveUnchanged($cEntity) {
     // TODO - or just save nothing ?????
     // throw new \Exception('EntityModel isNotEmpty, have dbId and not CHANGED! It can\'t be!');
     // Do nothing

Braces +1 added lines, -1 removed lines

@@ -90,7 +90,7 @@
   /**
    * @param KeyedContainer $cEntity
    */
-  protected function onSaveUnchanged($cEntity){
+  protected function onSaveUnchanged($cEntity) {
     // TODO - or just save nothing ?????
     // throw new \Exception('EntityModel isNotEmpty, have dbId and not CHANGED! It can\'t be!');
     // Do nothing

classes/db_mysql.php

Doc Comments +22 added lines, -4 removed lines

@@ -164,7 +164,7 @@ 
   /**
    * @param string $query
    *
-   * @return mixed|string
+   * @return string
    */
   public function replaceTablePlaceholders($query) {
     $sql = $query;
@@ -178,7 +178,7 @@ 
   }
 
   /**
-   * @param $query
+   * @param string $query
    */
   protected function logQuery($query) {
     if (!classSupernova::$config->debug) {
@@ -290,6 +290,7 @@ 
    * @param array  $fields
    * @param array  $where
    * @param bool   $isOneRecord
+   * @param boolean $forUpdate
    *
    * @return array|bool|mysqli_result|null
    *
@@ -332,6 +333,10 @@ 
 
   //
   // INSERT/REPLACE ----------------------------------------------------------------------------------------------------
+
+  /**
+   * @param string $query
+   */
   public function doInsertComplex($query) {
     return $this->doSql($query);
   }
@@ -408,7 +413,7 @@ 
    * Self-contained - means no params used
    * Such queries usually used to make large amount of in-base calculations
    *
-   * @param $query
+   * @param string $query
    *
    * @return array|bool|mysqli_result|null
    */
@@ -425,13 +430,16 @@ 
   }
 
   /**
-   * @param $DbQuery DbQuery
+   * @param DbQuery $DbQuery DbQuery
    */
   public function doUpdateDbQueryAdjust($DbQuery) {
     return $this->doUpdateDbQuery($DbQuery);
   }
 
 
+  /**
+   * @param boolean $isOneRecord
+   */
   protected function doUpdateWhere($table, $fieldsSet, $fieldsAdjust = array(), $where = array(), $isOneRecord = DB_RECORDS_ALL, $whereDanger = array()) {
     $query = DbQuery::build($this)
       ->setTable($table)
@@ -450,6 +458,9 @@ 
     return $this->doUpdateWhere($table, $fieldsAndValues, array(), $where, DB_RECORD_ONE);
   }
 
+  /**
+   * @param string $table
+   */
   public function doUpdateTableSet($table, $fieldsAndValues, $where = array()) {
     return $this->doUpdateWhere($table, $fieldsAndValues, array(), $where, DB_RECORDS_ALL);
   }
@@ -559,6 +570,10 @@ 
   //
   // OTHER FUNCTIONS ----------------------------------------------------------------------------------------------------------
   // TODO Заменить это на новый логгер
+
+  /**
+   * @param string $query
+   */
   protected function security_watch_user_queries($query) {
     global $user;
 
@@ -582,6 +597,9 @@ 
   }
 
 
+  /**
+   * @param string $query
+   */
   public function security_query_check_bad_words($query) {
     if ($this->skipQueryCheck) {
       return;

Spacing +3 added lines, -3 removed lines

@@ -589,7 +589,7 @@ 
 
     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:
@@ -651,7 +651,7 @@ 
     $prefix_length = strlen($this->db_prefix);
 
     $tl = array();
-    while($row = $this->db_fetch($query)) {
+    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);
@@ -785,7 +785,7 @@ 
     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'];
     }
 

phalanx.php

Spacing +9 added lines, -9 removed lines

@@ -20,17 +20,17 @@ 
 
 $sensorLevel = mrc_get_level($user, $planetrow, STRUC_MOON_PHALANX);
 if (!intval($sensorLevel)) {
-  message (classLocale::$lang['phalanx_nosensoravailable'], classLocale::$lang['tech'][STRUC_MOON_PHALANX], '', 3);
+  message(classLocale::$lang['phalanx_nosensoravailable'], classLocale::$lang['tech'][STRUC_MOON_PHALANX], '', 3);
 }
 
 if ($planetrow['planet_type'] != PT_MOON) {
-  message (classLocale::$lang['phalanx_onlyformoons'], classLocale::$lang['tech'][STRUC_MOON_PHALANX], '', 3);
+  message(classLocale::$lang['phalanx_onlyformoons'], classLocale::$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'];
@@ -40,9 +40,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)
 {
-  message (classLocale::$lang['phalanx_rangeerror'], classLocale::$lang['tech'][STRUC_MOON_PHALANX], '', 3);
+  message(classLocale::$lang['phalanx_rangeerror'], classLocale::$lang['tech'][STRUC_MOON_PHALANX], '', 3);
 }
 
 $cost = $sensorLevel * 1000;
@@ -53,20 +53,20 @@ 
 }
 
 $planet_scanned = DBStaticPlanet::db_planet_by_gspt($scan_galaxy, $scan_system, $scan_planet, $scan_planet_type);
-if(!$planet_scanned['id'])
+if (!$planet_scanned['id'])
 {
   message(classLocale::$lang['phalanx_planet_not_exists'], classLocale::$lang['tech'][STRUC_MOON_PHALANX], '', 3);
 }
 
-if($planet_scanned['destruyed'])
+if ($planet_scanned['destruyed'])
 {
-  message (classLocale::$lang['phalanx_planet_destroyed'], classLocale::$lang['tech'][STRUC_MOON_PHALANX], '', 3);
+  message(classLocale::$lang['phalanx_planet_destroyed'], classLocale::$lang['tech'][STRUC_MOON_PHALANX], '', 3);
 }
 
 DBStaticPlanet::db_planet_update_adjust_by_id(
   $user['current_planet'],
   array(
-    'deuterium' => - $cost,
+    'deuterium' => -$cost,
   )
 );
 

resources.php

Spacing +1 added lines, -1 removed lines

@@ -83,7 +83,7 @@
     }
   }
 
-  if(!empty($SubQry)) {
+  if (!empty($SubQry)) {
     DBStaticPlanet::db_planet_update_set_by_id(
       $planetrow['id'],
       $SubQry

blitz_register.php

Spacing +26 added lines, -26 removed lines

@@ -8,12 +8,12 @@ 
 
 global $user;
 
-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) {
     message(classLocale::$lang[$error_message], classLocale::$lang['sys_error'], 'overview.php', 10);
     die();
   }
@@ -22,16 +22,16 @@ 
 $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 = DBStaticUser::db_user_by_id($user['id'], true);
   $is_registered = db_blitz_reg_get_id_by_player_and_round($user, $current_round);
-  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) {
       db_blitz_reg_insert($user['id'], $current_round);
       classSupernova::$auth->account->metamatter_change(RPG_BLITZ_REGISTRATION, -$current_price, "Регистрация в раунде {$current_round} Блица");
     }
-  } elseif(sys_get_param_str('register_me_not') && !empty($is_registered)) {
+  } elseif (sys_get_param_str('register_me_not') && !empty($is_registered)) {
     db_blitz_reg_delete($user['id'], $current_round);
     classSupernova::$auth->account->metamatter_change(RPG_BLITZ_REGISTRATION_CANCEL, $current_price, "Отмена регистрации в раунде {$current_round} Блица");
   }
@@ -46,17 +46,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 = db_blitz_reg_get_random_id($current_round);
-    while($row = db_fetch($query)) {
+    while ($row = db_fetch($query)) {
       $next_id++;
       $blitz_name = 'Игрок' . $next_id;
       $blitz_password = sys_random_string(8);
       db_blitz_reg_update_with_name_and_password($blitz_name, $blitz_password, $row['id'], $current_round);
     }
-  } elseif(sys_get_param_str('import_generated')) {
+  } elseif (sys_get_param_str('import_generated')) {
     // ЭТО НА БЛИЦЕ!!!
     DBStaticUser::db_player_list_blitz_delete_players();
     DBStaticPlanet::db_planets_purge();
@@ -78,7 +78,7 @@ 
     $system = $system_step;
     $planet = round(Vector::$knownPlanets / 2);
 
-    foreach($imported_string as &$string_data) {
+    foreach ($imported_string as &$string_data) {
       $string_data = explode(',', $string_data);
       $username_safe = $string_data[0];
 
@@ -98,7 +98,7 @@ 
 
       $moon_row = uni_create_moon($galaxy, $system, $planet, $user_new['id'], 30, '', false);
 
-      if(($system += $system_step) >= Vector::$knownSystems) {
+      if (($system += $system_step) >= Vector::$knownSystems) {
         $galaxy++;
         $system = $system_step;
       }
@@ -108,27 +108,27 @@ 
     classSupernova::$config->db_saveItem('users_amount', classSupernova::$config->users_amount + $new_players);
     // pdump($imported_string);
     // 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) {
         db_blitz_reg_update_results($current_round, $blitz_result_data[1], $blitz_result_data[0], $blitz_result_data[2], $blitz_result_data[3], $blitz_result_data[4]);
       }
     }
     $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'));
-    foreach(DBStaticUser::db_player_list_export_blitz_info() as $row) {
+    foreach (DBStaticUser::db_player_list_export_blitz_info() as $row) {
       $blitz_result[] = "{$row['id']},{$row['username']},{$row['onlinetime']},{$row['total_rank']},{$row['total_points']}";
     }
   } else {
     $query = db_blitz_reg_get_player_list($current_round);
-    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++;
@@ -136,13 +136,13 @@ 
     $blitz_prize_dark_matter = $blitz_prize_players_active * 20000;
     $blitz_prize_places = ceil($blitz_prize_players_active / 5);
 
-    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 = db_blitz_reg_get_player_list_order_by_place($current_round);
-      while($row = db_fetch($query)) {
-        if(!$row['blitz_place']) {
+      while ($row = db_fetch($query)) {
+        if (!$row['blitz_place']) {
           continue;
         }
 
@@ -151,14 +151,14 @@ 
 
         $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) {
+        if ($reward) {
           rpg_points_change($row['user_id'], RPG_BLITZ, $reward, sprintf(
             classLocale::$lang['sys_blitz_reward_log_message'], $row['blitz_place'], $row['blitz_name']
           ));
           db_blitz_reg_update_apply_results($reward, $row, $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;
         }
       }
@@ -173,12 +173,12 @@ 
 
 $player_registered = false;
 $query = db_blitz_reg_get_player_list_and_users($current_round);
-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'],
@@ -191,7 +191,7 @@ 
   }
 
   $template->assign_block_vars('registrations', $tpl_player_data);
-  if($row['id'] == $user['id']) {
+  if ($row['id'] == $user['id']) {
     $player_registered = $row;
   }
 }

overview.php

Spacing +37 added lines, -37 removed lines

@@ -52,7 +52,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');
 
@@ -62,7 +62,7 @@ 
     $template  = gettemplate('planet_manage', true);
     $planet_id = sys_get_param_id('planet_id');
 
-    if(sys_get_param_str('rename') && ($new_name_unsafe = sys_get_param_str_unsafe('new_name'))) {
+    if (sys_get_param_str('rename') && ($new_name_unsafe = sys_get_param_str_unsafe('new_name'))) {
       $planetrow['name'] = $new_name_unsafe;
       DBStaticPlanet::db_planet_update_set_by_id(
         $planetrow['id'],
@@ -70,21 +70,21 @@ 
           'name' => $new_name_unsafe,
         )
       );
-    } elseif(sys_get_param_str('action') == 'make_capital') {
+    } elseif (sys_get_param_str('action') == 'make_capital') {
       try {
         sn_db_transaction_start();
         $user = DBStaticUser::db_user_by_id($user['id'], true, '*');
         $planetrow = DBStaticPlanet::db_planet_by_id($planetrow['id'], true, '*');
 
-        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);
         }
 
@@ -109,16 +109,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')))
@@ -135,7 +135,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']);
         }
 
@@ -154,7 +154,7 @@ 
           array()
         );
 
-        if($planetrow['id'] == $user['id_planet']) {
+        if ($planetrow['id'] == $user['id_planet']) {
           DBStaticUser::db_user_set_by_id(
             $user['id'],
             array(
@@ -174,17 +174,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;
           DBStaticPlanet::db_planet_update_set_by_id(
             $user['current_planet'],
@@ -210,9 +210,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) ||
@@ -227,8 +227,8 @@ 
       $user = DBStaticUser::db_user_by_id($user['id'], true);
       $planetrow = DBStaticPlanet::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']++;
         } else {
           $planetrow['PLANET_GOVERNOR_LEVEL'] = 1;
@@ -260,8 +260,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;
       }
 
@@ -313,7 +313,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);
     }
 
@@ -323,7 +323,7 @@ 
   default:
     sn_sys_sector_buy();
 
-    if(sys_get_param_str('rename') && $new_name_unsafe = sys_get_param_str_unsafe('new_name')) {
+    if (sys_get_param_str('rename') && $new_name_unsafe = sys_get_param_str_unsafe('new_name')) {
       $planetrow['name'] = $new_name_unsafe;
       DBStaticPlanet::db_planet_update_set_by_id(
         $planetrow['id'],
@@ -358,7 +358,7 @@ 
 
     $planet_count = 0;
     $planets_query = DBStaticPlanet::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();
@@ -369,16 +369,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 = DBStaticPlanet::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;
@@ -418,7 +418,7 @@ 
     tpl_assign_fleet($template, $fleets);
 
     $lune = $planetrow['planet_type'] == PT_PLANET ? DBStaticPlanet::db_planet_by_parent($planetrow['id']) : DBStaticPlanet::db_planet_by_id($planetrow['parent_planet']);
-    if($lune) {
+    if ($lune) {
       $template->assign_vars(array(
         'MOON_ID' => $lune['id'],
         'MOON_IMG' => $lune['image'],
@@ -430,15 +430,15 @@ 
     $planet_fill = $planet_fill > 100 ? 100 : $planet_fill;
 
     $planet_recyclers_orbiting = 0;
-    foreach(classSupernova::$gc->groupRecyclers as $recycler_id) {
+    foreach (classSupernova::$gc->groupRecyclers 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,
@@ -446,8 +446,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));
           }
         }
@@ -461,7 +461,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,
@@ -473,12 +473,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);
     }
 
@@ -535,7 +535,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);
     }
 

jumpgate.php

Spacing +17 added lines, -17 removed lines

@@ -18,30 +18,30 @@ 
 
 lng_include('fleet');
 
-if($TargetPlanet = sys_get_param_id('jmpto'))
+if ($TargetPlanet = sys_get_param_id('jmpto'))
 {
   sn_db_transaction_start();
   DBStaticUser::db_user_by_id($user['id'], true, 'id');
   $planetrow = DBStaticPlanet::db_planet_by_id($planetrow['id'], true);
-  if(!($NextJumpTime = uni_get_time_to_jump($planetrow)))
+  if (!($NextJumpTime = uni_get_time_to_jump($planetrow)))
   {
     $TargetGate = DBStaticPlanet::db_planet_by_id($TargetPlanet, true, '`id`, `last_jump_time`');
-    if(mrc_get_level($user, $TargetGate, STRUC_MOON_GATE) > 0)
+    if (mrc_get_level($user, $TargetGate, STRUC_MOON_GATE) > 0)
     {
-      $NextDestTime = uni_get_time_to_jump ( $TargetGate );
-      if(!$NextDestTime)
+      $NextDestTime = uni_get_time_to_jump($TargetGate);
+      if (!$NextDestTime)
       {
         $ship_list = sys_get_param('ships');
         $jumpMade = false;
-        foreach($ship_list as $ship_id => $ship_count)
+        foreach ($ship_list as $ship_id => $ship_count)
         {
-          if(!in_array($ship_id, classSupernova::$gc->groupFleet))
+          if (!in_array($ship_id, classSupernova::$gc->groupFleet))
           {
             continue;
           }
 
           $ship_count = max(0, min(floor($ship_count), mrc_get_level($user, $planetrow, $ship_id)));
-          if($ship_count)
+          if ($ship_count)
           {
             $jumpMade = true;
             DBStaticUnit::dbUpdateOrInsertUnit($ship_id, -$ship_count, $user, $planetrow['id']);
@@ -49,7 +49,7 @@ 
           }
         }
 
-        if($jumpMade)
+        if ($jumpMade)
         {
           DBStaticPlanet::db_planet_update_set_by_id(
             $TargetGate['id'],
@@ -71,31 +71,31 @@ 
           );
 
           $planetrow['last_jump_time'] = SN_TIME_NOW;
-          $RetMessage = classLocale::$lang['gate_jump_done'] ." - ". pretty_time(uni_get_time_to_jump($planetrow));
+          $RetMessage = classLocale::$lang['gate_jump_done'] . " - " . pretty_time(uni_get_time_to_jump($planetrow));
         } else {
           $RetMessage = classLocale::$lang['gate_wait_data'];
         }
       } else {
-        $RetMessage = classLocale::$lang['gate_wait_dest'] ." - ". pretty_time($NextDestTime);
+        $RetMessage = classLocale::$lang['gate_wait_dest'] . " - " . pretty_time($NextDestTime);
       }
     } else {
       $RetMessage = classLocale::$lang['gate_no_dest_g'];
     }
   } else {
-    $RetMessage = classLocale::$lang['gate_wait_star'] ." - ". pretty_time($NextJumpTime);
+    $RetMessage = classLocale::$lang['gate_wait_star'] . " - " . pretty_time($NextJumpTime);
   }
   sn_db_transaction_commit();
   message($RetMessage, classLocale::$lang['tech'][STRUC_MOON_GATE], "jumpgate.php", 10);
 } else {
   $template = gettemplate('jumpgate', true);
-  if(mrc_get_level($user, $planetrow, STRUC_MOON_GATE) > 0)
+  if (mrc_get_level($user, $planetrow, STRUC_MOON_GATE) > 0)
   {
     $Combo = '';
     $MoonList = DBStaticPlanet::db_planet_list_moon_other($user['id'], $planetrow['id']);
     // while($CurMoon = db_fetch($MoonList))
-    foreach($MoonList as $CurMoon)
+    foreach ($MoonList as $CurMoon)
     {
-      if(mrc_get_level($user, $CurMoon, STRUC_MOON_GATE) >= 1)
+      if (mrc_get_level($user, $CurMoon, STRUC_MOON_GATE) >= 1)
       {
         $NextJumpTime = uni_get_time_to_jump($CurMoon);
         $template->assign_block_vars('moon', array(
@@ -109,9 +109,9 @@ 
       }
     }
 
-    foreach(classSupernova::$gc->groupFleet as $Ship)
+    foreach (classSupernova::$gc->groupFleet as $Ship)
     {
-      if(($ship_count = mrc_get_level($user, $planetrow, $Ship)) <= 0)
+      if (($ship_count = mrc_get_level($user, $planetrow, $Ship)) <= 0)
       {
         continue;
       }

Braces +1 added lines, -2 removed lines

@@ -131,8 +131,7 @@
     ));
 
     display($template, classLocale::$lang['tech'][STRUC_MOON_GATE]);
-  }
-  else
+  } else
   {
     message(classLocale::$lang['gate_no_src_ga'], classLocale::$lang['tech'][STRUC_MOON_GATE], "overview.php", 10);
   }

includes/pages/options.php

Spacing +45 added lines, -45 removed lines

@@ -15,7 +15,7 @@ 
 
   $language_new = sys_get_param_str('langer', $user['lang']);
 
-  if($language_new != $user['lang']) {
+  if ($language_new != $user['lang']) {
     classLocale::$lang->lng_switch($language_new);
   }
 
@@ -24,8 +24,8 @@ 
 
   $FMT_DATE = preg_replace(array('/d/', '/m/', '/Y/'), array('DD', 'MM', 'YYYY'), FMT_DATE);
 
-  if(sys_get_param_str('mode') == 'change') {
-    if($user['authlevel'] > 0) {
+  if (sys_get_param_str('mode') == 'change') {
+    if ($user['authlevel'] > 0) {
       $planet_protection = sys_get_param_int('adm_pl_prot') ? $user['authlevel'] : 0;
       DBStaticPlanet::db_planet_set_by_owner(
         $user['id'],
@@ -42,27 +42,27 @@ 
       );
     }
 
-    if(sys_get_param_int('vacation') && !classSupernova::$config->user_vacation_disable) {
+    if (sys_get_param_int('vacation') && !classSupernova::$config->user_vacation_disable) {
       sn_db_transaction_start();
-      if($user['authlevel'] < 3) {
-        if($user['vacation_next'] > SN_TIME_NOW) {
+      if ($user['authlevel'] < 3) {
+        if ($user['vacation_next'] > SN_TIME_NOW) {
           message(classLocale::$lang['opt_vacation_err_timeout'], classLocale::$lang['Error'], 'index.php?page=options', 5);
           die();
         }
 
-        if(FleetList::fleet_count_flying($user['id'])) {
+        if (FleetList::fleet_count_flying($user['id'])) {
           message(classLocale::$lang['opt_vacation_err_your_fleet'], classLocale::$lang['Error'], 'index.php?page=options', 5);
           die();
         }
 
         $que = que_get($user['id'], false);
-        if(!empty($que)) {
+        if (!empty($que)) {
           message(classLocale::$lang['opt_vacation_err_que'], classLocale::$lang['Error'], 'index.php?page=options', 5);
           die();
         }
 
         $query = classSupernova::$gc->cacheOperator->db_get_record_list(LOC_PLANET, "`id_owner` = {$user['id']}");
-        foreach($query as $planet) {
+        foreach ($query as $planet) {
           $classConfig = classSupernova::$config;
           DBStaticPlanet::db_planet_update_set_by_id(
             $planet['id'],
@@ -90,9 +90,9 @@ 
       sn_db_transaction_commit();
     }
 
-    foreach($user_option_list as $option_group_id => $option_group) {
-      foreach($option_group as $option_name => $option_value) {
-        if($user[$option_name] !== null) {
+    foreach ($user_option_list as $option_group_id => $option_group) {
+      foreach ($option_group as $option_name => $option_value) {
+        if ($user[$option_name] !== null) {
           $user[$option_name] = sys_get_param_str($option_name);
         } else {
           $user[$option_name] = $option_value;
@@ -103,8 +103,8 @@ 
 
 
     $player_options = sys_get_param('options');
-    if(!empty($player_options)) {
-      array_walk($player_options, function (&$value) {
+    if (!empty($player_options)) {
+      array_walk($player_options, function(&$value) {
         // TODO - Когда будет больше параметров - сделать больше проверок
         $value = intval($value);
       });
@@ -115,15 +115,15 @@ 
 
     $username = substr(sys_get_param_str_unsafe('username'), 0, 32);
     $username_safe = db_escape($username);
-    if($username && $user['username'] != $username && classSupernova::$config->game_user_changename != SERVER_PLAYER_NAME_CHANGE_NONE && sys_get_param_int('username_confirm') && !strpbrk($username, LOGIN_REGISTER_CHARACTERS_PROHIBITED)) {
+    if ($username && $user['username'] != $username && classSupernova::$config->game_user_changename != SERVER_PLAYER_NAME_CHANGE_NONE && sys_get_param_int('username_confirm') && !strpbrk($username, LOGIN_REGISTER_CHARACTERS_PROHIBITED)) {
       // проверка на корректность
       sn_db_transaction_start();
       $name_check = db_player_name_history_get_name_by_name($username_safe);
-      if(!$name_check || $name_check['player_id'] == $user['id']) {
+      if (!$name_check || $name_check['player_id'] == $user['id']) {
         $user = DBStaticUser::db_user_by_id($user['id'], true);
-        switch(classSupernova::$config->game_user_changename) {
+        switch (classSupernova::$config->game_user_changename) {
           case SERVER_PLAYER_NAME_CHANGE_PAY:
-            if(mrc_get_level($user, $planetrow, RES_DARK_MATTER) < classSupernova::$config->game_user_changename_cost) {
+            if (mrc_get_level($user, $planetrow, RES_DARK_MATTER) < classSupernova::$config->game_user_changename_cost) {
               $template_result['.']['result'][] = array(
                 'STATUS'  => ERR_ERROR,
                 'MESSAGE' => classLocale::$lang['opt_msg_name_change_err_no_dm'],
@@ -159,18 +159,18 @@ 
       sn_db_transaction_commit();
     }
 
-    if($new_password = sys_get_param('newpass1')) {
+    if ($new_password = sys_get_param('newpass1')) {
       try {
-        if($new_password != sys_get_param('newpass2')) {
+        if ($new_password != sys_get_param('newpass2')) {
           throw new Exception(classLocale::$lang['opt_err_pass_unmatched'], ERR_WARNING);
         }
 
-        if(!classSupernova::$auth->password_change(sys_get_param('db_password'), $new_password)) {
+        if (!classSupernova::$auth->password_change(sys_get_param('db_password'), $new_password)) {
           throw new Exception(classLocale::$lang['opt_err_pass_wrong'], ERR_WARNING);
         }
 
         throw new Exception(classLocale::$lang['opt_msg_pass_changed'], ERR_NONE);
-      } catch(Exception $e) {
+      } catch (Exception $e) {
         $template_result['.']['result'][] = array(
           'STATUS'  => in_array($e->getCode(), array(ERR_NONE, ERR_WARNING, ERR_ERROR)) ? $e->getCode() : ERR_ERROR,
           'MESSAGE' => $e->getMessage()
@@ -192,12 +192,12 @@ 
     $user['gender'] = $user['gender'] == GENDER_UNKNOWN ? $gender : $user['gender'];
 
     try {
-      if($user['birthday']) {
+      if ($user['birthday']) {
         throw new exception();
       }
 
       $user_birthday = sys_get_param_str_unsafe('user_birthday');
-      if(!$user_birthday || $user_birthday == $FMT_DATE) {
+      if (!$user_birthday || $user_birthday == $FMT_DATE) {
         throw new exception();
       }
 
@@ -207,16 +207,16 @@ 
       $pos['Y'] = strpos(FMT_DATE, 'Y');
       asort($pos);
       $i = 0;
-      foreach($pos as &$position) {
+      foreach ($pos as &$position) {
         $position = ++$i;
       }
 
       $regexp = "/" . preg_replace(array('/\\\\/', '/\//', '/\./', '/\-/', '/d/', '/m/', '/Y/'), array('\\\\\\', '\/', '\.', '\-', '(\d?\d)', '(\d?\d)', '(\d{4})'), FMT_DATE) . "/";
-      if(!preg_match($regexp, $user_birthday, $match)) {
+      if (!preg_match($regexp, $user_birthday, $match)) {
         throw new exception();
       }
 
-      if(!checkdate($match[$pos['m']], $match[$pos['d']], $match[$pos['Y']])) {
+      if (!checkdate($match[$pos['m']], $match[$pos['d']], $match[$pos['Y']])) {
         throw new exception();
       }
 
@@ -224,12 +224,12 @@ 
       // EOF black magic! Now we have valid SQL date in $user['user_birthday'] - independent of date format
 
       $year = date('Y', SN_TIME_NOW);
-      if(mktime(0, 0, 0, $match[$pos['m']], $match[$pos['d']], $year) > SN_TIME_NOW) {
+      if (mktime(0, 0, 0, $match[$pos['m']], $match[$pos['d']], $year) > SN_TIME_NOW) {
         $year--;
       }
       $user['user_birthday_celebrated'] = "{$year}-{$match[$pos['m']]}-{$match[$pos['d']]}";
 
-    } catch(Exception $e) {
+    } catch (Exception $e) {
     }
 
     require_once('includes/includes/sys_avatar.php');
@@ -238,14 +238,14 @@ 
     $template_result['.']['result'][] = $avatar_upload_result;
 
     $user_time_diff = playerTimeDiff::user_time_diff_get();
-    if(sys_get_param_int('PLAYER_OPTION_TIME_DIFF_FORCED')) {
+    if (sys_get_param_int('PLAYER_OPTION_TIME_DIFF_FORCED')) {
       playerTimeDiff::user_time_diff_set(array(
         PLAYER_OPTION_TIME_DIFF              => sys_get_param_int('PLAYER_OPTION_TIME_DIFF'),
         PLAYER_OPTION_TIME_DIFF_UTC_OFFSET   => 0,
         PLAYER_OPTION_TIME_DIFF_FORCED       => 1,
         PLAYER_OPTION_TIME_DIFF_MEASURE_TIME => SN_TIME_SQL,
       ));
-    } elseif(sys_get_param_int('opt_time_diff_clear') || $user_time_diff[PLAYER_OPTION_TIME_DIFF_FORCED]) {
+    } elseif (sys_get_param_int('opt_time_diff_clear') || $user_time_diff[PLAYER_OPTION_TIME_DIFF_FORCED]) {
       playerTimeDiff::user_time_diff_set(array(
         PLAYER_OPTION_TIME_DIFF              => '',
         PLAYER_OPTION_TIME_DIFF_UTC_OFFSET   => 0,
@@ -276,7 +276,7 @@ 
       'STATUS'  => ERR_NONE,
       'MESSAGE' => classLocale::$lang['opt_msg_saved']
     );
-  } elseif(sys_get_param_str('result') == 'ok') {
+  } elseif (sys_get_param_str('result') == 'ok') {
     $template_result['.']['result'][] = array(
       'STATUS'  => ERR_NONE,
       'MESSAGE' => classLocale::$lang['opt_msg_saved']
@@ -300,8 +300,8 @@ 
   $template = gettemplate('options', $template);
 
   $dir = dir(SN_ROOT_PHYSICAL . 'skins');
-  while(($entry = $dir->read()) !== false) {
-    if(is_dir("skins/{$entry}") && $entry[0] != '.') {
+  while (($entry = $dir->read()) !== false) {
+    if (is_dir("skins/{$entry}") && $entry[0] != '.') {
       $template_result['.']['skin_list'][] = array(
         'VALUE'    => $entry,
         'NAME'     => $entry,
@@ -311,7 +311,7 @@ 
   }
   $dir->close();
 
-  foreach(classLocale::$lang['opt_planet_sort_options'] as $key => &$value) {
+  foreach (classLocale::$lang['opt_planet_sort_options'] as $key => &$value) {
     $template_result['.']['planet_sort_options'][] = array(
       'VALUE'    => $key,
       'NAME'     => $value,
@@ -319,7 +319,7 @@ 
     );
   }
 
-  foreach(classLocale::$lang['sys_gender_list'] as $key => $value) {
+  foreach (classLocale::$lang['sys_gender_list'] as $key => $value) {
     $template_result['.']['gender_list'][] = array(
       'VALUE'    => $key,
       'NAME'     => $value,
@@ -328,7 +328,7 @@ 
   }
 
   $lang_list = lng_get_list();
-  foreach($lang_list as $lang_id => $lang_data) {
+  foreach ($lang_list as $lang_id => $lang_data) {
     $template_result['.']['languages'][] = array(
       'VALUE'    => $lang_id,
       'NAME'     => $lang_data['LANG_NAME_NATIVE'],
@@ -337,8 +337,8 @@ 
   }
 
 
-  if(isset(classLocale::$lang['menu_customize_show_hide_button_state'])) {
-    foreach(classLocale::$lang['menu_customize_show_hide_button_state'] as $key => $value) {
+  if (isset(classLocale::$lang['menu_customize_show_hide_button_state'])) {
+    foreach (classLocale::$lang['menu_customize_show_hide_button_state'] as $key => $value) {
       $template->assign_block_vars('menu_customize_show_hide_button_state', array(
         'ID'   => $key,
         'NAME' => $value,
@@ -445,10 +445,10 @@ 
     'PAGE_HEADER' => classLocale::$lang['opt_header'],
   ));
 
-  foreach($user_option_list as $option_group_id => $option_group) {
-    if($option_group_id == OPT_MESSAGE) {
-      foreach(DBStaticMessages::$snMessageClassList as $message_class_id => $message_class_data) {
-        if($message_class_data['switchable'] || ($message_class_data['email'] && classSupernova::$config->game_email_pm)) {
+  foreach ($user_option_list as $option_group_id => $option_group) {
+    if ($option_group_id == OPT_MESSAGE) {
+      foreach (DBStaticMessages::$snMessageClassList as $message_class_id => $message_class_data) {
+        if ($message_class_data['switchable'] || ($message_class_data['email'] && classSupernova::$config->game_email_pm)) {
           $option_name = $message_class_data['name'];
 
           $template->assign_block_vars("options_{$option_group_id}", array(
@@ -460,8 +460,8 @@ 
         }
       }
     } else {
-      foreach($option_group as $option_name => $option_value) {
-        if(array_key_exists($option_name, $user_option_types)) {
+      foreach ($option_group as $option_name => $option_value) {
+        if (array_key_exists($option_name, $user_option_types)) {
           $option_type = $user_option_types[$option_name];
         } else {
           $option_type = 'switch';

includes/pages/techtree.php

Braces +1 added lines, -2 removed lines

@@ -8,8 +8,7 @@
 
 classSupernova::$sn_mvc['view']['techtree'][] = 'sn_techtree_view';
 
-function sn_techtree_view($template = null)
-{
+function sn_techtree_view($template = null) {
   global $user, $planetrow;
 
   $tech_tree = array();

Spacing +2 added lines, -2 removed lines

@@ -13,14 +13,14 @@
   global $user, $planetrow;
 
   $tech_tree = array();
-  foreach(get_unit_param('techtree') as $unit_group_id => $unit_list)
+  foreach (get_unit_param('techtree') as $unit_group_id => $unit_list)
   {
     $tech_tree[] = array(
       'NAME' => classLocale::$lang['tech'][$unit_group_id],
       'GROUP_ID' => $unit_group_id,
     );
 
-    foreach($unit_list as $unit_id)
+    foreach ($unit_list as $unit_id)
     {
       $sn_data_unit = get_unit_param($unit_id);
       $level_basic = $sn_data_unit[P_STACKABLE] ? 0 : mrc_get_level($user, $planetrow, $unit_id, false, true);