supernova-ws / SuperNova

classes/DBAL/DbIndexField.php

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -27,7 +27,7 @@
     $this->Collation    = isset($indexField['Collation']) ? $indexField['Collation'] : null;
     $this->Cardinality  = isset($indexField['Cardinality']) ? $indexField['Cardinality'] : null;
     $this->Sub_part     = isset($indexField['Sub_part']) ? $indexField['Sub_part'] : null;
-    $this->Null         = isset($indexField['Null']) ? $indexField['Null'] : null;
+    $this->null         = isset($indexField['Null']) ? $indexField['Null'] : null;
     $this->Expression   = isset($indexField['Expression']) ? $indexField['Expression'] : null;
 
     return $this;

classes/DBAL/PropertyDescription.php

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -153,7 +153,7 @@
 
 
     // If this field is not null and default value is not set - then this field is mandatory
-    if ($fieldDescription->Null === 'NO' && $fieldDescription->Default === null && !$nonMandatory) {
+    if ($fieldDescription->null === 'NO' && $fieldDescription->Default === null && !$nonMandatory) {
       $this->mandatory = true;
     }
 

index.php

Spacing +3 added lines, -3 removed lines

@@ -6,14 +6,14 @@
 
 global $sn_page_name, $sn_mvc, $template, $template_result;
 
-if(isset($sn_page_name) || ($sn_page_name = isset($_GET['page']) ? trim(strip_tags($_GET['page'])) : '')) {
+if (isset($sn_page_name) || ($sn_page_name = isset($_GET['page']) ? trim(strip_tags($_GET['page'])) : '')) {
   require_once('common.' . substr(strrchr(__FILE__, '.'), 1));
-  if($sn_page_name) {
+  if ($sn_page_name) {
     // Loading page-specific language files
 
     !empty($sn_mvc['model'][$sn_page_name]) and execute_hooks($sn_mvc['model'][$sn_page_name], $template, 'model', $sn_page_name);
     !empty($sn_mvc['view'][$sn_page_name]) and execute_hooks($sn_mvc['view'][$sn_page_name], $template, 'view', $sn_page_name);
-    if(!empty($template_result) && is_object($template)) {
+    if (!empty($template_result) && is_object($template)) {
       $template->assign_recursive($template_result);
     }
 

includes/vars.php

Indentation +4 added lines, -4 removed lines

@@ -1190,12 +1190,12 @@
     ],
     // Defensive building list
     UNIT_DEFENCE_STR => [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,
+                          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,
 
-                         UNIT_DEF_SHIELD_SMALL => UNIT_DEF_SHIELD_SMALL, UNIT_DEF_SHIELD_BIG => UNIT_DEF_SHIELD_BIG, UNIT_DEF_SHIELD_PLANET => UNIT_DEF_SHIELD_PLANET,
+                          UNIT_DEF_SHIELD_SMALL => UNIT_DEF_SHIELD_SMALL, UNIT_DEF_SHIELD_BIG => UNIT_DEF_SHIELD_BIG, UNIT_DEF_SHIELD_PLANET => UNIT_DEF_SHIELD_PLANET,
 
-                         UNIT_DEF_MISSILE_INTERCEPTOR => UNIT_DEF_MISSILE_INTERCEPTOR, UNIT_DEF_MISSILE_INTERPLANET => UNIT_DEF_MISSILE_INTERPLANET,
+                          UNIT_DEF_MISSILE_INTERCEPTOR => UNIT_DEF_MISSILE_INTERCEPTOR, UNIT_DEF_MISSILE_INTERPLANET => UNIT_DEF_MISSILE_INTERPLANET,
     ],
 
     // Missiles list

Spacing +34 added lines, -34 removed lines

@@ -33,8 +33,8 @@ 
 
 //    'chat'     => ['sn_chat_model'],
 //    'chat_add' => ['sn_chat_add_model'],
-    'chat'     => [Chat::class  . '::' . 'chatModel'],
-    'chat_add' => [Chat::class  . '::' . 'chatAddModel'],
+    'chat'     => [Chat::class . '::' . 'chatModel'],
+    'chat_add' => [Chat::class . '::' . 'chatAddModel'],
 
     'imperium' => [PageImperium::class . '::' . 'modelStatic'],
 
@@ -48,9 +48,9 @@ 
 
 //    'chat'          => ['sn_chat_view'],
 //    'chat_msg'      => ['sn_chat_msg_view'],
-    'chat'          => [Chat::class  . '::' . 'chatView'],
-    'chat_msg'      => [Chat::class  . '::' . 'chatMsgView'],
-    'chat_frame'      => [Chat::class  . '::' . 'chatFrameView'],
+    'chat'          => [Chat::class . '::' . 'chatView'],
+    'chat_msg'      => [Chat::class . '::' . 'chatMsgView'],
+    'chat_frame'      => [Chat::class . '::' . 'chatFrameView'],
 
     'battle_report' => ['sn_battle_report_view'],
     'contact'       => ['sn_contact_view'],
@@ -646,29 +646,29 @@ 
         P_MISSION_EXPEDITION_OUTCOME           => FLT_EXPEDITION_OUTCOME_FOUND_FLEET,
         P_MISSION_EXPEDITION_OUTCOME_TYPE      => FLT_EXPEDITION_OUTCOME_TYPE_GOOD,
         P_CHANCE                               => 200,
-        'percent'                              => [0 => 0.1, 1 => 0.02, 2 => 0.01,],
+        'percent'                              => [0 => 0.1, 1 => 0.02, 2 => 0.01, ],
         P_MISSION_EXPEDITION_OUTCOME_SECONDARY => [
-          [P_CHANCE => 90, P_MULTIPLIER => 0.01, P_MESSAGE_ID => 2,],
-          [P_CHANCE => 9, P_MULTIPLIER => 0.02, P_MESSAGE_ID => 1,],
-          [P_CHANCE => 1, P_MULTIPLIER => 0.10, P_MESSAGE_ID => 0,],
+          [P_CHANCE => 90, P_MULTIPLIER => 0.01, P_MESSAGE_ID => 2, ],
+          [P_CHANCE => 9, P_MULTIPLIER => 0.02, P_MESSAGE_ID => 1, ],
+          [P_CHANCE => 1, P_MULTIPLIER => 0.10, P_MESSAGE_ID => 0, ],
         ],
       ],
       FLT_EXPEDITION_OUTCOME_FOUND_RESOURCES => [
         P_MISSION_EXPEDITION_OUTCOME           => FLT_EXPEDITION_OUTCOME_FOUND_RESOURCES,
         P_MISSION_EXPEDITION_OUTCOME_TYPE      => FLT_EXPEDITION_OUTCOME_TYPE_GOOD,
         P_CHANCE                               => 300,
-        'percent'                              => [0 => 0.1, 1 => 0.050, 2 => 0.025,],
+        'percent'                              => [0 => 0.1, 1 => 0.050, 2 => 0.025, ],
         P_MISSION_EXPEDITION_OUTCOME_SECONDARY => [
-          [P_CHANCE => 90, P_MULTIPLIER => 0.025, P_MESSAGE_ID => 2,],
-          [P_CHANCE => 9, P_MULTIPLIER => 0.050, P_MESSAGE_ID => 1,],
-          [P_CHANCE => 1, P_MULTIPLIER => 0.100, P_MESSAGE_ID => 0,],
+          [P_CHANCE => 90, P_MULTIPLIER => 0.025, P_MESSAGE_ID => 2, ],
+          [P_CHANCE => 9, P_MULTIPLIER => 0.050, P_MESSAGE_ID => 1, ],
+          [P_CHANCE => 1, P_MULTIPLIER => 0.100, P_MESSAGE_ID => 0, ],
         ],
       ],
       FLT_EXPEDITION_OUTCOME_FOUND_DM        => [
         P_MISSION_EXPEDITION_OUTCOME           => FLT_EXPEDITION_OUTCOME_FOUND_DM,
         P_MISSION_EXPEDITION_OUTCOME_TYPE      => FLT_EXPEDITION_OUTCOME_TYPE_GOOD,
         P_CHANCE                               => 100,
-        'percent'                              => [0 => 0.0100, 1 => 0.0040, 2 => 0.0010,],
+        'percent'                              => [0 => 0.0100, 1 => 0.0040, 2 => 0.0010, ],
         P_MISSION_EXPEDITION_OUTCOME_SECONDARY => [
           [P_CHANCE => 90, P_MULTIPLIER => 0.0010, /*P_MESSAGE_ID => 2,*/],
           [P_CHANCE => 9, P_MULTIPLIER => 0.0040, /*P_MESSAGE_ID => 1,*/],
@@ -703,14 +703,14 @@ 
     ],
 
     'planet_generator' => [
-      0  => [ // HomeWorld
+      0  => [// HomeWorld
         't_max_min'     => 40, // Tmax 40
         't_max_max'     => 40,
         't_delta_min'   => 40, // Tmin 0
         't_delta_max'   => 40,
         'size_min'      => $config->initial_fields,
         'size_max'      => $config->initial_fields,
-        'core_types'    => [PLANET_DENSITY_STANDARD,],
+        'core_types'    => [PLANET_DENSITY_STANDARD, ],
         'planet_images' => ['normaltemp'],
       ],
       1  => [
@@ -940,7 +940,7 @@ 
         ],
         'planet_images' => ['eis'],
       ],
-      16 => [ // Random planet - stranger; -35 avg
+      16 => [// Random planet - stranger; -35 avg
         't_max_min'     => -90,
         't_max_max'     => +40,
         't_delta_min'   => 2,
@@ -960,7 +960,7 @@ 
           PLANET_DENSITY_METAL_PERIDOT,
           PLANET_DENSITY_METAL_RAW,
         ],
-        'planet_images' => ['trocken', 'dschjungel', 'normaltemp', 'wasser', 'eis',],
+        'planet_images' => ['trocken', 'dschjungel', 'normaltemp', 'wasser', 'eis', ],
       ],
     ],
 
@@ -983,7 +983,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                    => [RES_METAL => 0.20, RES_CRYSTAL => 0.60, RES_DEUTERIUM => 7.10,],
+        UNIT_RESOURCES                    => [RES_METAL => 0.20, RES_CRYSTAL => 0.60, RES_DEUTERIUM => 7.10, ],
         UNIT_PLANET_DENSITY_MAX_SECTORS   => 150,
         UNIT_PLANET_DENSITY_MIN_ASTROTECH => 11,
       ],
@@ -992,7 +992,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                    => [RES_METAL => 0.55, RES_CRYSTAL => 0.85, RES_DEUTERIUM => 4.60,],
+        UNIT_RESOURCES                    => [RES_METAL => 0.55, RES_CRYSTAL => 0.85, RES_DEUTERIUM => 4.60, ],
         UNIT_PLANET_DENSITY_MAX_SECTORS   => 200,
         UNIT_PLANET_DENSITY_MIN_ASTROTECH => 6,
       ],
@@ -1001,7 +1001,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                    => [RES_METAL => 0.86, RES_CRYSTAL => 0.95, RES_DEUTERIUM => 2.20,],
+        UNIT_RESOURCES                    => [RES_METAL => 0.86, RES_CRYSTAL => 0.95, RES_DEUTERIUM => 2.20, ],
         UNIT_PLANET_DENSITY_MAX_SECTORS   => 999,
         UNIT_PLANET_DENSITY_MIN_ASTROTECH => 0,
       ],
@@ -1011,7 +1011,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                    => [RES_METAL => 0.40, RES_CRYSTAL => 12.37, RES_DEUTERIUM => 0.50,],
+        UNIT_RESOURCES                    => [RES_METAL => 0.40, RES_CRYSTAL => 12.37, RES_DEUTERIUM => 0.50, ],
         UNIT_PLANET_DENSITY_MAX_SECTORS   => 150,
         UNIT_PLANET_DENSITY_MIN_ASTROTECH => 11,
       ],
@@ -1020,7 +1020,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                    => [RES_METAL => 0.67, RES_CRYSTAL => 4.50, RES_DEUTERIUM => 0.85,],
+        UNIT_RESOURCES                    => [RES_METAL => 0.67, RES_CRYSTAL => 4.50, RES_DEUTERIUM => 0.85, ],
         UNIT_PLANET_DENSITY_MAX_SECTORS   => 200,
         UNIT_PLANET_DENSITY_MIN_ASTROTECH => 6,
       ],
@@ -1029,7 +1029,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                    => [RES_METAL => 0.80, RES_CRYSTAL => 2.00, RES_DEUTERIUM => 0.95,],
+        UNIT_RESOURCES                    => [RES_METAL => 0.80, RES_CRYSTAL => 2.00, RES_DEUTERIUM => 0.95, ],
         UNIT_PLANET_DENSITY_MAX_SECTORS   => 999,
         UNIT_PLANET_DENSITY_MIN_ASTROTECH => 0,
       ],
@@ -1039,7 +1039,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                    => [RES_METAL => 1.00, RES_CRYSTAL => 1.00, RES_DEUTERIUM => 1.00,],
+        UNIT_RESOURCES                    => [RES_METAL => 1.00, RES_CRYSTAL => 1.00, RES_DEUTERIUM => 1.00, ],
         UNIT_PLANET_DENSITY_MAX_SECTORS   => 999,
         UNIT_PLANET_DENSITY_MIN_ASTROTECH => 0,
       ],
@@ -1049,7 +1049,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                    => [RES_METAL => 1.60, RES_CRYSTAL => 0.90, RES_DEUTERIUM => 0.80,],
+        UNIT_RESOURCES                    => [RES_METAL => 1.60, RES_CRYSTAL => 0.90, RES_DEUTERIUM => 0.80, ],
         UNIT_PLANET_DENSITY_MAX_SECTORS   => 999,
         UNIT_PLANET_DENSITY_MIN_ASTROTECH => 0,
       ],
@@ -1058,7 +1058,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                    => [RES_METAL => 4.71, RES_CRYSTAL => 0.80, RES_DEUTERIUM => 0.55,],
+        UNIT_RESOURCES                    => [RES_METAL => 4.71, RES_CRYSTAL => 0.80, RES_DEUTERIUM => 0.55, ],
         UNIT_PLANET_DENSITY_MAX_SECTORS   => 200,
         UNIT_PLANET_DENSITY_MIN_ASTROTECH => 6,
       ],
@@ -1067,7 +1067,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                    => [RES_METAL => 8.00, RES_CRYSTAL => 0.40, RES_DEUTERIUM => 0.25,],
+        UNIT_RESOURCES                    => [RES_METAL => 8.00, RES_CRYSTAL => 0.40, RES_DEUTERIUM => 0.25, ],
         UNIT_PLANET_DENSITY_MAX_SECTORS   => 150,
         UNIT_PLANET_DENSITY_MIN_ASTROTECH => 11,
       ],
@@ -1244,7 +1244,7 @@ 
     ],
 
     // Missiles list
-    UNIT_DEF_MISSILES_STR => [UNIT_DEF_MISSILE_INTERCEPTOR => UNIT_DEF_MISSILE_INTERCEPTOR, UNIT_DEF_MISSILE_INTERPLANET => UNIT_DEF_MISSILE_INTERPLANET,],
+    UNIT_DEF_MISSILES_STR => [UNIT_DEF_MISSILE_INTERCEPTOR => UNIT_DEF_MISSILE_INTERCEPTOR, UNIT_DEF_MISSILE_INTERPLANET => UNIT_DEF_MISSILE_INTERPLANET, ],
 
     // Combat units list
     'combat'             => [
@@ -1293,7 +1293,7 @@ 
     // Resource list
     UNIT_RESOURCES_STR      => [0 => 'metal', 1 => 'crystal', 2 => 'deuterium', 3 => 'dark_matter'],
     // Resources all
-    'resources_all'         => [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'         => [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'      => [RES_METAL => RES_METAL, RES_CRYSTAL => RES_CRYSTAL, RES_DEUTERIUM => RES_DEUTERIUM, RES_ENERGY => RES_ENERGY],
     // Resources can be looted from planet
@@ -1312,13 +1312,13 @@ 
     ],
 
     // Resources that can be tradeable in market trader AND be a quest_rewards
-    'quest_rewards'      => [RES_METAL => RES_METAL, RES_CRYSTAL => RES_CRYSTAL, RES_DEUTERIUM => RES_DEUTERIUM, RES_DARK_MATTER => RES_DARK_MATTER,],
+    'quest_rewards'      => [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' => [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' => [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' => [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' => [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, ],
 
     GROUP_GROUP_ID_TO_NAMES => [
       UNIT_STRUCTURES   => 'structures',
@@ -1332,7 +1332,7 @@ 
       UNIT_PLANS        => 'plans',
     ],
 
-    GROUP_CAPITAL_BUILDING_BONUS_GROUPS => ['structures', 'defense', 'fleet',],
+    GROUP_CAPITAL_BUILDING_BONUS_GROUPS => ['structures', 'defense', 'fleet', ],
 
     GROUP_UNIT_COMBAT_SORT_ORDER => [
       SHIP_SPY,

includes/includes/flt_page3.inc

Braces +41 added lines, -30 removed lines

@@ -23,18 +23,24 @@ 
 
   // Test de coherance de la destination (voir si elle se trouve dans les limites de l'univers connu
   $errorlist = '';
-  if (!$galaxy || $galaxy > $config->game_maxGalaxy || $galaxy < 1)
-    $errorlist .= $lang['fl_limit_galaxy'];
-  if (!$system || $system > $config->game_maxSystem || $system < 1)
-    $errorlist .= $lang['fl_limit_system'];
-  if (!$planet || $planet < 1 || ($planet > $config->game_maxPlanet && $target_mission != MT_EXPLORE ))
-    $errorlist .= $lang['fl_limit_planet'];
-  if ($planetrow['galaxy'] == $galaxy && $planetrow['system'] == $system && $planetrow['planet'] == $planet && $planetrow['planet_type'] == $planet_type)
-    $errorlist .= $lang['fl_ownpl_err'];
-  if (!$planet_type)
-    $errorlist .= $lang['fl_no_planettype'];
-  if ($planet_type != PT_PLANET && $planet_type != PT_DEBRIS && $planet_type != PT_MOON)
-    $errorlist .= $lang['fl_fleet_err_pl'];
+  if (!$galaxy || $galaxy > $config->game_maxGalaxy || $galaxy < 1) {
+      $errorlist .= $lang['fl_limit_galaxy'];
+  }
+  if (!$system || $system > $config->game_maxSystem || $system < 1) {
+      $errorlist .= $lang['fl_limit_system'];
+  }
+  if (!$planet || $planet < 1 || ($planet > $config->game_maxPlanet && $target_mission != MT_EXPLORE )) {
+      $errorlist .= $lang['fl_limit_planet'];
+  }
+  if ($planetrow['galaxy'] == $galaxy && $planetrow['system'] == $system && $planetrow['planet'] == $planet && $planetrow['planet_type'] == $planet_type) {
+      $errorlist .= $lang['fl_ownpl_err'];
+  }
+  if (!$planet_type) {
+      $errorlist .= $lang['fl_no_planettype'];
+  }
+  if ($planet_type != PT_PLANET && $planet_type != PT_DEBRIS && $planet_type != PT_MOON) {
+      $errorlist .= $lang['fl_fleet_err_pl'];
+  }
   if (empty($missiontype[$target_mission])) {
     $errorlist .= $lang['fl_bad_mission'];
   }
@@ -61,29 +67,35 @@ 
     }
   } else {
     if ($TargetPlanet['id_owner']){
-      if ($target_mission == MT_COLONIZE)
-        $errorlist .= $lang['fl_colonized'];
+      if ($target_mission == MT_COLONIZE) {
+              $errorlist .= $lang['fl_colonized'];
+      }
 
       if ($TargetPlanet['id_owner'] == $planetrow['id_owner']){
-        if ($target_mission == MT_ATTACK)
-          $errorlist .= $lang['fl_no_self_attack'];
-
-        if ($target_mission == MT_SPY)
-          $errorlist .= $lang['fl_no_self_spy'];
-      }else{
-        if ($target_mission == MT_RELOCATE)
-          $errorlist .= $lang['fl_only_stay_at_home'];
+        if ($target_mission == MT_ATTACK) {
+                  $errorlist .= $lang['fl_no_self_attack'];
+        }
+
+        if ($target_mission == MT_SPY) {
+                  $errorlist .= $lang['fl_no_self_spy'];
+        }
+      } else{
+        if ($target_mission == MT_RELOCATE) {
+                  $errorlist .= $lang['fl_only_stay_at_home'];
+        }
       }
-    }else{
+    } else{
       if ($target_mission < MT_COLONIZE){
         $errorlist .= $lang['fl_unknow_target'];
-      }else{
-        if ($target_mission == MT_DESTROY)
-          $errorlist .= $lang['fl_nomoon'];
+      } else{
+        if ($target_mission == MT_DESTROY) {
+                  $errorlist .= $lang['fl_nomoon'];
+        }
 
         if ($target_mission == MT_RECYCLE){
-          if($TargetPlanet['debris_metal'] + $TargetPlanet['debris_crystal'] == 0)
-            $errorlist .= $lang['fl_nodebris'];
+          if($TargetPlanet['debris_metal'] + $TargetPlanet['debris_crystal'] == 0) {
+                      $errorlist .= $lang['fl_nodebris'];
+          }
         }
       }
     }
@@ -131,8 +143,7 @@ 
       $aks = DbFleetStatic::dbAcsGetById($fleet_group);
       if (!$aks) {
         $fleet_group = 0;
-      }
-      else
+      } else
       {
         $galaxy = $aks['galaxy'];
         $system = $aks['system'];

Spacing +34 added lines, -35 removed lines

@@ -8,7 +8,7 @@ 
 use Planet\DBStaticPlanet;
 use Unit\DBStaticUnit;
 
-if(SN_IN_FLEET !== true) {
+if (SN_IN_FLEET !== true) {
   $debug->error("Attempt to call FLEET page mode {$mode} directly - not from fleet.php", 'Forbidden', 403);
 }
 
@@ -27,7 +27,7 @@ 
     $errorlist .= $lang['fl_limit_galaxy'];
   if (!$system || $system > $config->game_maxSystem || $system < 1)
     $errorlist .= $lang['fl_limit_system'];
-  if (!$planet || $planet < 1 || ($planet > $config->game_maxPlanet && $target_mission != MT_EXPLORE ))
+  if (!$planet || $planet < 1 || ($planet > $config->game_maxPlanet && $target_mission != MT_EXPLORE))
     $errorlist .= $lang['fl_limit_planet'];
   if ($planetrow['galaxy'] == $galaxy && $planetrow['system'] == $system && $planetrow['planet'] == $planet && $planetrow['planet_type'] == $planet_type)
     $errorlist .= $lang['fl_ownpl_err'];
@@ -54,35 +54,35 @@ 
   $planetrow = DBStaticPlanet::db_planet_by_id($planetrow['id'], true);
 
   if ($target_mission == MT_EXPLORE) {
-    if ($MaxExpeditions == 0 ) {
+    if ($MaxExpeditions == 0) {
       $errorlist .= $lang['fl_expe_notech'];
-    } elseif ($FlyingExpeditions >= $MaxExpeditions ) {
+    } elseif ($FlyingExpeditions >= $MaxExpeditions) {
       $errorlist .= $lang['fl_expe_max'];
     }
   } else {
-    if ($TargetPlanet['id_owner']){
+    if ($TargetPlanet['id_owner']) {
       if ($target_mission == MT_COLONIZE)
         $errorlist .= $lang['fl_colonized'];
 
-      if ($TargetPlanet['id_owner'] == $planetrow['id_owner']){
+      if ($TargetPlanet['id_owner'] == $planetrow['id_owner']) {
         if ($target_mission == MT_ATTACK)
           $errorlist .= $lang['fl_no_self_attack'];
 
         if ($target_mission == MT_SPY)
           $errorlist .= $lang['fl_no_self_spy'];
-      }else{
+      } else {
         if ($target_mission == MT_RELOCATE)
           $errorlist .= $lang['fl_only_stay_at_home'];
       }
-    }else{
-      if ($target_mission < MT_COLONIZE){
+    } else {
+      if ($target_mission < MT_COLONIZE) {
         $errorlist .= $lang['fl_unknow_target'];
-      }else{
+      } else {
         if ($target_mission == MT_DESTROY)
           $errorlist .= $lang['fl_nomoon'];
 
-        if ($target_mission == MT_RECYCLE){
-          if($TargetPlanet['debris_metal'] + $TargetPlanet['debris_crystal'] == 0)
+        if ($target_mission == MT_RECYCLE) {
+          if ($TargetPlanet['debris_metal'] + $TargetPlanet['debris_crystal'] == 0)
             $errorlist .= $lang['fl_nodebris'];
         }
       }
@@ -90,13 +90,13 @@ 
   }
 
 
-  if(is_object($captainModule = moduleCaptain()) && $captain_id = sys_get_param_id('captain_id')) {
+  if (is_object($captainModule = moduleCaptain()) && $captain_id = sys_get_param_id('captain_id')) {
     $captain = $captainModule->unit_captain_get($planetrow['id']);
 //      mrc_get_level($user, $planetrow, UNIT_CAPTAIN, true);
-    if(!$captain) {
+    if (!$captain) {
       $errorlist .= $lang['module_unit_captain_error_no_captain'];
-    } elseif($captain['unit_location_type'] == LOC_PLANET) {
-      if($target_mission == MT_RELOCATE && ($arriving_captain = mrc_get_level($user, $TargetPlanet, UNIT_CAPTAIN, true))) {
+    } elseif ($captain['unit_location_type'] == LOC_PLANET) {
+      if ($target_mission == MT_RELOCATE && ($arriving_captain = mrc_get_level($user, $TargetPlanet, UNIT_CAPTAIN, true))) {
         $errorlist .= $lang['module_unit_captain_error_captain_already_bound'];
       }
     } else {
@@ -120,13 +120,13 @@ 
   $fleet_group = max(0, intval($_POST['fleet_group']));
   //But is it acs??
   //Well all acs fleets must have a fleet code.
-  if($fleet_group) {
+  if ($fleet_group) {
     //Also it must be mission type 2
     $target_mission = MT_AKS;
 
     //The co-ords must be the same as where the acs fleet is going.
     $target = "g{$galaxy}s{$system}p{$planet}t{$planet_type}";
-    if($_POST['acs_target_mr'] == $target) {
+    if ($_POST['acs_target_mr'] == $target) {
       //ACS attack must exist (if acs fleet has arrived this will also return false (2 checks in 1!!!)
       $aks = DbFleetStatic::dbAcsGetById($fleet_group);
       if (!$aks) {
@@ -142,7 +142,7 @@ 
     }
   }
   //Check that a failed acs attack isn't being sent, if it is, make it an attack fleet.
-  if(!$fleet_group && $target_mission == MT_AKS) {
+  if (!$fleet_group && $target_mission == MT_AKS) {
     $target_mission = MT_ATTACK;
   }
 
@@ -152,7 +152,7 @@ 
   $options = [P_FLEET_ATTACK_SPEED_PERCENT_TENTH => $speed_percent, P_FLEET_ATTACK_FLEET_GROUP => $fleet_group, P_FLEET_ATTACK_RESOURCES_SUM => $StorageNeeded];
   $cant_attack = flt_can_attack($planetrow, $TargetPlanet, $fleetarray, $target_mission, $options);
 
-  if($cant_attack !== ATTACK_ALLOWED) {
+  if ($cant_attack !== ATTACK_ALLOWED) {
     SnTemplate::messageBox("<span class='error'><b>{$lang['fl_attack_error'][$cant_attack]}</b></span>", $lang['fl_error'], 'fleet' . DOT_PHP_EX, 99);
   }
 
@@ -163,11 +163,10 @@ 
 
   $fleet['start_time'] = $duration + SN_TIME_NOW;
 
-  $max_duration = $target_mission == MT_EXPLORE ? get_player_max_expedition_duration($user) :
-    ($target_mission == MT_HOLD ? 12 : 0);
-  if($max_duration) {
+  $max_duration = $target_mission == MT_EXPLORE ? get_player_max_expedition_duration($user) : ($target_mission == MT_HOLD ? 12 : 0);
+  if ($max_duration) {
     $StayDuration = sys_get_param_id('missiontime');
-    if($StayDuration > $max_duration || $StayDuration < 1) {
+    if ($StayDuration > $max_duration || $StayDuration < 1) {
       $debug->warning('Supplying wrong mission time', 'Hack attempt', 302, array('base_dump' => true));
       die();
     }
@@ -177,10 +176,10 @@ 
     $StayDuration = 0;
     $StayTime     = 0;
   }
-  $fleet['end_time']   = $StayDuration + (2 * $duration) + SN_TIME_NOW;
+  $fleet['end_time'] = $StayDuration + (2 * $duration) + SN_TIME_NOW;
 
-  if($aks && $target_mission == MT_AKS) {
-    if ($fleet['start_time']>$aks['ankunft']) {
+  if ($aks && $target_mission == MT_AKS) {
+    if ($fleet['start_time'] > $aks['ankunft']) {
       SnTemplate::messageBox($lang['fl_aks_too_slow'] . 'Fleet arrival: ' . date(FMT_DATE_TIME, $fleet['start_time']) . " AKS arrival: " . date(FMT_DATE_TIME, $aks['ankunft']), $lang['fl_error']);
     }
     $fleet['start_time'] = $aks['ankunft'];
@@ -191,14 +190,14 @@ 
   $FleetShipCount      = 0;
   $db_changeset = array();
   foreach ($fleetarray as $Ship => $Count) {
-    $FleetStorage    += get_unit_param($Ship, P_CAPACITY) * $Count;
+    $FleetStorage += get_unit_param($Ship, P_CAPACITY) * $Count;
     $db_changeset['unit'][] = OldDbChangeSet::db_changeset_prepare_unit($Ship, -$Count, $user, $planetrow['id']);
   }
   $fleet_array = sys_unit_arr2str($fleetarray);
-  $FleetShipCount  += array_sum($fleetarray);
-  $FleetStorage        -= $consumption;
+  $FleetShipCount += array_sum($fleetarray);
+  $FleetStorage -= $consumption;
 
-  if ( $StorageNeeded > $FleetStorage) {
+  if ($StorageNeeded > $FleetStorage) {
     SnTemplate::messageBox("<span class='error'><b>" . $lang['fl_nostoragespa'] . HelperString::numberFloorAndFormat($StorageNeeded - $FleetStorage) . "</b></span>", $lang['fl_error'], 'fleet' . DOT_PHP_EX, 2);
   }
   if ($planetrow['deuterium'] < $TransDeuterium + $consumption) {
@@ -247,7 +246,7 @@ 
 //    ));
 //  }
 
-  if(is_array($captain)) {
+  if (is_array($captain)) {
     DBStaticUnit::db_unit_set_by_id($captain['unit_id'], "`unit_location_type` = " . LOC_FLEET . ", `unit_location_id` = {$fleet_id}");
   }
 
@@ -260,7 +259,7 @@ 
     'START_LEFT'         => floor($fleet['end_time'] + 1 - SN_TIME_NOW),
   );
 
-  if(!empty($TargetPlanet)) {
+  if (!empty($TargetPlanet)) {
     $template_route += array(
       'END_TYPE_TEXT_SH' => $lang['sys_planet_type_sh'][$TargetPlanet['planet_type']],
       'END_COORDS'       => uni_render_coordinates($TargetPlanet),
@@ -273,8 +272,8 @@ 
   $template->assign_block_vars('fleets', $template_route);
 
   $sn_groups_fleet = sn_get_groups('fleet');
-  foreach($fleetarray as $ship_id => $ship_count) {
-    if(in_array($ship_id, $sn_groups_fleet) && $ship_count) {
+  foreach ($fleetarray as $ship_id => $ship_count) {
+    if (in_array($ship_id, $sn_groups_fleet) && $ship_count) {
 //      $ship_base_data = get_ship_data($ship_id, $user);
       $template->assign_block_vars('fleets.ships', array(
         'ID'          => $ship_id,

includes/includes/flt_functions.php

Spacing +2 added lines, -2 removed lines

@@ -364,7 +364,7 @@ 
       return $result = ATTACK_ACS_TOO_LATE;
     }
 
-    if(DbFleetStatic::acsIsAcsFull($acs['id'])) {
+    if (DbFleetStatic::acsIsAcsFull($acs['id'])) {
       return $result = ATTACK_ACS_MAX_FLEETS;
     }
   }
@@ -548,7 +548,7 @@ 
 
 
   !is_array($resources) ? $resources = [] : false;
-  if(empty($options[P_FLEET_ATTACK_RES_LIST])) {
+  if (empty($options[P_FLEET_ATTACK_RES_LIST])) {
     $options[P_FLEET_ATTACK_RES_LIST] = $resources;
   }
   $can_attack = flt_can_attack($from, $to, $fleet, $mission, $options);

includes/constants/constants_units.php

Indentation +4 added lines, -4 removed lines

@@ -361,10 +361,10 @@
 
 
 define('GROUP_PART',         800000); // Зарезервировано для запчастей: 800.001 - 899.999
- define('GROUP_PART_HULL',    801000); // Корпуса - 1000 штук
- define('GROUP_PART_ARMOR',   802000); // Броня - 1000 штук
- define('GROUP_PART_SHIELD',  803000); // Щиты - 1000 штук
- define('GROUP_PART_WEAPON',  810000); // Оружие - 10000 штук
+  define('GROUP_PART_HULL',    801000); // Корпуса - 1000 штук
+  define('GROUP_PART_ARMOR',   802000); // Броня - 1000 штук
+  define('GROUP_PART_SHIELD',  803000); // Щиты - 1000 штук
+  define('GROUP_PART_WEAPON',  810000); // Оружие - 10000 штук
 
 
 define('UNIT_GROUP', 'groups'); // 900.000 // Зарезервировано для груп юнитов: 900.001 - 999.999

Spacing +20 added lines, -20 removed lines

@@ -161,10 +161,10 @@ 
 // === Artifacts
 define('UNIT_ARTIFACTS_STR', '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
@@ -238,25 +238,25 @@ 
 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_2017_WOMEN_DAY_BEST', 2205);  // Медаль Лучшему Кавалеру за максимум потраченной ММ/максимум одаренных женщин Женщине от Мужчины во время ивента 8 марта 2017 года
-define('UNIT_AWARD_MEDAL_2017_WOMEN_DAY_QUEEN', 2206);  // Медаль Королевы Весны за максимум полученной ММ/максимум полученных подарков от Мужчины во время ивента 8 марта 2017 года
+define('UNIT_AWARD_MEDAL_2016_WOMEN_DAY_BEST', 2204); // Медаль Лучшему Кавалеру за максимум потраченной ММ/максимум одаренных женщин Женщине от Мужчины во время ивента 8 марта 2016 года
+define('UNIT_AWARD_MEDAL_2017_WOMEN_DAY_BEST', 2205); // Медаль Лучшему Кавалеру за максимум потраченной ММ/максимум одаренных женщин Женщине от Мужчины во время ивента 8 марта 2017 года
+define('UNIT_AWARD_MEDAL_2017_WOMEN_DAY_QUEEN', 2206); // Медаль Королевы Весны за максимум полученной ММ/максимум полученных подарков от Мужчины во время ивента 8 марта 2017 года
 define('UNIT_AWARD_MEDAL_8_MARCH_BEST_CAVALIER_AMOUNT', 2207); // Медаль Лучшему Кавалеру за максимум потраченной ММ Женщине от Мужчины во время ивента 8 марта 2017 года
 define('UNIT_AWARD_MEDAL_8_MARCH_BEST_CAVALIER_COUNT', 2208); // Медаль Лучшему Кавалеру за максимум одаренных женщин Женщине от Мужчины во время ивента 8 марта 2017 года
 define('UNIT_AWARD_MEDAL_8_MARCH_SPRING_QUEEN_AMOUNT', 2209); // Медаль Королевы Весны за максимум полученной ММ от Мужчины во время ивента 8 марта 2017 года
 define('UNIT_AWARD_MEDAL_8_MARCH_SPRING_QUEEN_COUNT', 2210); // Медаль Королевы Весны за максимум полученных подарков от Мужчины во время ивента 8 марта 2017 года
 
 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_2017_WOMEN_DAY', 2310);  // Значек за подарок Женщине от Мужчины во время ивента 8 марта 2017 года
+define('UNIT_AWARD_MEMORY_2016_WOMEN_DAY', 2309); // Значек за подарок Женщине от Мужчины во время ивента 8 марта 2016 года
+define('UNIT_AWARD_MEMORY_2017_WOMEN_DAY', 2310); // Значек за подарок Женщине от Мужчины во время ивента 8 марта 2017 года
 define('UNIT_AWARD_MEMORY_SUPER_BORN_2017_SIMPLE', 2311); // День Рождения СН - 2017
 define('UNIT_AWARD_MEMORY_SUPER_BORN_2017_BRONZE', 2312); // День Рождения СН - 2017
 define('UNIT_AWARD_MEMORY_SUPER_BORN_2017_SILVER', 2313); // День Рождения СН - 2017
@@ -360,19 +360,19 @@ 
 const GROUP_UNIT_OBJECTS_IN_SPACE = 790002;
 
 
-define('GROUP_PART',         800000); // Зарезервировано для запчастей: 800.001 - 899.999
- define('GROUP_PART_HULL',    801000); // Корпуса - 1000 штук
- define('GROUP_PART_ARMOR',   802000); // Броня - 1000 штук
- define('GROUP_PART_SHIELD',  803000); // Щиты - 1000 штук
- define('GROUP_PART_WEAPON',  810000); // Оружие - 10000 штук
+define('GROUP_PART', 800000); // Зарезервировано для запчастей: 800.001 - 899.999
+ define('GROUP_PART_HULL', 801000); // Корпуса - 1000 штук
+ define('GROUP_PART_ARMOR', 802000); // Броня - 1000 штук
+ define('GROUP_PART_SHIELD', 803000); // Щиты - 1000 штук
+ define('GROUP_PART_WEAPON', 810000); // Оружие - 10000 штук
 
 
 define('UNIT_GROUP', 'groups'); // 900.000 // Зарезервировано для груп юнитов: 900.001 - 999.999
-define('GROUP_UNIT_USER', 1000000);// Зарезервировано для пользовательских юнитов: 1.000.001 - 1.999.999
-define('GROUP_ID_RESERVED', 2000000);// Зарезервировано для прочих нужд: 2.000.000 - 1.999.999.999
+define('GROUP_UNIT_USER', 1000000); // Зарезервировано для пользовательских юнитов: 1.000.001 - 1.999.999
+define('GROUP_ID_RESERVED', 2000000); // Зарезервировано для прочих нужд: 2.000.000 - 1.999.999.999
 const UNIT_CAN_NOT_BE_BUILD = 2000001; // Юнит не может быть построен - для спецюнитов
-define('GROUP_PARAMS', 1000000000);// Зарезервировано для параметров: 1.000.000.001 - 1.999.999.999
-define('GROUP_DEVELOPERS', 2000000000);// Пространство для разработчиков: 2.000.000.001 - 2.147.483.647
+define('GROUP_PARAMS', 1000000000); // Зарезервировано для параметров: 1.000.000.001 - 1.999.999.999
+define('GROUP_DEVELOPERS', 2000000000); // Пространство для разработчиков: 2.000.000.001 - 2.147.483.647
 
 define('UNIT_PLAYER_COLONIES_CURRENT', 'COLONIES_CURRENT');
 define('UNIT_PLAYER_COLONIES_MAX', 'COLONIES_MAX');

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;
   }
 }
@@ -34,7 +34,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 = SN::$db->db_fetch($result)) {
+while ($row = SN::$db->db_fetch($result)) {
   $row['CONSTANT'] = $rpgConstants[$row['REASON']];
 
   $row['DM_AMOUNT_TEXT'] = HelperString::numberFloorAndFormat($row['DM_AMOUNT']);
@@ -57,8 +57,8 @@ 
   GROUP BY reason, if(sign((amount)) > 0, 1, -1) ORDER BY sum(amount) DESC;"
 );
 
-while($row = SN::$db->db_fetch($result)) {
-  if(empty($spent[$row['BALANCE']])) {
+while ($row = SN::$db->db_fetch($result)) {
+  if (empty($spent[$row['BALANCE']])) {
     $spent[$row['BALANCE']] = array();
   }
 
@@ -68,16 +68,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'] = HelperString::numberFloorAndFormat($row['TOTAL_AMOUNT']);
   @$row['TOTAL_COUNT_TEXT'] = HelperString::numberFloorAndFormat($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/admin_user_activity.php

Spacing +1 added lines, -1 removed lines

@@ -73,7 +73,7 @@
         $length          = 0;
       } else {
         $spendOnThisHour = $leftOfThisHour;
-        $length          -= $leftOfThisHour;
+        $length -= $leftOfThisHour;
       }
       $perHour[$hourStart] += $spendOnThisHour;