supernova-ws / SuperNova

dark_matter.php

Spacing +1 added lines, -1 removed lines

@@ -2,7 +2,7 @@
 
 include_once('common.' . substr(strrchr(__FILE__, '.'), 1));
 
-if(sn_module_get_active_count('payment') && !defined('SN_GOOGLE')) {
+if (sn_module_get_active_count('payment') && !defined('SN_GOOGLE')) {
   sys_redirect('metamatter.php');
 }
 

scheduler.php

Spacing +2 added lines, -2 removed lines

@@ -24,11 +24,11 @@
 
 // require_once('includes/includes/scheduler_process.php');
 
-if(($result = scheduler_process()) && !defined('IN_ADMIN')) {
+if (($result = scheduler_process()) && !defined('IN_ADMIN')) {
   $result = htmlspecialchars($result, ENT_QUOTES, 'UTF-8');
   print(json_encode($result));
 }
 
-if(!defined('IN_ADMIN')) {
+if (!defined('IN_ADMIN')) {
   die();
 }

includes/general/math.php

Spacing +20 added lines, -20 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 function geometry_progression_sum($n, $b1, $q) {
-  return $q != 1 ? ($b1 * (pow($q, $n) - 1)/($q - 1)) : ($n * $b1);
+  return $q != 1 ? ($b1 * (pow($q, $n) - 1) / ($q - 1)) : ($n * $b1);
 }
 
 function sn_floor($value)
@@ -43,8 +43,8 @@ 
  *
  * @return float|int
  */
-function sn_rand_gauss_range($range_start, $range_end, $round = true, $strict = 4, $cut_extreme = false)  {
-  if($cut_extreme) {
+function sn_rand_gauss_range($range_start, $range_end, $round = true, $strict = 4, $cut_extreme = false) {
+  if ($cut_extreme) {
     $range_start--;
     $range_end++;
   }
@@ -60,7 +60,7 @@ 
 {
   $args = func_get_args();
 
-  switch(func_num_args())
+  switch (func_num_args())
   {
     case 0:
       // trigger_error('median() requires at least one parameter',E_USER_WARNING);
@@ -72,7 +72,7 @@ 
     // fallthrough
 
     default:
-      if(!is_array($args))
+      if (!is_array($args))
       {
         // trigger_error('median() requires a list of numbers to operate on or an array of numbers', E_USER_NOTICE);
         return false;
@@ -83,9 +83,9 @@ 
       $n = count($args);
       $h = intval($n / 2);
 
-      if($n % 2 == 0)
+      if ($n % 2 == 0)
       {
-        $median = ($args[$h] + $args[$h-1]) / 2;
+        $median = ($args[$h] + $args[$h - 1]) / 2;
       }
       else
       {
@@ -103,47 +103,47 @@ 
 }
 function linear_calc(&$linear, $from = 0, $debug = false)
 {
-  for($i = $from; $i < count($linear); $i++)
+  for ($i = $from; $i < count($linear); $i++)
   {
     $eq = &$linear[$i];
-    for($j = count($eq) - 1; $j >= $from; $j--)
+    for ($j = count($eq) - 1; $j >= $from; $j--)
     {
       $eq[$j] /= $eq[$from];
     }
   }
-  if($debug) pdump($linear, 'Нормализовано по х' . $from);
+  if ($debug) pdump($linear, 'Нормализовано по х' . $from);
 
-  for($i = $from + 1; $i < count($linear); $i++)
+  for ($i = $from + 1; $i < count($linear); $i++)
   {
     $eq = &$linear[$i];
-    for($j = count($eq) - 1; $j >= $from; $j--)
+    for ($j = count($eq) - 1; $j >= $from; $j--)
     {
       $eq[$j] -= $linear[$from][$j];
     }
   }
-  if($debug) pdump($linear, 'Подставили х' . $from);
+  if ($debug) pdump($linear, 'Подставили х' . $from);
 
-  if($from < count($linear) - 1)
+  if ($from < count($linear) - 1)
   {
     linear_calc($linear, $from + 1, $debug);
   }
 
-  if($from)
+  if ($from)
   {
-    for($i = 0; $i < $from; $i++)
+    for ($i = 0; $i < $from; $i++)
     {
       $eq = &$linear[$i];
-      for($j = count($eq) - 1; $j >= $from; $j--)
+      for ($j = count($eq) - 1; $j >= $from; $j--)
       {
         $eq[$j] = $eq[$j] - $eq[$from] * $linear[$from][$j];
       }
     }
-    if($debug) pdump($linear, 'Подставили обратно х' . $from);
+    if ($debug) pdump($linear, 'Подставили обратно х' . $from);
   }
   else
   {
-    if($debug) pdump($linear, 'Результат' . $from);
-    foreach($linear as $index => &$eq)
+    if ($debug) pdump($linear, 'Результат' . $from);
+    foreach ($linear as $index => &$eq)
     {
       pdump($eq[count($linear)], 'x' . $index);
     }

includes/vars.php

Spacing +23 added lines, -23 removed lines

@@ -97,7 +97,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'
 );
@@ -188,14 +188,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;
   }
@@ -778,7 +778,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,
       ),
@@ -787,7 +787,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,
       ),
@@ -796,7 +796,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,
       ),
@@ -806,7 +806,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,
       ),
@@ -815,7 +815,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,
       ),
@@ -824,7 +824,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,
       ),
@@ -834,7 +834,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,
       ),
@@ -844,7 +844,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,
       ),
@@ -853,7 +853,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,
       ),
@@ -862,7 +862,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,
       ),
@@ -992,7 +992,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,
@@ -1003,7 +1003,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,
     ),
@@ -1029,7 +1029,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,
 
@@ -1039,7 +1039,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(
@@ -1079,9 +1079,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
@@ -1100,13 +1100,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,),
   ),
 
   'pages' => array(

includes/db/db_queries_planets.php

Spacing +12 added lines, -13 removed lines

@@ -23,8 +23,7 @@ 
   $galaxy = isset($vector[$prefix . 'galaxy']) ? intval($vector[$prefix . 'galaxy']) : 0;
   $system = isset($vector[$prefix . 'system']) ? intval($vector[$prefix . 'system']) : 0;
   $planet = isset($vector[$prefix . 'planet']) ? intval($vector[$prefix . 'planet']) : 0;
-  $planet_type = isset($vector[$prefix . 'planet_type']) ? intval($vector[$prefix . 'planet_type']) :
-    (isset($vector[$prefix . 'type']) ? intval($vector[$prefix . 'type']) : 0);
+  $planet_type = isset($vector[$prefix . 'planet_type']) ? intval($vector[$prefix . 'planet_type']) : (isset($vector[$prefix . 'type']) ? intval($vector[$prefix . 'type']) : 0);
   $planet_type = $planet_type == PT_DEBRIS ? PT_PLANET : $planet_type;
 
   return db_planet_by_gspt_safe($galaxy, $system, $planet, $planet_type, $for_update, $fields);
@@ -32,14 +31,14 @@ 
 function db_planet_by_parent($parent_id, $for_update = false, $fields = '*')
 {
   //if(!($parent_id = intval($parent_id))) return false;
-  if(!($parent_id = idval($parent_id))) return false;
+  if (!($parent_id = idval($parent_id))) return false;
   return classSupernova::db_get_record_list(LOC_PLANET,
     "`parent_planet` = {$parent_id} AND `planet_type` = " . PT_MOON, true);
 }
 function db_planet_by_id_and_owner($planet_id, $owner_id, $for_update = false, $fields = '*')
 {
   //if(!($planet_id = intval($planet_id)) || !($owner_id = intval($owner_id))) return false;
-  if(!($planet_id = idval($planet_id)) || !($owner_id = idval($owner_id))) return false;
+  if (!($planet_id = idval($planet_id)) || !($owner_id = idval($owner_id))) return false;
   return classSupernova::db_get_record_list(LOC_PLANET,
     "`id` = {$planet_id} AND `id_owner` = {$owner_id}", true);
 }
@@ -48,7 +47,7 @@ 
 function db_planet_list_moon_other($user_id, $this_moon_id)
 {
   // if(!($user_id = intval($user_id)) || !($this_moon_id = intval($this_moon_id))) return false;
-  if(!($user_id = idval($user_id)) || !($this_moon_id = idval($this_moon_id))) return false;
+  if (!($user_id = idval($user_id)) || !($this_moon_id = idval($this_moon_id))) return false;
   return classSupernova::db_get_record_list(LOC_PLANET,
     "`planet_type` = " . PT_MOON . " AND `id_owner` = {$user_id} AND `id` != {$this_moon_id}");
 }
@@ -61,7 +60,7 @@ 
 }
 
 function db_planet_list_sorted($user_row, $skip_planet_id = false, $field_list = '', $conditions = '') {
-  if(!is_array($user_row)) return false;
+  if (!is_array($user_row)) return false;
   // $field_list = $field_list != '*' ? "{{planets}}.`id`, `name`, `image`, {{planets}}.`galaxy`, {{planets}}.`system`, {{planets}}.`planet`, `planet_type`{$field_list}" : $field_list;
   $conditions .= $skip_planet_id ? " AND `id` <> {$skip_planet_id} " : '';
 
@@ -80,7 +79,7 @@ 
     "`id_owner` = '{$user_row['id']}' {$conditions} ORDER BY {$order_by}");
 }
 function db_planet_list_by_user_or_planet($user_id, $planet_id) {
-  if(!($user_id = idval($user_id)) && !($planet_id = idval($planet_id))) return false;
+  if (!($user_id = idval($user_id)) && !($planet_id = idval($planet_id))) return false;
 
   return classSupernova::db_get_record_list(LOC_PLANET,
     $planet_id = idval($planet_id) ? "{{planets}}.`id` = {$planet_id}" : "`id_owner` = {$user_id}", $planet_id);
@@ -89,12 +88,12 @@ 
 function db_planet_set_by_id($planet_id, $set)
 {
   // if(!($planet_id = intval($planet_id))) return false;
-  if(!($planet_id = idval($planet_id))) return false;
+  if (!($planet_id = idval($planet_id))) return false;
   return classSupernova::db_upd_record_by_id(LOC_PLANET, $planet_id, $set);
 }
 function db_planet_set_by_gspt($ui_galaxy, $ui_system, $ui_planet, $ui_planet_type = PT_ALL, $set)
 {
-  if(!($set = trim($set))) return false;
+  if (!($set = trim($set))) return false;
 
   $si_galaxy = intval($ui_galaxy);
   $si_system = intval($ui_system);
@@ -106,13 +105,13 @@ 
 function db_planet_set_by_parent($ui_parent_id, $ss_set)
 {
   //if(!($si_parent_id = intval($ui_parent_id)) || !($ss_set = trim($ss_set))) return false;
-  if(!($si_parent_id = idval($ui_parent_id)) || !($ss_set = trim($ss_set))) return false;
+  if (!($si_parent_id = idval($ui_parent_id)) || !($ss_set = trim($ss_set))) return false;
   return classSupernova::db_upd_record_list(LOC_PLANET, "`parent_planet` = {$si_parent_id}", $ss_set);
 }
 function db_planet_set_by_owner($ui_owner_id, $ss_set)
 {
   //if(!($si_owner_id = intval($ui_owner_id)) || !($ss_set = trim($ss_set))) return false;
-  if(!($si_owner_id = idval($ui_owner_id)) || !($ss_set = trim($ss_set))) return false;
+  if (!($si_owner_id = idval($ui_owner_id)) || !($ss_set = trim($ss_set))) return false;
   return classSupernova::db_upd_record_list(LOC_PLANET, "`id_owner` = {$si_owner_id}", $ss_set);
 }
 
@@ -120,7 +119,7 @@ 
 function db_planet_delete_by_id($planet_id)
 {
   // if(!($planet_id = intval($planet_id))) return false;
-  if(!($planet_id = idval($planet_id))) return false;
+  if (!($planet_id = idval($planet_id))) return false;
   classSupernova::db_del_record_by_id(LOC_PLANET, $planet_id);
   classSupernova::db_del_record_list(LOC_UNIT, "`unit_location_type` = " . LOC_PLANET . " AND `unit_location_id` = " . $planet_id);
   // Очереди очистятся автоматически по FOREIGN KEY
@@ -129,7 +128,7 @@ 
 function db_planet_list_delete_by_owner($ui_owner_id)
 {
   // if(!($si_owner_id = intval($ui_owner_id))) return false;
-  if(!($si_owner_id = idval($ui_owner_id))) return false;
+  if (!($si_owner_id = idval($ui_owner_id))) return false;
   classSupernova::db_del_record_list(LOC_PLANET, "`id_owner` = {$si_owner_id}");
   classSupernova::db_del_record_list(LOC_UNIT, "`unit_location_type` = " . LOC_PLANET . " AND `unit_player_id` = " . $si_owner_id);
   // Очереди очистятся автоматически по FOREIGN KEY

includes/db/db_queries_unit.php

Spacing +1 added lines, -1 removed lines

@@ -26,7 +26,7 @@
     'GROUP BY `unit_snid`'
   );
   $result = array();
-  while($row = db_fetch($query)) {
+  while ($row = db_fetch($query)) {
     $result[$row['unit_snid']] = $row;
   }
 

includes/alliance/ali_internal_admin_mail.inc

Spacing +3 added lines, -3 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if(!defined('SN_IN_ALLY') || SN_IN_ALLY !== true)
+if (!defined('SN_IN_ALLY') || SN_IN_ALLY !== true)
 {
   $debug->error("Attempt to call ALLIANCE page mode {$mode} directly - not from alliance.php", 'Forbidden', 403);
 }
@@ -17,8 +17,8 @@ 
 
 $lang['r_list'] = "<option value=\"-1\">{$lang['All_players']}</option>";
 if ($ranks) {
-  foreach($ranks as $id => $array) {
-    $lang['r_list'] .= "<option value=\"" . $id  . "\">" . $array['name'] . "</option>";
+  foreach ($ranks as $id => $array) {
+    $lang['r_list'] .= "<option value=\"" . $id . "\">" . $array['name'] . "</option>";
   }
 }
 

includes/alliance/ali_internal_admin_rights.inc

Spacing +8 added lines, -8 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if(!defined('SN_IN_ALLY') || SN_IN_ALLY !== true)
+if (!defined('SN_IN_ALLY') || SN_IN_ALLY !== true)
 {
   $debug->error("Attempt to call ALLIANCE page mode {$mode} directly - not from alliance.php", 'Forbidden', 403);
 }
@@ -14,7 +14,7 @@ 
 $new_rank_name = sys_get_param_str('newRankName');
 if ($new_rank_name)
 {
-  foreach($ally_rights as $fieldName)
+  foreach ($ally_rights as $fieldName)
   {
     $newRank[$fieldName] = 0;
   }
@@ -28,9 +28,9 @@ 
 {
   unset($ranks);
 
-  foreach($rankListInput as $rankID => $rank)
+  foreach ($rankListInput as $rankID => $rank)
   {
-    foreach($ally_rights as $rightName)
+    foreach ($ally_rights as $rightName)
     {
       $ranks[$rankID][$rightName] = $rank[$rightName] ? 1 : 0;
     }
@@ -41,7 +41,7 @@ 
 $d = sys_get_param_int('d');
 if ($d && isset($ranks[$d]))
 {
-  if(count($ranks) == 1)
+  if (count($ranks) == 1)
   {
     message($lang['ali_adm_lastRank'], $lang['ali_adm_rights_title']);
   }
@@ -53,16 +53,16 @@ 
 
 if (count($ranks))
 {
-  foreach($ranks as $rankID => $rank)
+  foreach ($ranks as $rankID => $rank)
   {
     $rank_data = array(
       'ID'   => $rankID,
       'NAME' => $rank['name'],
     );
 
-    for($i = 1; $i < count($rank); $i++)
+    for ($i = 1; $i < count($rank); $i++)
     {
-      $rank_data['R' . $i] = (($rank[$ally_rights[$i]] == 1) ? ' checked' : '') ;
+      $rank_data['R' . $i] = (($rank[$ally_rights[$i]] == 1) ? ' checked' : '');
       $rank_data['N' . $i] = $ally_rights[$i];
     }
 

includes/alliance/ali_external_request.inc

Spacing +4 added lines, -4 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if(!defined('SN_IN_ALLY') || SN_IN_ALLY !== true)
+if (!defined('SN_IN_ALLY') || SN_IN_ALLY !== true)
 {
   $debug->error("Attempt to call ALLIANCE page mode {$mode} directly - not from alliance.php", 'Forbidden', 403);
 }
@@ -20,7 +20,7 @@ 
     header('Location: alliance.php');
   }
 
-  if($user_request['request_denied'])
+  if ($user_request['request_denied'])
   {
     $lang['request_text'] = sprintf($lang['ali_req_deny_msg'], $ally['ally_tag'], $user_request['request_text']);
   }
@@ -42,12 +42,12 @@ 
 
 $ally = doquery("SELECT * FROM {{alliance}} WHERE `id` ='{$id_ally}'", true);
 
-if(!$ally)
+if (!$ally)
 {
   message($lang['ali_sys_notFound'], $lang['ali_req_title']);
 }
 
-if($ally['ally_request_notallow'])
+if ($ally['ally_request_notallow'])
 {
   message($lang['ali_req_not_allowed'], $lang['ali_req_title']);
 }