supernova-ws / SuperNova

admin/planet_compensate.php

Spacing +22 added lines, -22 removed lines

@@ -1,6 +1,6 @@ 
 <?php
-define('INSIDE'  , true);
-define('INSTALL' , false);
+define('INSIDE', true);
+define('INSTALL', false);
 define('IN_ADMIN', true);
 
 require('../common.' . substr(strrchr(__FILE__, '.'), 1));
@@ -24,7 +24,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();
@@ -34,41 +34,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[] = $lang['adm_pl_comp_err_0'];
   }
 
-  if($planet['destruyed'])
+  if ($planet['destruyed'])
   {
     $errors[] = $lang['adm_pl_comp_err_1'];
   }
 
-  if($planet['id_owner'] != $owner['id'] || !$username)
+  if ($planet['id_owner'] != $owner['id'] || !$username)
   {
     $errors[] = $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[] = $lang['adm_pl_comp_err_2'];
   }
 
-  if($planet['id'] == $destination['id'])
+  if ($planet['id'] == $destination['id'])
   {
     $errors[] = $lang['adm_pl_comp_err_5'];
   }
 
-  if($planet['id_owner'] != $destination['id_owner'])
+  if ($planet['id_owner'] != $destination['id_owner'])
   {
     $errors[] = $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,
@@ -82,14 +82,14 @@ 
     killer_add_planet($planet);
 
     $moon = DBStaticPlanet::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]);
@@ -97,13 +97,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;
 
       DBStaticUnit::db_unit_list_delete($planet['id_owner'], LOC_PLANET, $planet['id']);
       DBStaticPlanet::db_planet_set_by_id($planet['id'], "id_owner = 0, destruyed = {$time}");
-      if($moon)
+      if ($moon)
       {
         DBStaticUnit::db_unit_list_delete($planet['id_owner'], LOC_PLANET, $moon['id']);
         DBStaticPlanet::db_planet_set_by_id($moon['id'], "id_owner = 0, destruyed = {$time}");
@@ -145,34 +145,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));
   }

Braces +2 added lines, -4 removed lines

@@ -74,8 +74,7 @@ 
         'TEXT' => $error,
       ));
     }
-  }
-  else
+  } else
   {
     $template->assign_var('CHECK', 1);
 
@@ -132,8 +131,7 @@ 
 
 display($template, $lang['adm_pl_comp_title']);
 
-function killer_add_planet($planet)
-{
+function killer_add_planet($planet) {
   global $final_cost;
 
   $final_cost = array();

admin/planet_edit.php

Spacing +6 added lines, -6 removed lines

@@ -20,30 +20,30 @@
 $planet_id = sys_get_param_id('planet_id');
 
 $unit_list = sys_get_param('unit_list');
-if(sys_get_param('change_data') && !empty($unit_list))
+if (sys_get_param('change_data') && !empty($unit_list))
 {
   $query_string = array();
-  foreach($unit_list as $unit_id => $unit_amount)
+  foreach ($unit_list as $unit_id => $unit_amount)
   {
-    if($unit_query_string = admin_planet_edit_query_string($unit_id, $unit_amount, $mode))
+    if ($unit_query_string = admin_planet_edit_query_string($unit_id, $unit_amount, $mode))
     {
       $query_string[] = $unit_query_string;
     }
   }
 
-  if(!empty($query_string))
+  if (!empty($query_string))
   {
     DBStaticPlanet::db_planet_set_by_id($planet_id, implode(', ', $query_string));
   }
 }
 
-if($planet_id)
+if ($planet_id)
 {
   $edit_planet_row = DBStaticPlanet::db_planet_by_id($planet_id);
   admin_planet_edit_template($template, $edit_planet_row, $mode);
 }
 
-foreach($admin_planet_edit_mode_list as $page_mode => $mode_locale)
+foreach ($admin_planet_edit_mode_list as $page_mode => $mode_locale)
 {
   $template->assign_block_vars('page_menu', array(
     'ID' => $page_mode,

admin/add_moon.php

Spacing +1 added lines, -1 removed lines

@@ -19,7 +19,7 @@
 
 $template = gettemplate("admin/add_moon", true);
 
-if(sys_get_param_str('mode') == 'addit')
+if (sys_get_param_str('mode') == 'addit')
 {
   $PlanetID = sys_get_param_id('user');
   $MoonName = sys_get_param_str('name');

admin/admin_analyze_matter.php

Spacing +8 added lines, -9 removed lines

@@ -15,8 +15,8 @@ 
 
 $constants = get_defined_constants(true);
 $rpgConstants = array();
-foreach($constants['user'] as $constantName => $constantValue) {
-  if(substr($constantName, 0, 4) == 'RPG_') {
+foreach ($constants['user'] as $constantName => $constantValue) {
+  if (substr($constantName, 0, 4) == 'RPG_') {
     $rpgConstants[$constantValue] = $constantName;
   }
 }
@@ -33,7 +33,7 @@ 
 GROUP BY log_dark_matter_reason, IF(sign((log_dark_matter_amount)) > 0, 1, -1) ORDER BY sum(log_dark_matter_amount) DESC;
 ");
 
-while($row = classSupernova::$db->db_fetch($result)) {
+while ($row = classSupernova::$db->db_fetch($result)) {
   $row['CONSTANT'] = $rpgConstants[$row['REASON']];
 
   $row['DM_AMOUNT_TEXT'] = pretty_number($row['DM_AMOUNT']);
@@ -55,8 +55,8 @@ 
 GROUP BY reason, if(sign((amount)) > 0, 1, -1) ORDER BY sum(amount) DESC;
 ");
 
-while($row = classSupernova::$db->db_fetch($result)) {
-  if(empty($spent[$row['BALANCE']])) {
+while ($row = classSupernova::$db->db_fetch($result)) {
+  if (empty($spent[$row['BALANCE']])) {
     $spent[$row['BALANCE']] = array();
   }
 
@@ -66,16 +66,15 @@ 
   $spent[$row['BALANCE']] = array_merge_recursive_numeric($spent[$row['BALANCE']], $row);
 }
 
-foreach($spent as &$row) {
+foreach ($spent as &$row) {
   @$row['TOTAL_COUNT'] = $row['MM_COUNT'] + $row['DM_COUNT'];
   @$row['TOTAL_AMOUNT'] = $row['MM_AMOUNT'] + $row['DM_AMOUNT'];
   @$row['TOTAL_AMOUNT_TEXT'] = pretty_number($row['TOTAL_AMOUNT']);
   @$row['TOTAL_COUNT_TEXT'] = pretty_number($row['TOTAL_COUNT']);
 }
 
-usort($spent, function ($a, $b) {
-  return $a['TOTAL_AMOUNT'] < $b['TOTAL_AMOUNT'] ? -1 :
-    ($a['TOTAL_AMOUNT'] > $b['TOTAL_AMOUNT'] ? 1 : 0);
+usort($spent, function($a, $b) {
+  return $a['TOTAL_AMOUNT'] < $b['TOTAL_AMOUNT'] ? -1 : ($a['TOTAL_AMOUNT'] > $b['TOTAL_AMOUNT'] ? 1 : 0);
 });
 
 

admin/adm_flying_fleets.php

Spacing +2 added lines, -2 removed lines

@@ -21,7 +21,7 @@ 
 //while($CurrentFleet = db_fetch($FlyingFleets))
 
 $all_flying_fleets = db_fleet_list('', DB_SELECT_PLAIN);
-foreach($all_flying_fleets as $fleet_id => $CurrentFleet) {
+foreach ($all_flying_fleets as $fleet_id => $CurrentFleet) {
   $FleetOwner = db_user_by_id($CurrentFleet['fleet_owner']);
   $TargetOwner = db_user_by_id($CurrentFleet['fleet_target_owner']);
 
@@ -32,7 +32,7 @@ 
   $fleet_data['fleet']['STAY_TIME_INT'] = $CurrentFleet['fleet_end_stay'];
 
   $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/functions/qst_quest.php

Spacing +44 added lines, -44 removed lines

@@ -14,34 +14,34 @@ 
 
   $in_admin = defined('IN_ADMIN') && IN_ADMIN === true;
 
-  if($in_admin)
+  if ($in_admin)
   {
     $quest_id = sys_get_param_id('id');
     $quest_name = sys_get_param_str_unsafe('QUEST_NAME');
-    if(!empty($quest_name))
+    if (!empty($quest_name))
     {
       $quest_description = sys_get_param_str_unsafe('QUEST_DESCRIPTION');
       try
       {
         $quest_rewards_list = sys_get_param('QUEST_REWARDS_LIST');
         $quest_rewards = array();
-        foreach($quest_rewards_list as $quest_rewards_id => $quest_rewards_amount)
+        foreach ($quest_rewards_list as $quest_rewards_id => $quest_rewards_amount)
         {
-          if(!in_array($quest_rewards_id, $quest_reward_allowed))
+          if (!in_array($quest_rewards_id, $quest_reward_allowed))
           {
             throw new Exception($lang['qst_adm_err_reward_type']);
           }
 
-          if($quest_rewards_amount < 0)
+          if ($quest_rewards_amount < 0)
           {
             throw new Exception($lang['qst_adm_err_reward_amount']);
           }
-          elseif($quest_rewards_amount > 0)
+          elseif ($quest_rewards_amount > 0)
           {
             $quest_rewards[] = "{$quest_rewards_id},{$quest_rewards_amount}";
           }
         }
-        if(empty($quest_rewards))
+        if (empty($quest_rewards))
         {
           throw new Exception($lang['qst_adm_err_reward_empty']);
         }
@@ -49,13 +49,13 @@ 
         $quest_rewards = implode(';', $quest_rewards);
 
         $quest_unit_id = sys_get_param_int('QUEST_UNIT_ID');
-        if(!in_array($quest_unit_id, $quest_units_allowed))
+        if (!in_array($quest_unit_id, $quest_units_allowed))
         {
           throw new Exception($lang['qst_adm_err_unit_id']);
         }
 
         $quest_unit_amount = sys_get_param_float('QUEST_UNIT_AMOUNT');
-        if($quest_unit_amount <= 0)
+        if ($quest_unit_amount <= 0)
         {
           throw new Exception($lang['qst_adm_err_unit_amount']);
         }
@@ -64,7 +64,7 @@ 
         // TODO: Change quest type
         $quest_type = 0;
 
-        if($mode == 'edit')
+        if ($mode == 'edit')
         {
           DbQuery::build()
             ->setTable('quest')
@@ -109,7 +109,7 @@ 
       $mode = '';
     };
 
-    switch($mode)
+    switch ($mode)
     {
       case 'del':
         doquery("DELETE FROM {{quest}} WHERE `quest_id` = {$quest_id} LIMIT 1;");
@@ -126,7 +126,7 @@ 
     $query = doquery("SELECT count(*) AS count FROM `{{quest}}`;", '', true);
     $config->db_saveItem('quest_total', $query['count']);
   }
-  elseif(!$user_id)
+  elseif (!$user_id)
   {
     $user_id = $user['id'];
   }
@@ -153,7 +153,7 @@ 
     ));
   }
 
-  if($quest)
+  if ($quest)
   {
     $quest_templatized = qst_templatize(qst_quest_parse($quest, false));
   }
@@ -162,19 +162,19 @@ 
     $quest_templatized['quest_rewards_list'] = array();
   }
 
-  foreach($quest_reward_allowed as $unit_id)
+  foreach ($quest_reward_allowed as $unit_id)
   {
     $found = false;
-    foreach($quest_templatized['quest_rewards_list'] as $quest_templatized_reward)
+    foreach ($quest_templatized['quest_rewards_list'] as $quest_templatized_reward)
     {
-      if($quest_templatized_reward['ID'] == $unit_id)
+      if ($quest_templatized_reward['ID'] == $unit_id)
       {
         $found = true;
         break;
       }
     }
 
-    if(!$found)
+    if (!$found)
     {
       $quest_templatized['quest_rewards_list'][$unit_id] = array(
         'ID'     => $unit_id,
@@ -186,12 +186,12 @@ 
 
   qst_assign_to_template($template, $quest_templatized);
 
-  foreach($quest_list as $quest_data)
+  foreach ($quest_list as $quest_data)
   {
     qst_assign_to_template($template, qst_templatize($quest_data, true), 'quest');
   }
 
-  foreach($quest_units_allowed as $unit_id)
+  foreach ($quest_units_allowed as $unit_id)
   {
     $template->assign_block_vars('allowed_unit', array(
       'ID'   => $unit_id,
@@ -204,12 +204,12 @@ 
 {
   $quest_list = array();
 
-  if($user_id)
+  if ($user_id)
   {
-    if($status !== QUEST_STATUS_ALL)
+    if ($status !== QUEST_STATUS_ALL)
     {
       $query_add_where = "";
-      if($status == null || $status == QUEST_STATUS_NOT_STARTED)
+      if ($status == null || $status == QUEST_STATUS_NOT_STARTED)
       {
         $query_add_where .= "AND qs.quest_status_status IS NULL";
       }
@@ -233,7 +233,7 @@ 
     ;"
   );
 
-  while($quest = db_fetch($query))
+  while ($quest = db_fetch($query))
   {
     $quest_list[$quest['quest_id']] = qst_quest_parse($quest);
   }
@@ -243,16 +243,16 @@ 
 
 function qst_assign_to_template(&$template, $quest_templatized, $block_name = false)
 {
-  if($block_name)
+  if ($block_name)
   {
     $template->assign_block_vars($block_name, $quest_templatized);
   }
   else
   {
     $template->assign_vars($quest_templatized);
-    if(!empty($quest_templatized['quest_rewards_list']))
+    if (!empty($quest_templatized['quest_rewards_list']))
     {
-      foreach($quest_templatized['quest_rewards_list'] as $quest_reward)
+      foreach ($quest_templatized['quest_rewards_list'] as $quest_reward)
       {
         $template->assign_block_vars(($block_name ? $block_name . '.' : '') . 'quest_rewards_list', $quest_reward);
       }
@@ -274,7 +274,7 @@ 
   global $lang;
 
   $tmp = array();
-  foreach($quest['quest_rewards_list'] as $quest_reward_id => $quest_reward_amount)
+  foreach ($quest['quest_rewards_list'] as $quest_reward_id => $quest_reward_amount)
   {
     $tmp[] = array(
       'ID'     => $quest_reward_id,
@@ -301,9 +301,9 @@ 
 function qst_active_triggers($quest_list)
 {
   $quest_triggers = array();
-  foreach($quest_list as $quest_id => $quest)
+  foreach ($quest_list as $quest_id => $quest)
   {
-    if($quest['quest_status_status'] != QUEST_STATUS_COMPLETE)
+    if ($quest['quest_status_status'] != QUEST_STATUS_COMPLETE)
     {
       list($quest_unit_id, $quest_unit_amount) = explode(',', $quest['quest_conditions']);
       $quest_triggers[$quest_id] = $quest_unit_id;
@@ -321,7 +321,7 @@ 
  */
 function qst_reward(&$user, &$rewards, &$quest_list, &$quest_statuses)
 {
-  if(empty($quest_statuses)) return;
+  if (empty($quest_statuses)) return;
 
   global $lang;
 
@@ -345,7 +345,7 @@ 
           'quest_status_status'   => $quest_status
         ))
         ->doInsert();
-    } elseif($questStatus['quest_status_status'] != $quest_status) {
+    } elseif ($questStatus['quest_status_status'] != $quest_status) {
       DbQuery::build()
         ->setTable('quest_status')
         ->setWhereArray(array(
@@ -359,20 +359,20 @@ 
     }
   }
 
-  if(empty($rewards)) return;
+  if (empty($rewards)) return;
 
   $db_changeset = array();
   $total_rewards = array();
   $comment_dm = '';
 
-  foreach($rewards as $quest_id => $user_data) {
-    foreach($user_data as $user_id => $planet_data) {
-      foreach($planet_data as $planet_id => $reward_list) {
+  foreach ($rewards as $quest_id => $user_data) {
+    foreach ($user_data as $user_id => $planet_data) {
+      foreach ($planet_data as $planet_id => $reward_list) {
         $comment = sprintf($lang['qst_msg_complete_body'], $quest_list[$quest_id]['quest_name']);
         $comment_dm .= isset($reward_list[RES_DARK_MATTER]) ? $comment : '';
 
         $comment_reward = array();
-        foreach($reward_list as $unit_id => $unit_amount)
+        foreach ($reward_list as $unit_id => $unit_amount)
         {
           $comment_reward[] = $unit_amount . ' ' . $lang['tech'][$unit_id];
           $total_rewards[$user_id][$planet_id][$unit_id] += $unit_amount;
@@ -395,23 +395,23 @@ 
 
   $group_resources = sn_get_groups('resources_loot');
   $quest_rewards_allowed = sn_get_groups('quest_rewards');
-  if(!empty($total_rewards))
+  if (!empty($total_rewards))
   {
-    foreach($total_rewards as $user_id => $planet_data)
+    foreach ($total_rewards as $user_id => $planet_data)
     {
       $user_row = classSupernova::db_get_record_by_id(LOC_USER, $user_id);
-      foreach($planet_data as $planet_id => $unit_data)
+      foreach ($planet_data as $planet_id => $unit_data)
       {
         $local_changeset = array();
-        foreach($unit_data as $unit_id => $unit_amount)
+        foreach ($unit_data as $unit_id => $unit_amount)
         {
-          if(!isset($quest_rewards_allowed[$unit_id])) continue;
+          if (!isset($quest_rewards_allowed[$unit_id])) continue;
 
-          if($unit_id == RES_DARK_MATTER)
+          if ($unit_id == RES_DARK_MATTER)
           {
             rpg_points_change($user['id'], RPG_QUEST, $unit_amount, $comment_dm);
           }
-          elseif(isset($group_resources[$unit_id]))
+          elseif (isset($group_resources[$unit_id]))
           {
             $local_changeset[pname_resource_name($unit_id)] = array('delta' => $unit_amount);
           }
@@ -421,7 +421,7 @@ 
           }
         }
 
-        if(!empty($local_changeset))
+        if (!empty($local_changeset))
         {
           $planet_id = $planet_id == 0 && isset($user_row['id_planet']) ? $user_row['id_planet'] : $planet_id;
           $db_changeset[$planet_id ? 'planets' : 'users'][] = array(

Braces +28 added lines, -41 removed lines

@@ -2,8 +2,7 @@ 
 
 use \DBAL\DbQuery;
 
-function qst_render_page()
-{
+function qst_render_page() {
   global $lang, $user, $template, $config;
 
   $user_id = sys_get_param_id('user_id', false);
@@ -35,8 +34,7 @@ 
           if($quest_rewards_amount < 0)
           {
             throw new Exception($lang['qst_adm_err_reward_amount']);
-          }
-          elseif($quest_rewards_amount > 0)
+          } elseif($quest_rewards_amount > 0)
           {
             $quest_rewards[] = "{$quest_rewards_id},{$quest_rewards_amount}";
           }
@@ -78,8 +76,7 @@ 
             ->setWhereArray(array('quest_id' => $quest_id))
             ->setOneRow()
             ->doUpdate();
-        }
-        else
+        } else
         {
           DbQuery::build()
             ->setTable('quest')
@@ -100,8 +97,7 @@ 
           msg_send_simple_message('*', 0, 0, MSG_TYPE_PLAYER, $lang['sys_administration'], $lang['news_title'], $text);
         }
         */
-      }
-      catch (Exception $e)
+      } catch (Exception $e)
       {
         messageBox($e->getMessage(), $lang['sys_error']);
       }
@@ -125,8 +121,7 @@ 
     }
     $query = doquery("SELECT count(*) AS count FROM `{{quest}}`;", '', true);
     $config->db_saveItem('quest_total', $query['count']);
-  }
-  elseif(!$user_id)
+  } elseif(!$user_id)
   {
     $user_id = $user['id'];
   }
@@ -156,8 +151,7 @@ 
   if($quest)
   {
     $quest_templatized = qst_templatize(qst_quest_parse($quest, false));
-  }
-  else
+  } else
   {
     $quest_templatized['quest_rewards_list'] = array();
   }
@@ -200,8 +194,7 @@ 
   }
 }
 
-function qst_get_quests($user_id = false, $status = QUEST_STATUS_ALL)
-{
+function qst_get_quests($user_id = false, $status = QUEST_STATUS_ALL) {
   $quest_list = array();
 
   if($user_id)
@@ -212,12 +205,10 @@ 
       if($status == null || $status == QUEST_STATUS_NOT_STARTED)
       {
         $query_add_where .= "AND qs.quest_status_status IS NULL";
-      }
-      elseif ($status == QUEST_STATUS_EXCEPT_COMPLETE)
+      } elseif ($status == QUEST_STATUS_EXCEPT_COMPLETE)
       {
         $query_add_where .= "AND (qs.quest_status_status IS NULL OR qs.quest_status_status = " . QUEST_STATUS_STARTED . ")";
-      }
-      else
+      } else
       {
         $query_add_where .= "AND qs.quest_status_status = {$status}";
       }
@@ -241,13 +232,11 @@ 
   return $quest_list;
 }
 
-function qst_assign_to_template(&$template, $quest_templatized, $block_name = false)
-{
+function qst_assign_to_template(&$template, $quest_templatized, $block_name = false) {
   if($block_name)
   {
     $template->assign_block_vars($block_name, $quest_templatized);
-  }
-  else
+  } else
   {
     $template->assign_vars($quest_templatized);
     if(!empty($quest_templatized['quest_rewards_list']))
@@ -260,8 +249,7 @@ 
   }
 }
 
-function qst_quest_parse($quest)
-{
+function qst_quest_parse($quest) {
   list($quest['quest_unit_id'], $quest['quest_unit_amount']) = explode(',', $quest['quest_conditions']);
 
   $quest['quest_rewards_list'] = sys_unit_str2arr($quest['quest_rewards']);
@@ -269,8 +257,7 @@ 
   return $quest;
 }
 
-function qst_templatize($quest, $for_display = true)
-{
+function qst_templatize($quest, $for_display = true) {
   global $lang;
 
   $tmp = array();
@@ -298,8 +285,7 @@ 
   );
 }
 
-function qst_active_triggers($quest_list)
-{
+function qst_active_triggers($quest_list) {
   $quest_triggers = array();
   foreach($quest_list as $quest_id => $quest)
   {
@@ -319,9 +305,10 @@ 
  * @param $quest_list
  * @param integer[] $quest_statuses
  */
-function qst_reward(&$user, &$rewards, &$quest_list, &$quest_statuses)
-{
-  if(empty($quest_statuses)) return;
+function qst_reward(&$user, &$rewards, &$quest_list, &$quest_statuses) {
+  if(empty($quest_statuses)) {
+    return;
+  }
 
   global $lang;
 
@@ -359,7 +346,9 @@ 
     }
   }
 
-  if(empty($rewards)) return;
+  if(empty($rewards)) {
+    return;
+  }
 
   $db_changeset = array();
   $total_rewards = array();
@@ -405,17 +394,17 @@ 
         $local_changeset = array();
         foreach($unit_data as $unit_id => $unit_amount)
         {
-          if(!isset($quest_rewards_allowed[$unit_id])) continue;
+          if(!isset($quest_rewards_allowed[$unit_id])) {
+            continue;
+          }
 
           if($unit_id == RES_DARK_MATTER)
           {
             rpg_points_change($user['id'], RPG_QUEST, $unit_amount, $comment_dm);
-          }
-          elseif(isset($group_resources[$unit_id]))
+          } elseif(isset($group_resources[$unit_id]))
           {
             $local_changeset[pname_resource_name($unit_id)] = array('delta' => $unit_amount);
-          }
-          else // Проверим на юниты
+          } else // Проверим на юниты
           {
             $db_changeset['unit'][] = OldDbChangeSet::db_changeset_prepare_unit($unit_id, $unit_amount, $user_row, $planet_id);
           }
@@ -440,12 +429,10 @@ 
   }
 }
 
-function get_quest_amount_complete($user_id)
-{
+function get_quest_amount_complete($user_id) {
   return count(qst_get_quests($user_id, QUEST_STATUS_COMPLETE));
 }
 
-function get_quest_amount_in_progress($user_id)
-{
+function get_quest_amount_in_progress($user_id) {
   return count(qst_get_quests($user_id, QUEST_STATUS_STARTED));
 }

includes/functions/_news.php

Spacing +14 added lines, -15 removed lines

@@ -23,15 +23,15 @@ 
   $template->assign_var('NEWS_COUNT', db_num_rows($announce_list));
 
   $users = array();
-  while($announce = db_fetch($announce_list)) {
-    if($announce['user_id'] && !isset($users[$announce['user_id']])) {
+  while ($announce = db_fetch($announce_list)) {
+    if ($announce['user_id'] && !isset($users[$announce['user_id']])) {
       $users[$announce['user_id']] = db_user_by_id($announce['user_id']);
     }
 
     $survey_vote = array('survey_vote_id' => 1);
     $survey_complete = strtotime($announce['survey_until']) < SN_TIME_NOW;
 
-    if($announce['survey_id'] && !empty($user['id'])) {
+    if ($announce['survey_id'] && !empty($user['id'])) {
       $survey_vote = !$survey_complete ? $survey_vote = doquery("SELECT `survey_vote_id` FROM `{{survey_votes}}` WHERE survey_parent_id = {$announce['survey_id']} AND survey_vote_user_id = {$user['id']} LIMIT 1;", true) : array();
     }
 
@@ -43,8 +43,7 @@ 
       'ANNOUNCE'        => classSupernova::$gc->bbCodeParser->expandBbCode($announce['strAnnounce'], intval($announce['authlevel'])),
       'DETAIL_URL'      => $announce['detail_url'],
       'USER_NAME'       =>
-        isset($users[$announce['user_id']]) && $users[$announce['user_id']] ? player_nick_render_to_html($users[$announce['user_id']], array('color' => true)):
-        js_safe_string($announce['user_name']),
+        isset($users[$announce['user_id']]) && $users[$announce['user_id']] ? player_nick_render_to_html($users[$announce['user_id']], array('color' => true)) : js_safe_string($announce['user_name']),
       'NEW'             => $announce['unix_time'] + $config->game_news_actual >= SN_TIME_NOW,
       'FUTURE'          => $announce['unix_time'] > SN_TIME_NOW,
       'SURVEY_ID'       => $announce['survey_id'],
@@ -54,13 +53,13 @@ 
       'SURVEY_UNTIL'    => $announce['survey_until'],
     ));
 
-    foreach($announce_exploded as $announce_paragraph) {
+    foreach ($announce_exploded as $announce_paragraph) {
       $template->assign_block_vars('announces.paragraph', array(
         'TEXT' => $announce_paragraph,
       ));
     }
 
-    if($announce['survey_id']) {
+    if ($announce['survey_id']) {
       $survey_query = doquery(
         "SELECT survey_answer_text AS `TEXT`, count(DISTINCT survey_vote_id) AS `VOTES`
           FROM `{{survey_answers}}` AS sa
@@ -71,15 +70,15 @@ 
       );
       $survey_vote_result = array();
       $total_votes = 0;
-      while($row = db_fetch($survey_query)) {
+      while ($row = db_fetch($survey_query)) {
         $survey_vote_result[] = $row;
         $total_votes += $row['VOTES'];
       }
 
-      if(empty($survey_vote) && !$survey_complete) {
+      if (empty($survey_vote) && !$survey_complete) {
         // Can vote
         $survey_query = doquery("SELECT * FROM {{survey_answers}} WHERE survey_parent_id  = {$announce['survey_id']} ORDER BY survey_answer_id;");
-        while($row = db_fetch($survey_query)) {
+        while ($row = db_fetch($survey_query)) {
           $template->assign_block_vars('announces.survey_answers', array(
             'ID' => $row['survey_answer_id'],
             'TEXT' => $row['survey_answer_text'],
@@ -87,7 +86,7 @@ 
         }
       } else {
         // Show result
-        foreach($survey_vote_result as &$vote_result) {
+        foreach ($survey_vote_result as &$vote_result) {
           $vote_percent = $total_votes ? $vote_result['VOTES'] / $total_votes * 100 : 0;
           $vote_result['PERCENT'] = $vote_percent;
           $vote_result['PERCENT_TEXT'] = round($vote_percent, 1);
@@ -104,7 +103,7 @@ 
 }
 
 function nws_mark_read(&$user) {
-  if(isset($user['id'])) {
+  if (isset($user['id'])) {
     db_user_set_by_id($user['id'], '`news_lastread` = ' . SN_TIME_NOW);
     $user['news_lastread'] = SN_TIME_NOW;
   }
@@ -112,17 +111,17 @@ 
 }
 
 function survey_vote(&$user) {
-  if(empty($user['id'])) {
+  if (empty($user['id'])) {
     return true;
   }
 
   sn_db_transaction_start();
   $survey_id = sys_get_param_id('survey_id');
   $is_voted = doquery("SELECT `survey_vote_id` FROM `{{survey_votes}}` WHERE survey_parent_id = {$survey_id} AND survey_vote_user_id = {$user['id']} FOR UPDATE;", true);
-  if(empty($is_voted)) {
+  if (empty($is_voted)) {
     $survey_vote_id = sys_get_param_id('survey_vote');
     $is_answer_exists = doquery("SELECT `survey_answer_id` FROM `{{survey_answers}}` WHERE survey_parent_id = {$survey_id} AND survey_answer_id = {$survey_vote_id};", true);
-    if(!empty($is_answer_exists)) {
+    if (!empty($is_answer_exists)) {
       $user_name_safe = db_escape($user['username']);
       doquery("INSERT INTO {{survey_votes}} SET `survey_parent_id` = {$survey_id}, `survey_parent_answer_id` = {$survey_vote_id}, `survey_vote_user_id` = {$user['id']}, `survey_vote_user_name` = '{$user_name_safe}';");
     }

includes/pages/admin/user_view.php

Spacing +2 added lines, -2 removed lines

@@ -186,11 +186,11 @@
   }
 
   $exclude = $user_row;
-  foreach($blocks as $title => $fields) {
+  foreach ($blocks as $title => $fields) {
     userBlockAssign($exclude, $template, $title, $fields);
   }
 
-  if(!empty($exclude)) {
+  if (!empty($exclude)) {
     userBlockAssign($exclude, $template, '!!! НЕИЗВЕСТНЫЕ ПАРАМЕТРЫ !!!', array_keys($exclude));
   }
 

includes/vars.php

Indentation +57 added lines, -57 removed lines

@@ -189,62 +189,62 @@ 
   );
 
 $sn_message_class_list = array(
-   MSG_TYPE_NEW => array(
-     'name' => 'new_message',
-     'switchable' => false,
-     'email' => false,
-   ),
-   MSG_TYPE_ADMIN => array(
-     'name' => 'msg_admin',
-     'switchable' => false,
-     'email' => true,
-   ),
-   MSG_TYPE_PLAYER => array(
-     'name' => 'mnl_joueur',
-     'switchable' => false,
-     'email' => true,
-   ),
-   MSG_TYPE_ALLIANCE => array(
-     'name' => 'mnl_alliance',
-     'switchable' => false,
-     'email' => true,
-   ),
-   MSG_TYPE_SPY => array(
-     'name' => 'mnl_spy',
-     'switchable' => true,
-     'email' => true,
-   ),
-   MSG_TYPE_COMBAT => array(
-     'name' => 'mnl_attaque',
-     'switchable' => true,
-     'email' => true,
-   ),
-   MSG_TYPE_TRANSPORT => array(
-     'name' => 'mnl_transport',
-     'switchable' => true,
-     'email' => true,
-   ),
-   MSG_TYPE_RECYCLE => array(
-     'name' => 'mnl_exploit',
-     'switchable' => true,
-     'email' => true,
-   ),
-   MSG_TYPE_EXPLORE => array(
-     'name' => 'mnl_expedition',
-     'switchable' => true,
-     'email' => true,
-   ),
-   //     97 => 'mnl_general',
-   MSG_TYPE_QUE => array(
-     'name' => 'mnl_buildlist',
-     'switchable' => true,
-     'email' => true,
-   ),
-   MSG_TYPE_OUTBOX => array(
-     'name' => 'mnl_outbox',
-     'switchable' => false,
-     'email' => false,
-   ),
+    MSG_TYPE_NEW => array(
+      'name' => 'new_message',
+      'switchable' => false,
+      'email' => false,
+    ),
+    MSG_TYPE_ADMIN => array(
+      'name' => 'msg_admin',
+      'switchable' => false,
+      'email' => true,
+    ),
+    MSG_TYPE_PLAYER => array(
+      'name' => 'mnl_joueur',
+      'switchable' => false,
+      'email' => true,
+    ),
+    MSG_TYPE_ALLIANCE => array(
+      'name' => 'mnl_alliance',
+      'switchable' => false,
+      'email' => true,
+    ),
+    MSG_TYPE_SPY => array(
+      'name' => 'mnl_spy',
+      'switchable' => true,
+      'email' => true,
+    ),
+    MSG_TYPE_COMBAT => array(
+      'name' => 'mnl_attaque',
+      'switchable' => true,
+      'email' => true,
+    ),
+    MSG_TYPE_TRANSPORT => array(
+      'name' => 'mnl_transport',
+      'switchable' => true,
+      'email' => true,
+    ),
+    MSG_TYPE_RECYCLE => array(
+      'name' => 'mnl_exploit',
+      'switchable' => true,
+      'email' => true,
+    ),
+    MSG_TYPE_EXPLORE => array(
+      'name' => 'mnl_expedition',
+      'switchable' => true,
+      'email' => true,
+    ),
+    //     97 => 'mnl_general',
+    MSG_TYPE_QUE => array(
+      'name' => 'mnl_buildlist',
+      'switchable' => true,
+      'email' => true,
+    ),
+    MSG_TYPE_OUTBOX => array(
+      'name' => 'mnl_outbox',
+      'switchable' => false,
+      'email' => false,
+    ),
 );
 
 $sn_message_groups = array(
@@ -1096,7 +1096,7 @@ 
       SHIP_HUGE_DEATH_STAR => SHIP_HUGE_DEATH_STAR, SHIP_HUGE_SUPERNOVA => SHIP_HUGE_SUPERNOVA,
       SHIP_CARGO_SMALL => SHIP_CARGO_SMALL, SHIP_CARGO_BIG => SHIP_CARGO_BIG, SHIP_CARGO_SUPER => SHIP_CARGO_SUPER, SHIP_CARGO_HYPER => SHIP_CARGO_HYPER,
       SHIP_RECYCLER => SHIP_RECYCLER, SHIP_COLONIZER => SHIP_COLONIZER, SHIP_SPY => SHIP_SPY, SHIP_SATTELITE_SOLAR => SHIP_SATTELITE_SOLAR
-     ),
+      ),
     // Defensive building list
     'defense'   => array (UNIT_DEF_TURRET_MISSILE => UNIT_DEF_TURRET_MISSILE, UNIT_DEF_TURRET_LASER_SMALL => UNIT_DEF_TURRET_LASER_SMALL,
                           UNIT_DEF_TURRET_LASER_BIG => UNIT_DEF_TURRET_LASER_BIG, UNIT_DEF_TURRET_GAUSS => UNIT_DEF_TURRET_GAUSS,

Spacing +23 added lines, -23 removed lines

@@ -166,7 +166,7 @@ 
   SNC_VER_ERROR_MISSMATCH_KEY_ID => 'error',
 );
 
-$tableList = array( 'aks', 'alliance', 'alliance_requests', 'announce', 'annonce', 'banned', 'buddy', 'chat', 'config', 'counter',
+$tableList = array('aks', 'alliance', 'alliance_requests', 'announce', 'annonce', 'banned', 'buddy', 'chat', 'config', 'counter',
   'errors', 'fleets', 'fleet_log', 'galaxy', 'iraks', 'logs', 'log_dark_matter', 'messages', 'notes', 'planets', 'quest',
   'quest_status', 'referrals', 'rw', 'statpoints', 'users'
 );
@@ -257,14 +257,14 @@ 
 $user_option_list = array();
 
 $user_option_list[OPT_MESSAGE] = array();
-foreach($sn_message_class_list as $message_class_id => $message_class_data)
+foreach ($sn_message_class_list as $message_class_id => $message_class_data)
 {
-  if($message_class_data['switchable'])
+  if ($message_class_data['switchable'])
   {
     $user_option_list[OPT_MESSAGE]["opt_{$message_class_data['name']}"] = 1;
   }
 
-  if($message_class_data['email'])
+  if ($message_class_data['email'])
   {
     $user_option_list[OPT_MESSAGE]["opt_email_{$message_class_data['name']}"] = 0;
   }
@@ -847,7 +847,7 @@ 
         UNIT_PLANET_DENSITY_INDEX => PLANET_DENSITY_ICE_HYDROGEN,
         UNIT_PLANET_DENSITY_RARITY => 30, // 1, // 40.00, // * 1/121 0,82645
         UNIT_PLANET_DENSITY_RICHNESS => PLANET_DENSITY_RICHNESS_PERFECT,
-        UNIT_RESOURCES => array(RES_METAL => 0.20, RES_CRYSTAL => 0.60, RES_DEUTERIUM => 7.10, ),
+        UNIT_RESOURCES => array(RES_METAL => 0.20, RES_CRYSTAL => 0.60, RES_DEUTERIUM => 7.10,),
         UNIT_PLANET_DENSITY_MAX_SECTORS => 150,
         UNIT_PLANET_DENSITY_MIN_ASTROTECH => 11,
       ),
@@ -856,7 +856,7 @@ 
         UNIT_PLANET_DENSITY_INDEX => PLANET_DENSITY_ICE_METHANE,
         UNIT_PLANET_DENSITY_RARITY =>  130, // 6, // 6.67, // * 6,0	4,95868
         UNIT_PLANET_DENSITY_RICHNESS => PLANET_DENSITY_RICHNESS_GOOD,
-        UNIT_RESOURCES => array(RES_METAL => 0.55, RES_CRYSTAL => 0.85, RES_DEUTERIUM => 4.60, ),
+        UNIT_RESOURCES => array(RES_METAL => 0.55, RES_CRYSTAL => 0.85, RES_DEUTERIUM => 4.60,),
         UNIT_PLANET_DENSITY_MAX_SECTORS => 200,
         UNIT_PLANET_DENSITY_MIN_ASTROTECH => 6,
       ),
@@ -865,7 +865,7 @@ 
         UNIT_PLANET_DENSITY_INDEX => PLANET_DENSITY_ICE_WATER,
         UNIT_PLANET_DENSITY_RARITY =>  450, //20, // 2.00, // * 20,0	16,52893
         UNIT_PLANET_DENSITY_RICHNESS => PLANET_DENSITY_RICHNESS_AVERAGE,
-        UNIT_RESOURCES => array(RES_METAL => 0.86, RES_CRYSTAL => 0.95, RES_DEUTERIUM => 2.20, ),
+        UNIT_RESOURCES => array(RES_METAL => 0.86, RES_CRYSTAL => 0.95, RES_DEUTERIUM => 2.20,),
         UNIT_PLANET_DENSITY_MAX_SECTORS => 999,
         UNIT_PLANET_DENSITY_MIN_ASTROTECH => 0,
       ),
@@ -875,7 +875,7 @@ 
         UNIT_PLANET_DENSITY_INDEX => PLANET_DENSITY_CRYSTAL_RAW,
         UNIT_PLANET_DENSITY_RARITY => 20, // 1, // 40.00, // *1,0	0,82645
         UNIT_PLANET_DENSITY_RICHNESS => PLANET_DENSITY_RICHNESS_PERFECT,
-        UNIT_RESOURCES => array(RES_METAL => 0.40, RES_CRYSTAL => 12.37, RES_DEUTERIUM => 0.50, ),
+        UNIT_RESOURCES => array(RES_METAL => 0.40, RES_CRYSTAL => 12.37, RES_DEUTERIUM => 0.50,),
         UNIT_PLANET_DENSITY_MAX_SECTORS => 150,
         UNIT_PLANET_DENSITY_MIN_ASTROTECH => 11,
       ),
@@ -884,7 +884,7 @@ 
         UNIT_PLANET_DENSITY_INDEX => PLANET_DENSITY_CRYSTAL_SILICATE,
         UNIT_PLANET_DENSITY_RARITY => 140, // 5.71, // * 7,0	5,78512
         UNIT_PLANET_DENSITY_RICHNESS => PLANET_DENSITY_RICHNESS_GOOD,
-        UNIT_RESOURCES => array(RES_METAL => 0.67, RES_CRYSTAL => 4.50, RES_DEUTERIUM => 0.85, ),
+        UNIT_RESOURCES => array(RES_METAL => 0.67, RES_CRYSTAL => 4.50, RES_DEUTERIUM => 0.85,),
         UNIT_PLANET_DENSITY_MAX_SECTORS => 200,
         UNIT_PLANET_DENSITY_MIN_ASTROTECH => 6,
       ),
@@ -893,7 +893,7 @@ 
         UNIT_PLANET_DENSITY_INDEX => PLANET_DENSITY_CRYSTAL_STONE,
         UNIT_PLANET_DENSITY_RARITY => 500, // 1.90, // * 21,0	17,35537
         UNIT_PLANET_DENSITY_RICHNESS => PLANET_DENSITY_RICHNESS_AVERAGE,
-        UNIT_RESOURCES => array(RES_METAL => 0.80, RES_CRYSTAL => 2.00, RES_DEUTERIUM => 0.95, ),
+        UNIT_RESOURCES => array(RES_METAL => 0.80, RES_CRYSTAL => 2.00, RES_DEUTERIUM => 0.95,),
         UNIT_PLANET_DENSITY_MAX_SECTORS => 999,
         UNIT_PLANET_DENSITY_MIN_ASTROTECH => 0,
       ),
@@ -903,7 +903,7 @@ 
         UNIT_PLANET_DENSITY_INDEX => PLANET_DENSITY_STANDARD,
         UNIT_PLANET_DENSITY_RARITY => 1000, // 1.0, // * 40,0	33,05785
         UNIT_PLANET_DENSITY_RICHNESS => PLANET_DENSITY_RICHNESS_NORMAL,
-        UNIT_RESOURCES => array(RES_METAL => 1.00, RES_CRYSTAL => 1.00, RES_DEUTERIUM => 1.00, ),
+        UNIT_RESOURCES => array(RES_METAL => 1.00, RES_CRYSTAL => 1.00, RES_DEUTERIUM => 1.00,),
         UNIT_PLANET_DENSITY_MAX_SECTORS => 999,
         UNIT_PLANET_DENSITY_MIN_ASTROTECH => 0,
       ),
@@ -913,7 +913,7 @@ 
         UNIT_PLANET_DENSITY_INDEX => PLANET_DENSITY_METAL_ORE,
         UNIT_PLANET_DENSITY_RARITY => 550, // 2.11, // * 19,0	15,70248
         UNIT_PLANET_DENSITY_RICHNESS => PLANET_DENSITY_RICHNESS_AVERAGE,
-        UNIT_RESOURCES => array(RES_METAL => 1.60, RES_CRYSTAL => 0.90, RES_DEUTERIUM => 0.80, ),
+        UNIT_RESOURCES => array(RES_METAL => 1.60, RES_CRYSTAL => 0.90, RES_DEUTERIUM => 0.80,),
         UNIT_PLANET_DENSITY_MAX_SECTORS => 999,
         UNIT_PLANET_DENSITY_MIN_ASTROTECH => 0,
       ),
@@ -922,7 +922,7 @@ 
         UNIT_PLANET_DENSITY_INDEX => PLANET_DENSITY_METAL_PERIDOT,
         UNIT_PLANET_DENSITY_RARITY => 120, // 8.00, // * 5,0	4,13223
         UNIT_PLANET_DENSITY_RICHNESS => PLANET_DENSITY_RICHNESS_GOOD,
-        UNIT_RESOURCES => array(RES_METAL => 4.71, RES_CRYSTAL => 0.80, RES_DEUTERIUM => 0.55, ),
+        UNIT_RESOURCES => array(RES_METAL => 4.71, RES_CRYSTAL => 0.80, RES_DEUTERIUM => 0.55,),
         UNIT_PLANET_DENSITY_MAX_SECTORS => 200,
         UNIT_PLANET_DENSITY_MIN_ASTROTECH => 6,
       ),
@@ -931,7 +931,7 @@ 
         UNIT_PLANET_DENSITY_INDEX => PLANET_DENSITY_METAL_RAW,
         UNIT_PLANET_DENSITY_RARITY => 25, // 40.00, // * 1,0	0,82645
         UNIT_PLANET_DENSITY_RICHNESS => PLANET_DENSITY_RICHNESS_PERFECT,
-        UNIT_RESOURCES => array(RES_METAL => 8.00, RES_CRYSTAL => 0.40, RES_DEUTERIUM => 0.25, ),
+        UNIT_RESOURCES => array(RES_METAL => 8.00, RES_CRYSTAL => 0.40, RES_DEUTERIUM => 0.25,),
         UNIT_PLANET_DENSITY_MAX_SECTORS => 150,
         UNIT_PLANET_DENSITY_MIN_ASTROTECH => 11,
       ),
@@ -1061,7 +1061,7 @@ 
     ),
 
     // Tech list
-    'tech'      => array (
+    'tech'      => array(
       TECH_ARMOR => TECH_ARMOR, TECH_WEAPON => TECH_WEAPON, TECH_SHIELD => TECH_SHIELD,
       TECH_SPY => TECH_SPY, TECH_COMPUTER => TECH_COMPUTER,
       TECH_ENERGY => TECH_ENERGY, TECH_LASER => TECH_LASER, TECH_ION => TECH_ION, TECH_PLASMA => TECH_PLASMA, TECH_HYPERSPACE => TECH_HYPERSPACE,
@@ -1072,7 +1072,7 @@ 
     ),
 
     // Mercenaries
-    'mercenaries' => array (
+    'mercenaries' => array(
       MRC_STOCKMAN => MRC_STOCKMAN, MRC_SPY => MRC_SPY, MRC_ACADEMIC => MRC_ACADEMIC,
       MRC_ADMIRAL => MRC_ADMIRAL, MRC_COORDINATOR => MRC_COORDINATOR, MRC_NAVIGATOR => MRC_NAVIGATOR,
     ),
@@ -1098,7 +1098,7 @@ 
       SHIP_RECYCLER => SHIP_RECYCLER, SHIP_COLONIZER => SHIP_COLONIZER, SHIP_SPY => SHIP_SPY, SHIP_SATTELITE_SOLAR => SHIP_SATTELITE_SOLAR
      ),
     // Defensive building list
-    'defense'   => array (UNIT_DEF_TURRET_MISSILE => UNIT_DEF_TURRET_MISSILE, UNIT_DEF_TURRET_LASER_SMALL => UNIT_DEF_TURRET_LASER_SMALL,
+    'defense'   => array(UNIT_DEF_TURRET_MISSILE => UNIT_DEF_TURRET_MISSILE, UNIT_DEF_TURRET_LASER_SMALL => UNIT_DEF_TURRET_LASER_SMALL,
                           UNIT_DEF_TURRET_LASER_BIG => UNIT_DEF_TURRET_LASER_BIG, UNIT_DEF_TURRET_GAUSS => UNIT_DEF_TURRET_GAUSS,
                           UNIT_DEF_TURRET_ION => UNIT_DEF_TURRET_ION, UNIT_DEF_TURRET_PLASMA => UNIT_DEF_TURRET_PLASMA,
 
@@ -1108,7 +1108,7 @@ 
     ),
 
     // Missiles list
-    'missile'   => array (UNIT_DEF_MISSILE_INTERCEPTOR => UNIT_DEF_MISSILE_INTERCEPTOR, UNIT_DEF_MISSILE_INTERPLANET => UNIT_DEF_MISSILE_INTERPLANET, ),
+    'missile'   => array(UNIT_DEF_MISSILE_INTERCEPTOR => UNIT_DEF_MISSILE_INTERCEPTOR, UNIT_DEF_MISSILE_INTERPLANET => UNIT_DEF_MISSILE_INTERPLANET,),
 
     // Combat units list
     'combat'    => array(
@@ -1148,9 +1148,9 @@ 
     ),
 
     // Resource list
-    'resources' => array ( 0 => 'metal', 1 => 'crystal', 2 => 'deuterium', 3 => 'dark_matter'),
+    'resources' => array(0 => 'metal', 1 => 'crystal', 2 => 'deuterium', 3 => 'dark_matter'),
     // Resources all
-    'resources_all' => array(RES_METAL => RES_METAL, RES_CRYSTAL => RES_CRYSTAL, RES_DEUTERIUM => RES_DEUTERIUM, RES_ENERGY => RES_ENERGY, RES_DARK_MATTER => RES_DARK_MATTER, RES_METAMATTER => RES_METAMATTER, ),
+    'resources_all' => array(RES_METAL => RES_METAL, RES_CRYSTAL => RES_CRYSTAL, RES_DEUTERIUM => RES_DEUTERIUM, RES_ENERGY => RES_ENERGY, RES_DARK_MATTER => RES_DARK_MATTER, RES_METAMATTER => RES_METAMATTER,),
     // Resources can be produced on planet
     'resources_planet' => array(RES_METAL => RES_METAL, RES_CRYSTAL => RES_CRYSTAL, RES_DEUTERIUM => RES_DEUTERIUM, RES_ENERGY => RES_ENERGY),
     // Resources can be looted from planet
@@ -1169,13 +1169,13 @@ 
     ),
 
     // Resources that can be tradeable in market trader AND be a quest_rewards
-    'quest_rewards' => array(RES_METAL => RES_METAL, RES_CRYSTAL => RES_CRYSTAL, RES_DEUTERIUM => RES_DEUTERIUM, RES_DARK_MATTER => RES_DARK_MATTER, ),
+    'quest_rewards' => array(RES_METAL => RES_METAL, RES_CRYSTAL => RES_CRYSTAL, RES_DEUTERIUM => RES_DEUTERIUM, RES_DARK_MATTER => RES_DARK_MATTER,),
 
 //      // Ques list
 //      'ques' => array(QUE_STRUCTURES, QUE_HANGAR, QUE_RESEARCH),
 
-    'STAT_COMMON' => array(STAT_TOTAL => STAT_TOTAL, STAT_FLEET => STAT_FLEET, STAT_TECH => STAT_TECH, STAT_BUILDING => STAT_BUILDING, STAT_DEFENSE => STAT_DEFENSE, STAT_RESOURCE => STAT_RESOURCE, ),
-    'STAT_PLAYER' => array(STAT_RAID_TOTAL => STAT_RAID_TOTAL, STAT_RAID_WON => STAT_RAID_WON, STAT_RAID_LOST => STAT_RAID_LOST, STAT_LVL_BUILDING => STAT_LVL_BUILDING, STAT_LVL_TECH => STAT_LVL_TECH, STAT_LVL_RAID => STAT_LVL_RAID, ),
+    'STAT_COMMON' => array(STAT_TOTAL => STAT_TOTAL, STAT_FLEET => STAT_FLEET, STAT_TECH => STAT_TECH, STAT_BUILDING => STAT_BUILDING, STAT_DEFENSE => STAT_DEFENSE, STAT_RESOURCE => STAT_RESOURCE,),
+    'STAT_PLAYER' => array(STAT_RAID_TOTAL => STAT_RAID_TOTAL, STAT_RAID_WON => STAT_RAID_WON, STAT_RAID_LOST => STAT_RAID_LOST, STAT_LVL_BUILDING => STAT_LVL_BUILDING, STAT_LVL_TECH => STAT_LVL_TECH, STAT_LVL_RAID => STAT_LVL_RAID,),
   ),
 );