supernova-ws / SuperNova

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/constants.php

Spacing +17 added lines, -17 removed lines

@@ -302,7 +302,7 @@ 
 define('SN_PAYMENT_REQUEST_OK', 0);
 define('SN_PAYMENT_REQUEST_ERROR_UNIT_AMOUNT', 1);
 define('SN_PAYMENT_REQUEST_ERROR_PAYLINK_UNSUPPORTED', 2);
-define('SN_PAYMENT_REQUEST_IP_WRONG', 3);  // Неправильный IP входящей системы - обычно хак
+define('SN_PAYMENT_REQUEST_IP_WRONG', 3); // Неправильный IP входящей системы - обычно хак
 define('SN_PAYMENT_REQUEST_COMMAND_UNSUPPORTED', 4); // Неподдерживаемая команда - обычно хак
 define('SN_PAYMENT_REQUEST_SIGNATURE_INVALID', 5); // Неправильная подпись или не сошлась контрольная сумма - обычно хак
 define('SN_MODULE_DISABLED', 6); // Модуль отключен // УНИВЕРСАЛЬНЫЙ ОТВЕТ!
@@ -772,14 +772,14 @@ 
 
 
 // *** Mercenary/talent bonus types
-define('BONUS_NONE', 0);  // No bonus
-define('BONUS_PERCENT', 1);  // Percent on base value
-define('BONUS_ADD', 2);  // Add
-define('BONUS_ABILITY', 3);  // Some ability
-define('BONUS_MULTIPLY', 4);  // Multiply by value
-define('BONUS_PERCENT_CUMULATIVE', 5);  // Cumulative percent on base value
-define('BONUS_PERCENT_DEGRADED', 6);  // Bonus amount degraded with increase as pow(bonus, level) (?)
-define('BONUS_SPEED', 7);  // Speed bonus
+define('BONUS_NONE', 0); // No bonus
+define('BONUS_PERCENT', 1); // Percent on base value
+define('BONUS_ADD', 2); // Add
+define('BONUS_ABILITY', 3); // Some ability
+define('BONUS_MULTIPLY', 4); // Multiply by value
+define('BONUS_PERCENT_CUMULATIVE', 5); // Cumulative percent on base value
+define('BONUS_PERCENT_DEGRADED', 6); // Bonus amount degraded with increase as pow(bonus, level) (?)
+define('BONUS_SPEED', 7); // Speed bonus
 
 // *** Action constant (build should be replaced with ACTION)
 define('BUILD_CREATE', 1);
@@ -991,10 +991,10 @@ 
 
 // === Artifacts
 define('UNIT_ARTIFACTS', 1000);
-define('ART_LHC', 1001);      // Additional moon chance
-define('ART_RCD_SMALL', 1002);   // Rapid Colony Deployment - Set of buildings up to 10th level - 10/14/ 3/0 -   405 DM
-define('ART_RCD_MEDIUM', 1003);  // Rapid Colony Deployment - Set of buildings up to 15th level - 15/20/ 8/0 -  4704 DM
-define('ART_RCD_LARGE', 1004);   // Rapid Colony Deployment - Set of buildings up to 20th level - 20/25/10/1 - 39790 DM
+define('ART_LHC', 1001); // Additional moon chance
+define('ART_RCD_SMALL', 1002); // Rapid Colony Deployment - Set of buildings up to 10th level - 10/14/ 3/0 -   405 DM
+define('ART_RCD_MEDIUM', 1003); // Rapid Colony Deployment - Set of buildings up to 15th level - 15/20/ 8/0 -  4704 DM
+define('ART_RCD_LARGE', 1004); // Rapid Colony Deployment - Set of buildings up to 20th level - 20/25/10/1 - 39790 DM
 define('ART_HEURISTIC_CHIP', 1005); // Speed up research
 define('ART_NANO_BUILDER', 1006); // Speed up building
 define('ART_NANO_CONSTRUCTOR', 1007); // RESERVED Speed up hangar constructions
@@ -1064,18 +1064,18 @@ 
 define('UNIT_AWARD_MEDAL_BLITZ_R0_PLACE1', 2201); // Блиц-сервер, участник 0-го раунда, 1-е место
 define('UNIT_AWARD_MEDAL_BLITZ_R0_PLACE2', 2202); // Блиц-сервер, участник 0-го раунда, 2-е место
 define('UNIT_AWARD_MEDAL_BLITZ_R0_PLACE3', 2203); // Блиц-сервер, участник 0-го раунда, 3-е место
-define('UNIT_AWARD_MEDAL_2016_WOMEN_DAY_BEST', 2204);  // Медаль Лучшему Кавалеру за максимум потраченной ММ/максимум одаренных женщин Женщине от Мужчины во время ивента 8 марта 2016 года
+define('UNIT_AWARD_MEDAL_2016_WOMEN_DAY_BEST', 2204); // Медаль Лучшему Кавалеру за максимум потраченной ММ/максимум одаренных женщин Женщине от Мужчины во время ивента 8 марта 2016 года
 
 define('UNIT_AWARD_MEMORY', 2300); // Памятные знаки за существование и участие - например "4 года в игре". "Был онлайн в новогоднюю ночь 2013". итд
-define('UNIT_AWARD_MEMORY_IMMORTAL', 2301);  // Бессмертный
-define('UNIT_AWARD_MEMORY_2015_WOMEN_DAY', 2302);  // Значек за подарок Женщине от Мужчины во время ивента 8 марта 2015 года
+define('UNIT_AWARD_MEMORY_IMMORTAL', 2301); // Бессмертный
+define('UNIT_AWARD_MEMORY_2015_WOMEN_DAY', 2302); // Значек за подарок Женщине от Мужчины во время ивента 8 марта 2015 года
 define('UNIT_AWARD_MEMORY_BLITZ_R0', 2303); // Блиц-сервер, участник 0-го раунда
 define('UNIT_AWARD_MEMORY_SUPER_BORN_2015_SIMPLE', 2304); // День Рождения СН
 define('UNIT_AWARD_MEMORY_SUPER_BORN_2015_BRONZE', 2305); // День Рождения СН
 define('UNIT_AWARD_MEMORY_SUPER_BORN_2015_SILVER', 2306); // День Рождения СН
 define('UNIT_AWARD_MEMORY_SUPER_BORN_2015_GOLD', 2307); // День Рождения СН
 define('UNIT_AWARD_MEMORY_SUPER_BORN_2015_PLATINUM', 2308); // День Рождения СН
-define('UNIT_AWARD_MEMORY_2016_WOMEN_DAY', 2309);  // Значек за подарок Женщине от Мужчины во время ивента 8 марта 2016 года
+define('UNIT_AWARD_MEMORY_2016_WOMEN_DAY', 2309); // Значек за подарок Женщине от Мужчины во время ивента 8 марта 2016 года
 
 define('UNIT_AWARD_PENNANT', 2400); // Переходящий вымпел - индикация статуса на сервере: "Топ-1", "Топ", "Сабтоп", "Самый большой флот" итд
 define('UNIT_AWARD_BADGE', 2600); // Бейджики/значки за ачивки - например, "Построил 1000 кораблей"

includes/alliance/ali_external_create_ally.inc

Spacing +4 added lines, -4 removed lines

@@ -5,7 +5,7 @@ 
 use DBStatic\DBStaticAlly;
 use DBStatic\DBStaticUser;
 
-if(!defined('SN_IN_ALLY') || SN_IN_ALLY !== true) {
+if (!defined('SN_IN_ALLY') || SN_IN_ALLY !== true) {
   classSupernova::$debug->error("Attempt to call ALLIANCE page mode {$mode} directly - not from alliance.php", 'Forbidden', 403);
 }
 
@@ -14,13 +14,13 @@ 
 $ally_name_unsafe = sys_get_param_str_unsafe('name');
 $ally_name = db_escape($ally_name_unsafe);
 
-if($ally_tag) {
-  if(!$ally_name_unsafe || !$ally_tag_unsafe) {
+if ($ally_tag) {
+  if (!$ally_name_unsafe || !$ally_tag_unsafe) {
     message(classLocale::$lang['have_not_name'], classLocale::$lang['make_alliance']);
   }
 
   $query = DBStaticAlly::db_ally_get_by_name_or_tag($ally_tag, $ally_name);
-  if($query) {
+  if ($query) {
     message(str_replace('%s', $query['ally_tag'] == $ally_tag_unsafe ? $ally_tag_unsafe : $ally_name_unsafe, classLocale::$lang['always_exist']), classLocale::$lang['make_alliance']);
   }
 

includes/alliance/ali_internal_admin_mail.inc

Spacing +5 added lines, -5 removed lines

@@ -1,22 +1,22 @@
 <?php
 
-if(!defined('SN_IN_ALLY') || SN_IN_ALLY !== true) {
+if (!defined('SN_IN_ALLY') || SN_IN_ALLY !== true) {
   classSupernova::$debug->error("Attempt to call ALLIANCE page mode {$mode} directly - not from alliance.php", 'Forbidden', 403);
 }
 
-if(!$user_can_send_mails) {
+if (!$user_can_send_mails) {
   message(classLocale::$lang['Denied_access'], classLocale::$lang['Send_circular_mail']);
 }
 
 $POST_text = sys_get_param_str('text');
 $internalAliSendTextUnsafe = sys_get_param_str_unsafe('text');
-if($internalAliSendTextUnsafe) {
+if ($internalAliSendTextUnsafe) {
   message(classLocale::$lang['members_who_recived_message'] . DBStaticMessages::msg_ali_send($internalAliSendTextUnsafe, classLocale::$lang['ali_adm_msg_subject'], sys_get_param_int('r')), classLocale::$lang['Circular_sended'], "alliance.php", '');
 }
 
 $r_list = "<option value=\"-1\">" . classLocale::$lang['All_players'] . "</option>";
-if($ranks) {
-  foreach($ranks as $id => $array) {
+if ($ranks) {
+  foreach ($ranks as $id => $array) {
     $r_list .= "<option value=\"" . $id . "\">" . $array['name'] . "</option>";
   }
 }

includes/alliance/ali_internal_admin.inc

Spacing +19 added lines, -19 removed lines

@@ -3,11 +3,11 @@ 
 use DBStatic\DBStaticAlly;
 use DBStatic\DBStaticUser;
 
-if(!defined('SN_IN_ALLY') || SN_IN_ALLY !== true) {
+if (!defined('SN_IN_ALLY') || SN_IN_ALLY !== true) {
   classSupernova::$debug->error("Attempt to call ALLIANCE page mode {$mode} directly - not from alliance.php", 'Forbidden', 403);
 }
 
-if(!$user_admin) {
+if (!$user_admin) {
   message(classLocale::$lang['Denied_access'], classLocale::$lang['ally_admin']);
 }
 
@@ -23,11 +23,11 @@ 
 $allyTextID = ($allyTextID < 1 || $allyTextID > 3) ? 1 : $allyTextID;
 
 
-if(sys_get_param_str('isSaveOptions')) {
+if (sys_get_param_str('isSaveOptions')) {
   require_once('includes/includes/sys_avatar.php');
 
   $fieldChange = array();
-  if(($new_tag = sys_get_param_str_unsafe('tag', $ally['ally_tag'])) != $ally['ally_tag']) {
+  if (($new_tag = sys_get_param_str_unsafe('tag', $ally['ally_tag'])) != $ally['ally_tag']) {
     $fieldChange['ally_tag'] = $new_tag;
     DBStaticUser::db_user_set_by_id(
       $ally['ally_user_id'],
@@ -36,19 +36,19 @@ 
       )
     );
   }
-  if(($new_name = sys_get_param_str_unsafe('name', $ally['ally_name'])) != $ally['ally_name']) {
+  if (($new_name = sys_get_param_str_unsafe('name', $ally['ally_name'])) != $ally['ally_name']) {
     $fieldChange['ally_name'] = $new_name;
   }
 
-  if(($new_owner_rank = sys_get_param_str_unsafe('owner_range', $ally['ally_owner_range'])) != $ally['ally_owner_range']) {
+  if (($new_owner_rank = sys_get_param_str_unsafe('owner_range', $ally['ally_owner_range'])) != $ally['ally_owner_range']) {
     $fieldChange['ally_owner_range'] = $new_owner_rank;
   }
 
-  if(($new_web = sys_get_param_str_unsafe('web', $ally['ally_web'])) != $ally['ally_web']) {
+  if (($new_web = sys_get_param_str_unsafe('web', $ally['ally_web'])) != $ally['ally_web']) {
     $fieldChange['ally_web'] = $new_web;
   }
 
-  if(($new_request = sys_get_param_int('request_notallow', $ally['ally_request_notallow'])) != $ally['ally_request_notallow']) {
+  if (($new_request = sys_get_param_int('request_notallow', $ally['ally_request_notallow'])) != $ally['ally_request_notallow']) {
     $fieldChange['ally_request_notallow'] = sys_get_param_int('request_notallow', $ally['ally_request_notallow']);
   }
 
@@ -58,11 +58,11 @@ 
     'AVATAR_UPLOAD_STATUS'  => $avatar_upload_result['STATUS'],
     'AVATAR_UPLOAD_MESSAGE' => $avatar_upload_result['MESSAGE'],
   ));
-  if($new_image != $ally['ally_image']) {
+  if ($new_image != $ally['ally_image']) {
     $fieldChange['ally_image'] = $new_image;
   }
 
-  if(!empty($fieldChange)) {
+  if (!empty($fieldChange)) {
     classSupernova::$db->doUpdateRowSet(
       TABLE_ALLIANCE,
       $fieldChange,
@@ -73,17 +73,17 @@ 
 
     sys_redirect('alliance.php?mode=admin&edit=ally');
   }
-} elseif(sys_get_param_str('isSaveText')) {
+} elseif (sys_get_param_str('isSaveText')) {
   $text_unsafe = sys_get_param_str_unsafe('text');
   DBStaticAlly::db_ally_update_texts($text_unsafe, $ally['id'], $text_list[$allyTextID]['db_field']);
   $ally[$text_list[$allyTextID]['db_field']] = db_escape($text_unsafe);
-} elseif(sys_get_param_str('isTransfer') && $idNewLeader = sys_get_param_id('idNewLeader')) {
-  if(!$isAllyOwner) {
+} elseif (sys_get_param_str('isTransfer') && $idNewLeader = sys_get_param_id('idNewLeader')) {
+  if (!$isAllyOwner) {
     message(classLocale::$lang['Denied_access'], classLocale::$lang['ally_admin']);
   }
 
   $newLeader = DBStaticUser::db_user_by_id($idNewLeader, false, `ally_id`);
-  if($newLeader['ally_id'] == $user['ally_id']) {
+  if ($newLeader['ally_id'] == $user['ally_id']) {
     sn_db_transaction_start();
     DBStaticUser::db_user_set_by_id(
       $user['id'],
@@ -102,8 +102,8 @@ 
     sn_db_transaction_commit();
     sys_redirect('alliance.php');
   }
-} elseif(sys_get_param_str('isDisband') && sys_get_param_str('isConfirmDisband')) {
-  if(!$isAllyOwner) {
+} elseif (sys_get_param_str('isDisband') && sys_get_param_str('isConfirmDisband')) {
+  if (!$isAllyOwner) {
     message(classLocale::$lang['Denied_access'], classLocale::$lang['ally_admin']);
   }
   sn_db_transaction_start();
@@ -159,7 +159,7 @@ 
   $userAllyAdmins = DBStaticUser::db_user_list("`ally_id`= {$ally['id']}", false, '`id`, `username`');
   unset($tmp);
   // while ($userAllyAdmin = db_fetch($userAllyAdmins))
-  foreach($userAllyAdmins as $userAllyAdmin) {
+  foreach ($userAllyAdmins as $userAllyAdmin) {
 // pdump($userAllyAdmin);
     $tmp .= "<option value={$userAllyAdmin['id']}>{$userAllyAdmin['username']}</option>";
   }
@@ -167,8 +167,8 @@ 
   $template->assign_var('adminMembers', $tmp);
 }
 
-foreach($sn_ali_admin_internal as $sn_ali_admin_action => $sn_ali_admin_action_locale) {
-  if(!$sn_ali_admin_action_locale['title']) {
+foreach ($sn_ali_admin_internal as $sn_ali_admin_action => $sn_ali_admin_action_locale) {
+  if (!$sn_ali_admin_action_locale['title']) {
     continue;
   }
   $template->assign_block_vars('admin_actions', array(

includes/init.php

Spacing +11 added lines, -11 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 // Защита от двойного инита
-if(defined('INIT')) {
+if (defined('INIT')) {
   return;
 }
 
@@ -19,8 +19,8 @@ 
 define('SN_DEBUG_PDUMP_CALLER', true);
 
 // Бенчмарк
-register_shutdown_function(function () {
-  if(defined('IN_AJAX')) {
+register_shutdown_function(function() {
+  if (defined('IN_AJAX')) {
     return;
   }
 
@@ -30,11 +30,11 @@ 
     (!empty($locale_cache_statistic['misses']) ? ', LOCALE MISSED' : '') .
     (class_exists('classSupernova') && is_object(classSupernova::$db) ? ', DB time: ' . classSupernova::$db->time_mysql_total . 'ms' : '') .
     '</div>');
-  if($user['authlevel'] >= 2 && file_exists(SN_ROOT_PHYSICAL . 'badqrys.txt') && @filesize(SN_ROOT_PHYSICAL . 'badqrys.txt') > 0) {
+  if ($user['authlevel'] >= 2 && file_exists(SN_ROOT_PHYSICAL . 'badqrys.txt') && @filesize(SN_ROOT_PHYSICAL . 'badqrys.txt') > 0) {
     echo '<a href="badqrys.txt" target="_blank" style="color:red">', 'HACK ALERT!', '</a>';
   }
 
-  if(!empty($locale_cache_statistic['misses'])) {
+  if (!empty($locale_cache_statistic['misses'])) {
     print('<!--');
     pdump($locale_cache_statistic);
     print('-->');
@@ -54,7 +54,7 @@ 
 
 define('SN_TIME_NOW_GMT_STRING', gmdate(DATE_ATOM, SN_TIME_NOW));
 
-if(strpos(strtolower($_SERVER['SERVER_NAME']), 'google.') !== false) {
+if (strpos(strtolower($_SERVER['SERVER_NAME']), 'google.') !== false) {
   define('SN_GOOGLE', true);
 }
 
@@ -82,7 +82,7 @@ 
 ini_set('error_reporting', E_ALL ^ E_NOTICE);
 
 empty($classRoot) ? $classRoot = SN_ROOT_PHYSICAL . 'classes/' : false;
-spl_autoload_register(function ($class) use ($classRoot) {
+spl_autoload_register(function($class) use ($classRoot) {
   $class = str_replace('\\', '/', $class);
   if (file_exists($classRoot . $class . '.php')) {
     require_once $classRoot . $class . '.php';
@@ -161,9 +161,9 @@ 
 // Но нужно, пока у нас есть не MVC-страницы
 $sn_page_data = $sn_data['pages'][$sn_page_name];
 $sn_page_name_file = 'includes/pages/' . $sn_page_data['filename'] . DOT_PHP_EX;
-if($sn_page_name && isset($sn_page_data) && file_exists($sn_page_name_file)) {
+if ($sn_page_name && isset($sn_page_data) && file_exists($sn_page_name_file)) {
   require_once($sn_page_name_file);
-  if(is_array($sn_page_data['options'])) {
+  if (is_array($sn_page_data['options'])) {
     classSupernova::$options = array_merge(classSupernova::$options, $sn_page_data['options']);
   }
 }
@@ -173,7 +173,7 @@ 
 
 
 // А теперь проверяем - поддерживают ли у нас загруженный код такую страницу
-if(!isset($sn_data['pages'][$sn_page_name])) {
+if (!isset($sn_data['pages'][$sn_page_name])) {
   $sn_page_name = '';
 }
 
@@ -181,6 +181,6 @@ 
 classLocale::$lang = $lang = classSupernova::$gc->localePlayer;
 classLocale::$lang->lng_switch(sys_get_param_str('lang'));
 
-if(!defined('DEBUG_INIT_SKIP_SECONDARY') || DEBUG_INIT_SKIP_SECONDARY !== true) {
+if (!defined('DEBUG_INIT_SKIP_SECONDARY') || DEBUG_INIT_SKIP_SECONDARY !== true) {
   require_once "init_secondary.php";
 }

includes/general_pname.php

Braces +2 added lines, -4 removed lines

@@ -2,8 +2,7 @@ 
 
 // Эти функции будут переписаны по добавлению инфы в БД
 
-function pname_factory_production_field_name($factory_unit_id)
-{
+function pname_factory_production_field_name($factory_unit_id) {
   return get_unit_param($factory_unit_id, P_NAME) . '_porcent';
 }
 
@@ -14,7 +13,6 @@ 
  *
  * @return mixed
  */
-function pname_resource_name($resource_id)
-{
+function pname_resource_name($resource_id) {
   return get_unit_param($resource_id, P_NAME);
 }
\ No newline at end of file

includes/includes/flt_page4.inc

Spacing +18 added lines, -18 removed lines

@@ -7,28 +7,28 @@ 
 
 $classLocale = classLocale::$lang;
 
-if(SN_IN_FLEET !== true) {
+if (SN_IN_FLEET !== true) {
   classSupernova::$debug->error("Attempt to call FLEET page mode {$mode} directly - not from fleet.php", 'Forbidden', 403);
 }
 
 $fleetid = sys_get_param_id('fleetid');
 
-if(!is_numeric($fleetid) || empty($fleetid)) {
+if (!is_numeric($fleetid) || empty($fleetid)) {
   header("Location: fleet.php");
   exit();
 }
 
 $objFleet = new Fleet();
 $objFleet->dbLoad($fleetid);
-if(!$objFleet->dbId) {
+if (!$objFleet->dbId) {
   message(classLocale::$lang['fl_fleet_not_exists'], classLocale::$lang['fl_error']);
 }
 
-if($objFleet->time_arrive_to_target <= SN_TIME_NOW || $objFleet->time_return_to_source < SN_TIME_NOW || $objFleet->isReturning()) {
+if ($objFleet->time_arrive_to_target <= SN_TIME_NOW || $objFleet->time_return_to_source < SN_TIME_NOW || $objFleet->isReturning()) {
   message(classLocale::$lang['fl_isback'], classLocale::$lang['fl_error']);
 }
 
-if($objFleet->playerOwnerId != $user['id']) {
+if ($objFleet->playerOwnerId != $user['id']) {
   classSupernova::$debug->warning(classLocale::$lang['fl_aks_hack_wrong_fleet'], 'Wrong Fleet Owner', 301);
   message(classLocale::$lang['fl_aks_hack_wrong_fleet'], classLocale::$lang['fl_error']);
 }
@@ -39,19 +39,19 @@ 
 
 !$aks && !$userToAdd_unsafe ? $userToAdd_unsafe = $user['username'] : false;
 
-if($userToAdd_unsafe) {
+if ($userToAdd_unsafe) {
   $userToAdd = db_escape($userToAdd_unsafe);
   $userToAddID = DBStaticUser::db_user_by_username($userToAdd_unsafe, false, 'id', true, true);
   $userToAddID = $userToAddID['id'];
 
-  if($objFleet->target_owner_id == $userToAddID) {
+  if ($objFleet->target_owner_id == $userToAddID) {
     message(classLocale::$lang['flt_aks_player_same'], classLocale::$lang['fl_error']);
   }
 
-  if($userToAddID) {
-    if(!$aks) {
+  if ($userToAddID) {
+    if (!$aks) {
       // No AСS exists - making one
-      if(!$objFleet->group_id) {
+      if (!$objFleet->group_id) {
         DBStaticFleetACS::db_acs_insert($fleetid, $user['id'], $objFleet);
 
         $aks = DBStaticFleetACS::db_acs_get_by_fleet($fleetid);
@@ -66,21 +66,21 @@ 
 
     $isUserExists = false;
     $invited_ar = explode(",", $aks['eingeladen']);
-    foreach($invited_ar as $inv) {
-      if($userToAddID == $inv) {
+    foreach ($invited_ar as $inv) {
+      if ($userToAddID == $inv) {
         $isUserExists = true;
       }
     }
 
-    if(count($invited_ar) >= 5) {
+    if (count($invited_ar) >= 5) {
       message(classLocale::$lang['flt_aks_error_too_much_players'], classLocale::$lang['fl_error']);
     }
 
-    if($isUserExists) {
+    if ($isUserExists) {
       $userToAdd_unsafe != $user['username'] ? $add_user_message_mr = sprintf(classLocale::$lang['fl_aks_player_invited_already'], $userToAdd) : false;
     } else {
       $add_user_message_mr = sprintf(classLocale::$lang['fl_aks_player_invited'], $userToAdd);
-      if(!(DBStaticFleetACS::db_acs_update($userToAddID, $fleetid))) {
+      if (!(DBStaticFleetACS::db_acs_update($userToAddID, $fleetid))) {
         die(sprintf(classLocale::$lang['fl_aks_adding_error'], classSupernova::$db->db_error()));
       }
       $aks['eingeladen'] .= ',' . $userToAddID;
@@ -99,8 +99,8 @@ 
   'MISSION_NAME' => classLocale::$lang['type_mission'][MT_ACS],
 ));
 
-if($aks['eingeladen'] && is_array($members = classSupernova::$gc->cacheOperator->db_get_record_list(LOC_USER, "`id` in ({$aks['eingeladen']})")) && !empty($members)) {
-  foreach($members as $row) {
+if ($aks['eingeladen'] && is_array($members = classSupernova::$gc->cacheOperator->db_get_record_list(LOC_USER, "`id` in ({$aks['eingeladen']})")) && !empty($members)) {
+  foreach ($members as $row) {
     $template->assign_block_vars('invited', array(
       'NAME' => $row['username'],
     ));
@@ -125,7 +125,7 @@ 
 $fleet_data = tplParseFleetObject($objFleet, $i, $user);
 
 $template->assign_block_vars('fleets', $fleet_data['fleet']);
-foreach($fleet_data['ships'] as $ship_data) {
+foreach ($fleet_data['ships'] as $ship_data) {
   $template->assign_block_vars('fleets.ships', $ship_data);
 }
 

includes/includes/market_fleeter.inc

Spacing +26 added lines, -26 removed lines

@@ -5,7 +5,7 @@ 
 
 $classLocale = classLocale::$lang;
 
-if(!defined('SN_IN_MARKET') || SN_IN_MARKET !== true) {
+if (!defined('SN_IN_MARKET') || SN_IN_MARKET !== true) {
   classSupernova::$debug->error("Attempt to call market page mode {$mode} directly - not from market.php", 'Forbidden', 403);
 }
 
@@ -17,8 +17,8 @@ 
   'rpg_cost' => $rpg_cost,
 ));
 
-if(is_array($shipList)) {
-  if(mrc_get_level($user, null, RES_DARK_MATTER) < $rpg_cost) {
+if (is_array($shipList)) {
+  if (mrc_get_level($user, null, RES_DARK_MATTER) < $rpg_cost) {
     $intError = MARKET_NO_DM;
   }
 
@@ -33,30 +33,30 @@ 
 
   $message .= classLocale::$lang["eco_mrk_{$submode}_ships"] . '<ul>';
   $total = array();
-  foreach($shipList as $shipID => &$shipCount) {
+  foreach ($shipList as $shipID => &$shipCount) {
     $shipCount = ceil(floatval($shipCount));
-    if(!$shipCount) {
+    if (!$shipCount) {
       continue;
     }
 
-    if($shipCount < 0) {
+    if ($shipCount < 0) {
       classSupernova::$debug->warning('User supplied negative ship count on Black Market page', 'Hack Attempt', 307);
       $intError = MARKET_NEGATIVE_SHIPS;
       break;
     }
 
-    if($mode == MARKET_SCRAPPER) {
+    if ($mode == MARKET_SCRAPPER) {
       $amount = mrc_get_level($user, $planetrow, $shipID, true, true); // $planetrow[get_unit_param($shipID, P_NAME)];
-    } elseif($mode == MARKET_STOCKMAN) {
+    } elseif ($mode == MARKET_STOCKMAN) {
       $amount = $stock[$shipID];
     }
 
-    if($amount < $shipCount) {
+    if ($amount < $shipCount) {
       $intError = $error_no_stock;
       break;
     }
 
-    if(!in_array($shipID, classSupernova::$gc->groupFleet)) {
+    if (!in_array($shipID, classSupernova::$gc->groupFleet)) {
       classSupernova::$debug->warning('Hack Attempt', 'User supplied non-ship unit ID on Black Market page', 306);
       $intError = MARKET_NOT_A_SHIP;
       break;
@@ -72,16 +72,16 @@ 
     $resTemp[RES_CRYSTAL] = floor($build_data[BUILD_CREATE][RES_CRYSTAL] * $shipCount * $config_rpg_scrape_crystal * (-$multiplier));
     $resTemp[RES_DEUTERIUM] = floor($build_data[BUILD_CREATE][RES_DEUTERIUM] * $shipCount * $config_rpg_scrape_deuterium * (-$multiplier));
 
-    foreach($resTemp as $resID => $resCount) {
+    foreach ($resTemp as $resID => $resCount) {
       $total[$resID] += $resCount;
     }
 
     $message .= "<li>{$classLocale['tech'][$shipID]}: " . pretty_number($shipCount);
   }
 
-  if($mode == MARKET_STOCKMAN && $intError == MARKET_DEAL) {
-    foreach($total as $resID => $resCount) {
-      if(mrc_get_level($user, $planetrow, $resID, true, true) < -$resCount) {
+  if ($mode == MARKET_STOCKMAN && $intError == MARKET_DEAL) {
+    foreach ($total as $resID => $resCount) {
+      if (mrc_get_level($user, $planetrow, $resID, true, true) < -$resCount) {
         $intError = MARKET_NO_RESOURCES;
         classSupernova::$debug->warning('Trying to use bug in s/h market', 'S/H Ship Market', 301);
         break;
@@ -92,10 +92,10 @@ 
   $intError = ($intError == MARKET_DEAL) && (array_sum($total) == 0) ? $error_zero_res : $intError;
 
   $qry = array();
-  if($intError == MARKET_DEAL) {
+  if ($intError == MARKET_DEAL) {
     $message .= '</ul>' . classLocale::$lang["eco_mrk_{$submode}_res"] . '<ul>';
-    foreach($total as $resID => $resCount) {
-      if(!$resCount) {
+    foreach ($total as $resID => $resCount) {
+      if (!$resCount) {
         continue;
       }
 
@@ -128,38 +128,38 @@ 
       'MESSAGE' => classLocale::$lang['eco_mrk_errors'][$intError],
     ));
 
-    foreach($shipList as $shipID => $shipCount) {
+    foreach ($shipList as $shipID => $shipCount) {
       $data['ships'][$shipID] = max(0, intval($shipCount));
     }
   }
 }
 $message = '';
 
-if(!classSupernova::$config->eco_stockman_fleet && classSupernova::$config->eco_stockman_fleet_populate) {
-  classSupernova::$config->db_saveItem('eco_stockman_fleet', sys_unit_arr2str(array_map(function($item){return mt_rand(1, 1000);}, classSupernova::$gc->groupFleet)));
+if (!classSupernova::$config->eco_stockman_fleet && classSupernova::$config->eco_stockman_fleet_populate) {
+  classSupernova::$config->db_saveItem('eco_stockman_fleet', sys_unit_arr2str(array_map(function($item) {return mt_rand(1, 1000); }, classSupernova::$gc->groupFleet)));
 }
 
 tpl_set_resource_info($template, $planetrow, array());
 
-if(!$array) {
+if (!$array) {
   $array = array();
 }
 
 $group_fleet = classSupernova::$gc->groupFleet;
-foreach($array as $key => $value) {
-  if($mode == MARKET_SCRAPPER) {
+foreach ($array as $key => $value) {
+  if ($mode == MARKET_SCRAPPER) {
     $shipID = $value;
     $amount = mrc_get_level($user, $planetrow, $shipID, false, true); // $planetrow[get_unit_param($shipID, P_NAME)];
-  } elseif($mode == MARKET_STOCKMAN) {
+  } elseif ($mode == MARKET_STOCKMAN) {
     $shipID = $key;
     $amount = $value;
   }
 
-  if(!in_array($shipID, $group_fleet)) {
+  if (!in_array($shipID, $group_fleet)) {
     continue;
   }
 
-  if($amount > 0) {
+  if ($amount > 0) {
     $build_data = eco_get_build_data($user, $planetrow, $shipID);
     $template->assign_block_vars('ships', array(
       'ID'        => $shipID,