supernova-ws / SuperNova

includes/vars.php

Indentation +74 added lines, -74 removed lines

@@ -16,23 +16,23 @@ 
 $sn_menu_admin_extra = array();
 
 $sn_mvc = array(
- 'model' => array(
-   'options' => array('sn_options_model'),
-   'chat' => array('sn_chat_model'),
-   'chat_add' => array('sn_chat_add_model'),
- ),
- 'view' => array(
-   'options' => array('sn_options_view'),
-   'chat' => array('sn_chat_view'),
-   'chat_msg' => array('sn_chat_msg_view'),
- ),
- 'controller' => array(),
- 'i18n' => array(
-   'options' => array(
-     'options' => 'options',
-     'messages' => 'messages',
-   ),
- ),
+  'model' => array(
+    'options' => array('sn_options_model'),
+    'chat' => array('sn_chat_model'),
+    'chat_add' => array('sn_chat_add_model'),
+  ),
+  'view' => array(
+    'options' => array('sn_options_view'),
+    'chat' => array('sn_chat_view'),
+    'chat_msg' => array('sn_chat_msg_view'),
+  ),
+  'controller' => array(),
+  'i18n' => array(
+    'options' => array(
+      'options' => 'options',
+      'messages' => 'messages',
+    ),
+  ),
 );
 
 $note_priority_classes = array(
@@ -120,62 +120,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(
@@ -1027,7 +1027,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

@@ -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_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;
   }
 

Doc Comments +3 added lines

@@ -75,6 +75,9 @@
   return classSupernova::db_ins_record(LOC_UNIT, $set);
 }
 
+/**
+ * @param integer $unit_location_type
+ */
 function db_unit_list_delete($user_id = 0, $unit_location_type, $unit_location_id, $unit_snid = 0)
 {
   return classSupernova::db_del_record_list(LOC_UNIT,

includes/db/db_queries_account.php

Indentation +5 added lines, -5 removed lines

@@ -1,10 +1,10 @@
 <?php
 /**
- * Created by PhpStorm.
- * User: Gorlum
- * Date: 13.04.2015
- * Time: 6:27
- */
+   * Created by PhpStorm.
+   * User: Gorlum
+   * Date: 13.04.2015
+   * Time: 6:27
+   */
 
 function    db_account_by_user_id($user_id_safe, &$result = null) {
   die('db_account_by_user_id() должна быть реализована в класса core_auth!');

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']);
 }

Braces +1 added lines, -2 removed lines

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

includes/alliance/ali_internal_admin_request.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);
 }
 
@@ -9,12 +9,12 @@ 
 }
 
 $d = sys_get_param_id('d');
-if($d) {
+if ($d) {
   doquery("UPDATE {{alliance_requests}} SET `request_denied` = 1, `request_text` = '{$lang['ali_req_deny_reason']}' WHERE `id_user`= {$d} LIMIT 1;");
 }
 
 $id_user = sys_get_param_id('id_user');
-if($id_user) {
+if ($id_user) {
   $ally_name_safe = db_escape($ally['ally_name']);
   $ally_tag_safe = db_escape($ally['ally_tag']);
   db_user_set_by_id($id_user, "`ally_id` = '{$ally['id']}', `ally_name` = '{$ally_name_safe}', `ally_tag` = '{$ally_tag_safe}', `ally_register_time` = " . SN_TIME_NOW . ", `ally_rank_id` = 0");

includes/includes/uni_rename.php

Braces +1 added lines, -2 removed lines

@@ -46,8 +46,7 @@
       sn_db_transaction_commit();
       sys_redirect("galaxy.php?mode=name&galaxy={$uni_galaxy}&system={$uni_system}");
     }
-  }
-  catch (exception $e)
+  } catch (exception $e)
   {
     sn_db_transaction_rollback();
     $template->assign_block_vars('result', array(

Spacing +6 added lines, -6 removed lines

@@ -9,12 +9,12 @@ 
     $uni_galaxy = sys_get_param_int('galaxy', $planetrow['galaxy']);
     $uni_system = sys_get_param_int('system');
 
-    if($uni_galaxy < 1 || $uni_galaxy > classSupernova::$config->game_maxGalaxy)
+    if ($uni_galaxy < 1 || $uni_galaxy > classSupernova::$config->game_maxGalaxy)
     {
       throw new exception(classLocale::$lang['uni_msg_error_wrong_galaxy'], ERR_ERROR);
     }
 
-    if($uni_system < 0 || $uni_system > classSupernova::$config->game_maxSystem)
+    if ($uni_system < 0 || $uni_system > classSupernova::$config->game_maxSystem)
     {
       throw new exception(classLocale::$lang['uni_msg_error_wrong_system'], ERR_ERROR);
     }
@@ -23,12 +23,12 @@ 
     $uni_row['universe_price'] += $uni_system ? classSupernova::$config->uni_price_system : classSupernova::$config->uni_price_galaxy;
     $uni_row['universe_name'] = strip_tags($uni_row['universe_name'] ? $uni_row['universe_name'] : ($uni_system ? "{$classLocale['sys_system']} [{$uni_galaxy}:{$uni_system}]" : "{$classLocale['sys_galaxy']} {$uni_galaxy}"));
 
-    if(sys_get_param_str('uni_name_submit'))
+    if (sys_get_param_str('uni_name_submit'))
     {
       $uni_row['universe_name'] = strip_tags(sys_get_param_str('uni_name'));
 
       $uni_price = sys_get_param_float('uni_price');
-      if($uni_price < $uni_row['universe_price'])
+      if ($uni_price < $uni_row['universe_price'])
       {
         throw new exception(classLocale::$lang['uni_msg_error_low_price'], ERR_ERROR);
       }
@@ -37,12 +37,12 @@ 
       sn_db_transaction_start();
       $user = db_user_by_id($user['id'], true);
       // if($user[get_unit_param(RES_DARK_MATTER, P_NAME)] < $uni_price)
-      if(mrc_get_level($user, null, RES_DARK_MATTER) < $uni_price)
+      if (mrc_get_level($user, null, RES_DARK_MATTER) < $uni_price)
       {
         throw new exception(classLocale::$lang['uni_msg_error_no_dm'], ERR_ERROR);
       }
 
-      if(!rpg_points_change($user['id'], RPG_RENAME, -$uni_price, "Renaming [{$uni_galaxy}:{$uni_system}] to " . sys_get_param_str_unsafe('uni_name')))
+      if (!rpg_points_change($user['id'], RPG_RENAME, -$uni_price, "Renaming [{$uni_galaxy}:{$uni_system}] to " . sys_get_param_str_unsafe('uni_name')))
       {
         throw new exception(classLocale::$lang['sys_msg_err_update_dm'], ERR_ERROR);
       }

includes/includes/flt_page5.inc

Spacing +23 added lines, -23 removed lines

@@ -12,7 +12,7 @@ 
 *
 **/
 
-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);
 }
 
@@ -25,7 +25,7 @@ 
 
   $planet_list = array();
 
-  if(is_array($resources_taken))
+  if (is_array($resources_taken))
   {
     $query = implode(',', array_keys($resources_taken));
     $query = " AND `destruyed` = 0 AND `id` IN ({$query})";
@@ -33,16 +33,16 @@ 
     $query = '';
   }
 
-  foreach(sn_get_groups('flt_transports') as $transport_id) {
+  foreach (sn_get_groups('flt_transports') as $transport_id) {
     $transports[$transport_id] = get_unit_param($transport_id, P_CAPACITY);
   }
   arsort($transports);
 
   $planets_db_list = db_planet_list_sorted($user, $planetrow['id'], '*', $query);
   !is_array($planets_db_list) ? $planets_db_list = array() : false;
-  foreach($planets_db_list as $planet_db_data) {
+  foreach ($planets_db_list as $planet_db_data) {
   // begin planet loop
-    if(!$query) {
+    if (!$query) {
       $resources_taken[$planet_db_data['id']] = 1;
     }
     sn_db_transaction_start();
@@ -54,8 +54,8 @@ 
     $planet_id = $planet_db_data['id'];
 
     $planet_resources = 0;
-    foreach(sn_get_groups('resources_loot') as $resource_id) {
-      if($resources_taken[$planet_id] == 1 || $resources_taken[$planet_id][$resource_id]) {
+    foreach (sn_get_groups('resources_loot') as $resource_id) {
+      if ($resources_taken[$planet_id] == 1 || $resources_taken[$planet_id][$resource_id]) {
         $planet_resources += floor(mrc_get_level($user, $planet_db_data, $resource_id, true, true)); // $planet_db_data[get_unit_param($resource_id, P_NAME)]);
       }
     }
@@ -86,8 +86,8 @@ 
     $fleet_capacity = 0;
     $ship_loadout = array();
     $fleet = array();
-    foreach($transports as $ship_id => $ship_capacity) {
-      if($ship_count = mrc_get_level($user, $planet_db_data, $ship_id, true, true)) {
+    foreach ($transports as $ship_id => $ship_capacity) {
+      if ($ship_count = mrc_get_level($user, $planet_db_data, $ship_id, true, true)) {
         $ship_loadout[$ship_id]['capacity'] = $ship_count * $ship_capacity;
         $ship_loadout[$ship_id]['taken'] = 0;
         $fleet_capacity += $ship_loadout[$ship_id]['capacity'];
@@ -98,9 +98,9 @@ 
 
     $will_take = min($planet_resources, $fleet_capacity);
 
-    foreach($ship_loadout as $ship_id => &$planet_ship) {
+    foreach ($ship_loadout as $ship_id => &$planet_ship) {
       $can_take = min($will_take, $planet_ship['capacity']);
-      if($can_take <= 0) {
+      if ($can_take <= 0) {
         continue;
       }
       $planet_ship['capacity'] -= $can_take;
@@ -108,23 +108,23 @@ 
       $fleet[$ship_id] = ceil($planet_ship['taken'] / $transports[$ship_id]);
 
       $will_take -= $can_take;
-      if($will_take <= 0) {
+      if ($will_take <= 0) {
         break;
       }
     }
 
-    if(!empty($fleet)) {
+    if (!empty($fleet)) {
       $travel_data = flt_travel_data($user, $planetrow, $planet_db_data, $fleet, 10);
       $planet_data['FLEET_SPEED'] = $travel_data['fleet_speed'];
       $planet_data['DISTANCE']    = $travel_data['distance'];
       $planet_data['DURATION']    = $travel_data['duration'];
       $planet_data['CONSUMPTION'] = $travel_data['consumption'];
 
-      if(floor(mrc_get_level($user, $planet_db_data, RES_DEUTERIUM, true)) >= $planet_data['CONSUMPTION']) {
+      if (floor(mrc_get_level($user, $planet_db_data, RES_DEUTERIUM, true)) >= $planet_data['CONSUMPTION']) {
         $will_take = min($planet_resources, $fleet_capacity) - $planet_data['CONSUMPTION'];
 
-        foreach(sn_get_groups('resources_loot') as $resource_id) {
-          if($resources_taken[$planet_id] != 1 && !$resources_taken[$planet_id][$resource_id]) {
+        foreach (sn_get_groups('resources_loot') as $resource_id) {
+          if ($resources_taken[$planet_id] != 1 && !$resources_taken[$planet_id][$resource_id]) {
             continue;
           }
 
@@ -133,7 +133,7 @@ 
           $fleet[$resource_id] = min($will_take, $resource_amount);
           $will_take -= $resource_amount;
 
-          if($will_take <= 0) {
+          if ($will_take <= 0) {
             break;
           }
         }
@@ -157,19 +157,19 @@ 
 
 $resources_taken = sys_get_param('resources');
 
-if(!empty($resources_taken))  { // begin processing parameters
+if (!empty($resources_taken)) { // begin processing parameters
   $planet_list = flt_build_gathering($resources_taken);
 
-  foreach($planet_list as $planet_id => $planet_data) {
-    if($planet_data['RESULT'] == ATTACK_ALLOWED) {
+  foreach ($planet_list as $planet_id => $planet_data) {
+    if ($planet_data['RESULT'] == ATTACK_ALLOWED) {
       $planet_data['RESULT'] = flt_t_send_fleet($user, $planet_data['PLANET_DB_DATA'], $planetrow, $planet_data['FLEET'], MT_TRANSPORT);
     }
 
     $planet_data['MESSAGE'] = $lang['fl_attack_error'][$planet_data['RESULT']];
 
     $template->assign_block_vars('results', $planet_data);
-    if(!empty($planet_data['FLEET']) && $planet_data['RESULT'] == ATTACK_ALLOWED) {
-      foreach($planet_data['FLEET'] as $unit_id => $amount) {
+    if (!empty($planet_data['FLEET']) && $planet_data['RESULT'] == ATTACK_ALLOWED) {
+      foreach ($planet_data['FLEET'] as $unit_id => $amount) {
         $template->assign_block_vars('results.units', array(
           'ID'     => $unit_id,
           'NAME'   => $lang['tech'][$unit_id],
@@ -182,7 +182,7 @@ 
 
 // Building list of own planets & moons
 $planet_list = flt_build_gathering();
-foreach($planet_list as $planet_data) {
+foreach ($planet_list as $planet_data) {
   $planet_data['DURATION'] = $planet_data['DURATION'] ? pretty_time($planet_data['DURATION']) : $lang['flt_no_fuel'];
   $template->assign_block_vars('colonies', $planet_data);
 }

includes/includes/market_info.inc

Braces +1 added lines, -2 removed lines

@@ -79,8 +79,7 @@
 
     sn_db_transaction_commit();
     throw new Exception($info_action, ERR_NONE);
-  }
-  catch (Exception $e)
+  } catch (Exception $e)
   {
     sn_db_transaction_rollback();
 

Spacing +12 added lines, -12 removed lines

@@ -2,7 +2,7 @@ 
 
 $classLocale = classLocale::$lang;
 
-if(!defined('SN_IN_MARKET') || SN_IN_MARKET !== true)
+if (!defined('SN_IN_MARKET') || SN_IN_MARKET !== true)
 {
   $debug->error("Attempt to call market page mode {$mode} directly - not from market.php", 'Forbidden', 403);
 }
@@ -17,50 +17,50 @@ 
 ));
 
 $info_action = sys_get_param_int('action');
-if($info_action)
+if ($info_action)
 {
   try
   {
     sn_db_transaction_start();
 
     $user = db_user_by_id($user['id'], true);
-    if(mrc_get_level($user, null, RES_DARK_MATTER) < classSupernova::$config->rpg_cost_info)
+    if (mrc_get_level($user, null, RES_DARK_MATTER) < classSupernova::$config->rpg_cost_info)
     {
       throw new Exception(MARKET_NO_DM, ERR_ERROR);
     }
 
-    switch($info_action)
+    switch ($info_action)
     {
       case MARKET_INFO_PLAYER:
         $user_info_name_unsafe = sys_get_param_str_unsafe('user_info_name');
-        if(!$user_info_name_unsafe)
+        if (!$user_info_name_unsafe)
         {
           throw new Exception(MARKET_INFO_PLAYER_WRONG, ERR_ERROR);
         }
 
-        if(is_id($user_info_name_unsafe))
+        if (is_id($user_info_name_unsafe))
         {
           $user_info = db_user_by_id($user_info_name_unsafe, true, '`id`, `username`', true);
         }
-        if(!is_array($user_info))
+        if (!is_array($user_info))
         {
           $user_info = db_user_by_username($user_info_name_unsafe, true, '`id`, `username`', true, true);
         }
-        if(!is_array($user_info))
+        if (!is_array($user_info))
         {
           throw new Exception(MARKET_INFO_PLAYER_NOT_FOUND, ERR_ERROR);
         }
-        if($user_info['id'] == $user['id'])
+        if ($user_info['id'] == $user['id'])
         {
           throw new Exception(MARKET_INFO_PLAYER_SAME, ERR_ERROR);
         }
 
         $msg_text = array();
-        foreach(sn_get_groups('mercenaries') as $mercenary_id)
+        foreach (sn_get_groups('mercenaries') as $mercenary_id)
         {
           $msg_text[] = "{$classLocale['tech'][$mercenary_id]} - " . (($mercenary_level = mrc_get_level($user_info, null, $mercenary_id)) ? "{$classLocale['sys_level']} {$mercenary_level}" : classLocale::$lang['eco_mrk_info_not_hired']);
         }
-        if($mercenary_level = mrc_get_level($user_info, null, UNIT_PREMIUM))
+        if ($mercenary_level = mrc_get_level($user_info, null, UNIT_PREMIUM))
         {
           $msg_text[] = "{$classLocale['tech'][UNIT_PREMIUM]} - {$mercenary_level} {$classLocale['sys_level']}";
         }
@@ -74,7 +74,7 @@ 
       break;
     }
 
-    if(!rpg_points_change($user['id'], RPG_MARKET_INFO_MERCENARY, -classSupernova::$config->rpg_cost_info, "Using Black Market page {$classLocale['eco_mrk_info']} - getting info about user ID {$user_info['id']}"))
+    if (!rpg_points_change($user['id'], RPG_MARKET_INFO_MERCENARY, -classSupernova::$config->rpg_cost_info, "Using Black Market page {$classLocale['eco_mrk_info']} - getting info about user ID {$user_info['id']}"))
     {
       // TODO: throw new Exception(MARKET_INFO_PLAYER_SAME, ERR_ERROR);
     }