supernova-ws / SuperNova

quest.php

Spacing +2 added lines, -2 removed lines

@@ -7,8 +7,8 @@
  *
  */
 
-define('INSIDE'  , true);
-define('INSTALL' , false);
+define('INSIDE', true);
+define('INSTALL', false);
 
 require('common.' . substr(strrchr(__FILE__, '.'), 1));
 

ajax_version_check.php

Switch Indentation +11 added lines, -11 removed lines

@@ -22,19 +22,19 @@
 */
 switch($mode)
 {
-  case SNC_MODE_REGISTER:
-    if($config->server_updater_key || $config->server_updater_id)
-    {
-      if($ajax)
+    case SNC_MODE_REGISTER:
+      if($config->server_updater_key || $config->server_updater_id)
       {
-        print(SNC_VER_REGISTER_ERROR_REGISTERED);
+        if($ajax)
+        {
+          print(SNC_VER_REGISTER_ERROR_REGISTERED);
+        }
+        die();
       }
-      die();
-    }
-    $url .= "&name=" . urlencode($config->game_name) . "&url=" . urlencode(SN_ROOT_VIRTUAL);
-//TODO REMOVE DEBUG!!!
-//$url .= "&name=" . urlencode($config->game_name) . "&url=" . urlencode('http://supernova.ws/');
-  break;
+      $url .= "&name=" . urlencode($config->game_name) . "&url=" . urlencode(SN_ROOT_VIRTUAL);
+  //TODO REMOVE DEBUG!!!
+  //$url .= "&name=" . urlencode($config->game_name) . "&url=" . urlencode('http://supernova.ws/');
+    break;
 }
 
 $check_result = sn_get_url_contents($url);

Spacing +8 added lines, -8 removed lines

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

Braces +2 added lines, -4 removed lines

@@ -41,12 +41,10 @@
 if(!$check_result)
 {
   $version_check = SNC_VER_ERROR_CONNECT;
-}
-elseif(($version_check = intval($check_result)) && $version_check == $check_result)
+} elseif(($version_check = intval($check_result)) && $version_check == $check_result)
 {
   $version_check = $check_result;
-}
-else
+} else
 {
   // JSON decode if string
   $check_result = json_decode($check_result, true);

jumpgate.php

Braces +1 added lines, -2 removed lines

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

Spacing +17 added lines, -17 removed lines

@@ -14,39 +14,39 @@ 
 
 lng_include('fleet');
 
-if($TargetPlanet = sys_get_param_id('jmpto'))
+if ($TargetPlanet = sys_get_param_id('jmpto'))
 {
   sn_db_transaction_start();
   db_user_by_id($user['id'], true, 'id');
   $planetrow = db_planet_by_id($planetrow['id'], true);
-  if(!($NextJumpTime = uni_get_time_to_jump($planetrow)))
+  if (!($NextJumpTime = uni_get_time_to_jump($planetrow)))
   {
     $TargetGate = 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)
       {
         // $SubQueryOri = "";
         // $SubQueryDes = "";
         $ship_list = sys_get_param('ships');
         $db_changeset = array();
-        foreach($ship_list as $ship_id => $ship_count)
+        foreach ($ship_list as $ship_id => $ship_count)
         {
-          if(!in_array($ship_id, sn_get_groups('fleet')))
+          if (!in_array($ship_id, sn_get_groups('fleet')))
           {
             continue;
           }
 
           $ship_count = max(0, min(floor($ship_count), mrc_get_level($user, $planetrow, $ship_id)));
-          if($ship_count)
+          if ($ship_count)
           {
             $db_changeset['unit'][] = sn_db_unit_changeset_prepare($ship_id, -$ship_count, $user, $planetrow['id']);
             $db_changeset['unit'][] = sn_db_unit_changeset_prepare($ship_id, $ship_count, $user, $TargetGate['id']);
           }
         }
         // Dit monsieur, y avait quelque chose a envoyer ???
-        if(!empty($db_changeset))
+        if (!empty($db_changeset))
         {
           db_planet_set_by_id($TargetGate['id'], "`last_jump_time` = " . SN_TIME_NOW . "");
           db_planet_set_by_id($planetrow['id'], "`last_jump_time` = " . SN_TIME_NOW . "");
@@ -55,31 +55,31 @@ 
           db_user_set_by_id($user['id'], "`current_planet` = '{$TargetGate['id']}'");
 
           $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 = 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(
@@ -93,9 +93,9 @@ 
       }
     }
 
-    foreach(sn_get_groups('fleet') as $Ship)
+    foreach (sn_get_groups('fleet') as $Ship)
     {
-      if(($ship_count = mrc_get_level($user, $planetrow, $Ship)) <= 0)
+      if (($ship_count = mrc_get_level($user, $planetrow, $Ship)) <= 0)
       {
         continue;
       }

simulator.php

Braces +2 added lines, -4 removed lines

@@ -21,8 +21,7 @@ 
 
   $sym_defender = $unpacked['D'];
   $sym_attacker = $unpacked['A'];
-}
-else
+} else
 {
   $sym_defender = array(0 => $sym_defender);
   $sym_attacker = array(1 => $sym_attacker);
@@ -56,8 +55,7 @@ 
   $template = gettemplate('ube_combat_report', true);
   $template->assign_recursive($template_result);
   display($template, '', false, '', false, false, true);
-}
-else
+} else
 {
   $template = gettemplate('simulator', true);
   $techs_and_officers = array(TECH_WEAPON, TECH_SHIELD, TECH_ARMOR, MRC_ADMIRAL);

Spacing +7 added lines, -7 removed lines

@@ -2,7 +2,7 @@ 
 
 include('common.' . substr(strrchr(__FILE__, '.'), 1));
 
-if(sys_get_param_int('BE_DEBUG') && !defined('BE_DEBUG'))
+if (sys_get_param_int('BE_DEBUG') && !defined('BE_DEBUG'))
 {
   define('BE_DEBUG', true);
 }
@@ -14,7 +14,7 @@ 
 $sym_defender = $_POST['defender'] ? $_POST['defender'] : array();
 $sym_attacker = $_POST['attacker'] ? $_POST['attacker'] : array();
 
-if($replay)
+if ($replay)
 {
   $unpacked = sn_ube_simulator_decode_replay($replay);
 
@@ -27,7 +27,7 @@ 
   $sym_attacker = array(1 => $sym_attacker);
 }
 
-if($_POST['submit'] || $execute)
+if ($_POST['submit'] || $execute)
 {
   $replay = sn_ube_simulator_encode_replay($sym_defender, 'D');
   $replay .= sn_ube_simulator_encode_replay($sym_attacker, 'A');
@@ -40,9 +40,9 @@ 
   $template = gettemplate('simulator', true);
   $techs_and_officers = array(TECH_WEAPON, TECH_SHIELD, TECH_ARMOR, MRC_ADMIRAL);
 
-  foreach($techs_and_officers as $tech_id)
+  foreach ($techs_and_officers as $tech_id)
   {
-    if(!$sym_attacker[1][$tech_id])
+    if (!$sym_attacker[1][$tech_id])
     {
       $sym_attacker[1][$tech_id] = mrc_get_level($user, false, $tech_id);
     }
@@ -56,14 +56,14 @@ 
     UNIT_GOVERNORS => array(MRC_FORTIFIER),
     UNIT_DEFENCE => sn_get_groups('defense_active'),
   );
-  foreach($show_groups as $unit_group_id => $unit_group)
+  foreach ($show_groups as $unit_group_id => $unit_group)
   {
     $template->assign_block_vars('simulator', array(
       'GROUP' => $unit_group_id,
       'NAME' => $lang['tech'][$unit_group_id],
     ));
 
-    foreach($unit_group as $unit_id)
+    foreach ($unit_group as $unit_id)
     {
       $tab++;
 

login.php

Spacing +1 added lines, -1 removed lines

@@ -15,7 +15,7 @@
 
 include('includes/init.' . substr(strrchr(__FILE__, '.'), 1));
 // die();
-if($template_result[F_USER_IS_AUTHORIZED]) {
+if ($template_result[F_USER_IS_AUTHORIZED]) {
   sys_redirect('index' . DOT_PHP_EX);
 }
 lng_include('login');

market.php

Spacing +3 added lines, -3 removed lines

@@ -26,7 +26,7 @@ 
 $newstock = $stock;
 $intError = MARKET_DEAL;
 
-switch($mode)
+switch ($mode)
 {
   case MARKET_RESOURCES: // Resource trader
     require('includes/includes/market_trader.inc');
@@ -82,12 +82,12 @@ 
 }
 
 $message_id = sys_get_param_int('message');
-if($message_id != MARKET_NOTHING)
+if ($message_id != MARKET_NOTHING)
 {
   $template->assign_block_vars('result', array('MESSAGE' => $lang['eco_mrk_errors'][$message_id]));
 }
 
-if($message)
+if ($message)
 {
   $template->assign_block_vars('result', array('MESSAGE' => $message));
 }

language/en/system.mo.php

Spacing +1 added lines, -1 removed lines

@@ -961,7 +961,7 @@
     REGISTER_ERROR_USERNAME_WRONG => 'Некорректное имя игрока',
     REGISTER_ERROR_ACCOUNT_NAME_EXISTS => 'Имя учётной записи уже занято. Попробуйте войти с этим именем и вашим паролем или воспользоваться сбросом пароля',
     REGISTER_ERROR_PASSWORD_INSECURE => 'Неправильный пароль. Пароль должен состоять минимум из ' . PASSWORD_LENGTH_MIN . ' символов',
-    REGISTER_ERROR_USERNAME_SHORT => 'Слишком короткое имя. Имя должно состоять минимум из ' . LOGIN_LENGTH_MIN. ' символов',
+    REGISTER_ERROR_USERNAME_SHORT => 'Слишком короткое имя. Имя должно состоять минимум из ' . LOGIN_LENGTH_MIN . ' символов',
     REGISTER_ERROR_PASSWORD_DIFFERENT => 'Пароль и проверочный пароль не совпадают. Проверьте правильность ввода',
     REGISTER_ERROR_EMAIL_EMPTY => 'Е-Мейл не может быть пустым',
     REGISTER_ERROR_EMAIL_WRONG => 'Введенный Е-Мейл не является допустимым адресом электронной почты. Проверьте написание Е-Мейла или используйте другой адрес почтового ящика',

admin/planet_compensate.php

Braces +1 added lines, -2 removed lines

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

Spacing +24 added lines, -24 removed lines

@@ -1,11 +1,11 @@ 
 <?php
-define('INSIDE'  , true);
-define('INSTALL' , false);
+define('INSIDE', true);
+define('INSTALL', false);
 define('IN_ADMIN', true);
 
 require('../common.' . substr(strrchr(__FILE__, '.'), 1));
 
-if($user['authlevel'] < 3)
+if ($user['authlevel'] < 3)
 {
   AdminMessage(classLocale::$lang['adm_err_denied']);
 }
@@ -25,7 +25,7 @@ 
 $username_unsafe = sys_get_param_str_unsafe('username');
 $username = sys_get_param_escaped('username');
 
-if($galaxy_src)
+if ($galaxy_src)
 {
   sn_db_transaction_start();
   $errors = array();
@@ -35,41 +35,41 @@ 
   $planet = sys_o_get_updated($owner, array('galaxy' => $galaxy_src, 'system' => $system_src, 'planet' => $planet_src, 'planet_type' => 1), SN_TIME_NOW);
   $que    = $planet['que'];
   $planet = $planet['planet'];
-  if(!$planet)
+  if (!$planet)
   {
     $errors[] = classLocale::$lang['adm_pl_comp_err_0'];
   }
 
-  if($planet['destruyed'])
+  if ($planet['destruyed'])
   {
     $errors[] = classLocale::$lang['adm_pl_comp_err_1'];
   }
 
-  if($planet['id_owner'] != $owner['id'] || !$username)
+  if ($planet['id_owner'] != $owner['id'] || !$username)
   {
     $errors[] = classLocale::$lang['adm_pl_comp_err_4'];
   }
 
   $destination = sys_o_get_updated($owner, array('galaxy' => $galaxy_dst, 'system' => $system_dst, 'planet' => $planet_dst, 'planet_type' => 1), SN_TIME_NOW);
   $destination = $destination['planet'];
-  if(!$destination)
+  if (!$destination)
   {
     $errors[] = classLocale::$lang['adm_pl_comp_err_2'];
   }
 
-  if($planet['id'] == $destination['id'])
+  if ($planet['id'] == $destination['id'])
   {
     $errors[] = classLocale::$lang['adm_pl_comp_err_5'];
   }
 
-  if($planet['id_owner'] != $destination['id_owner'])
+  if ($planet['id_owner'] != $destination['id_owner'])
   {
     $errors[] = classLocale::$lang['adm_pl_comp_err_3'];
   }
 
-  if(!empty($errors))
+  if (!empty($errors))
   {
-    foreach($errors as $error)
+    foreach ($errors as $error)
     {
       $template->assign_block_vars('error', array(
         'TEXT' => $error,
@@ -83,14 +83,14 @@ 
     killer_add_planet($planet);
 
     $moon = db_planet_by_gspt($galaxy_src, $system_src, $planet_src, PT_MOON, true);
-    if($moon)
+    if ($moon)
     {
       $moon = sys_o_get_updated($owner, $moon, SN_TIME_NOW);
       $moon = $moon['planet'];
       killer_add_planet($moon);
     }
 
-    foreach(sn_get_groups('resources_loot') as $resource_id)
+    foreach (sn_get_groups('resources_loot') as $resource_id)
     {
       $resource_name = pname_resource_name($resource_id);
       $template->assign_var("{$resource_name}_cost", $final_cost[$resource_id]);
@@ -98,13 +98,13 @@ 
       $template->assign_var("{$resource_name}_bonus", $final_cost[$resource_id]);
     }
 
-    if($_GET['btn_confirm'])
+    if ($_GET['btn_confirm'])
     {
       $time = SN_TIME_NOW + PERIOD_DAY;
 
       db_unit_list_delete($planet['id_owner'], LOC_PLANET, $planet['id']);
       db_planet_set_by_id($planet['id'], "id_owner = 0, destruyed = {$time}");
-      if($moon)
+      if ($moon)
       {
         db_unit_list_delete($planet['id_owner'], LOC_PLANET, $moon['id']);
         db_planet_set_by_id($moon['id'], "id_owner = 0, destruyed = {$time}");
@@ -131,7 +131,7 @@ 
   'username' => $username,
 ));
 
-display(parsetemplate($template, $parse), classLocale::$lang['adm_pl_comp_title'], false, '', true );
+display(parsetemplate($template, $parse), classLocale::$lang['adm_pl_comp_title'], false, '', true);
 
 function killer_add_planet($planet)
 {
@@ -146,34 +146,34 @@ 
   }
   */
 
-  foreach(sn_get_groups('structures') as $unit_id)
+  foreach (sn_get_groups('structures') as $unit_id)
   {
     $build_level = mrc_get_level($user, $planet, $unit_id, true, true);
-    if($build_level > 0)
+    if ($build_level > 0)
     {
       $unit_cost = get_unit_param($unit_id, 'cost');
       $build_factor = $unit_cost['factor'] != 1 ? (1 - pow($unit_cost['factor'], $build_level)) / (1 - $unit_cost['factor']) : $unit_cost['factor'];
-      foreach($sn_group_resources_loot as $resource_id)
+      foreach ($sn_group_resources_loot as $resource_id)
       {
         $final_cost[$resource_id] += isset($unit_cost[$resource_id]) && $unit_cost[$resource_id] > 0 ? floor($unit_cost[$resource_id] * $build_factor) : 0;
       }
     }
   }
 
-  foreach(sn_get_groups(array('defense', 'fleet')) as $unit_id)
+  foreach (sn_get_groups(array('defense', 'fleet')) as $unit_id)
   {
     $unit_count = mrc_get_level($user, $planet, $unit_id, true, true);
-    if($unit_count > 0)
+    if ($unit_count > 0)
     {
       $unit_cost = get_unit_param($unit_id, 'cost');
-      foreach($sn_group_resources_loot as $resource_id)
+      foreach ($sn_group_resources_loot as $resource_id)
       {
         $final_cost[$resource_id] += isset($unit_cost[$resource_id]) && $unit_cost[$resource_id] > 0 ? floor($unit_cost[$resource_id] * $unit_count) : 0;
       }
     }
   }
 
-  foreach($sn_group_resources_loot as $resource_id)
+  foreach ($sn_group_resources_loot as $resource_id)
   {
     $final_cost[$resource_id] += floor(mrc_get_level($user, $planet, $resource_id, true, true));
   }

admin/includes/admin_planet_edit.inc.php

Braces +1 added lines, -2 removed lines

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

Spacing +6 added lines, -6 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-function admin_planet_edit_mode(&$template, &$admin_planet_edit_mode_list){return sn_function_call(__FUNCTION__, array(&$template, &$admin_planet_edit_mode_list));}
+function admin_planet_edit_mode(&$template, &$admin_planet_edit_mode_list) {return sn_function_call(__FUNCTION__, array(&$template, &$admin_planet_edit_mode_list)); }
 function sn_admin_planet_edit_mode(&$template, &$admin_planet_edit_mode_list)
 {
   global $lang;
@@ -19,19 +19,19 @@ 
   return $mode;
 }
 
-function admin_planet_edit_template(&$template, $edit_planet_row, $mode){return sn_function_call(__FUNCTION__, array(&$template, $edit_planet_row, $mode));}
+function admin_planet_edit_template(&$template, $edit_planet_row, $mode) {return sn_function_call(__FUNCTION__, array(&$template, $edit_planet_row, $mode)); }
 function sn_admin_planet_edit_template(&$template, $edit_planet_row, $mode)
 {
   global $lang;
 
   $unit_list = sn_get_groups($mode);
-  if(empty($unit_list))
+  if (empty($unit_list))
   {
     return;
   }
   $name_list = $lang['tech'];
 
-  foreach($unit_list as $unit_id)
+  foreach ($unit_list as $unit_id)
   {
     $template->assign_block_vars('unit', array(
       'ID'    => $unit_id,
@@ -42,10 +42,10 @@ 
   }
 }
 
-function admin_planet_edit_query_string($unit_id, $unit_amount, $mode){return sn_function_call(__FUNCTION__, array($unit_id, $unit_amount, $mode));}
+function admin_planet_edit_query_string($unit_id, $unit_amount, $mode) {return sn_function_call(__FUNCTION__, array($unit_id, $unit_amount, $mode)); }
 function sn_admin_planet_edit_query_string($unit_id, $unit_amount, $mode)
 {
-  if($unit_amount && in_array($unit_id, sn_get_groups($mode)))
+  if ($unit_amount && in_array($unit_id, sn_get_groups($mode)))
   {
     $unit_amount = round($unit_amount);
     $unit_name = get_unit_param($unit_id, P_NAME);