supernova-ws / SuperNova

includes/vars_structures.php

Spacing +12 added lines, -12 removed lines

@@ -15,8 +15,8 @@ 
       'factor' => 1.5,
     ),
     P_UNIT_PRODUCTION => array(
-      RES_METAL     => function ($level, $production_factor, $user, $planet_row) {return  40 * $level * pow(1.1, $level) * (0.1 * $production_factor);},
-      RES_ENERGY    => function ($level, $production_factor, $user, $planet_row) {return -13 * $level * pow(1.1, $level) * (0.1 * $production_factor);},
+      RES_METAL     => function($level, $production_factor, $user, $planet_row) {return  40 * $level * pow(1.1, $level) * (0.1 * $production_factor); },
+      RES_ENERGY    => function($level, $production_factor, $user, $planet_row) {return -13 * $level * pow(1.1, $level) * (0.1 * $production_factor); },
     ),
     P_MINING_IS_MANAGED => true,
   ),
@@ -33,8 +33,8 @@ 
       'factor' => 1.6,
     ),
     P_UNIT_PRODUCTION => array(
-      RES_CRYSTAL   => function ($level, $production_factor, $user, $planet_row) {return  32 * $level * pow(1.1, $level) * (0.1 * $production_factor);},
-      RES_ENERGY    => function ($level, $production_factor, $user, $planet_row) {return -16 * $level * pow(1.1, $level) * (0.1 * $production_factor);},
+      RES_CRYSTAL   => function($level, $production_factor, $user, $planet_row) {return  32 * $level * pow(1.1, $level) * (0.1 * $production_factor); },
+      RES_ENERGY    => function($level, $production_factor, $user, $planet_row) {return -16 * $level * pow(1.1, $level) * (0.1 * $production_factor); },
     ),
     P_MINING_IS_MANAGED => true,
   ),
@@ -51,8 +51,8 @@ 
       'factor' => 1.5,
     ),
     P_UNIT_PRODUCTION => array(
-      RES_DEUTERIUM => function ($level, $production_factor, $user, $planet_row) {return  10 * $level * pow(1.1, $level) * (0.1 * $production_factor) * (-0.002 * $planet_row["temp_max"] + 1.28);},
-      RES_ENERGY    => function ($level, $production_factor, $user, $planet_row) {return -20 * $level * pow(1.1, $level) * (0.1 * $production_factor);},
+      RES_DEUTERIUM => function($level, $production_factor, $user, $planet_row) {return  10 * $level * pow(1.1, $level) * (0.1 * $production_factor) * (-0.002 * $planet_row["temp_max"] + 1.28); },
+      RES_ENERGY    => function($level, $production_factor, $user, $planet_row) {return -20 * $level * pow(1.1, $level) * (0.1 * $production_factor); },
     ),
     P_MINING_IS_MANAGED => true,
   ),
@@ -69,7 +69,7 @@ 
       'factor' => 1.5,
     ),
     P_UNIT_PRODUCTION => array(
-      RES_ENERGY    => function ($level, $production_factor, $user, $planet_row) {return ($planet_row["temp_max"] / 5 + 15) * $level * pow(1.1, $level) * (0.1 * $production_factor);},
+      RES_ENERGY    => function($level, $production_factor, $user, $planet_row) {return ($planet_row["temp_max"] / 5 + 15) * $level * pow(1.1, $level) * (0.1 * $production_factor); },
     ),
     P_MINING_IS_MANAGED => true,
   ),
@@ -87,8 +87,8 @@ 
       'factor' => 1.8,
     ),
     P_UNIT_PRODUCTION => array(
-      RES_DEUTERIUM => function ($level, $production_factor, $user, $planet_row) {return -10 * $level * pow(1.1, $level) * (0.1 * $production_factor);},
-      RES_ENERGY    => function ($level, $production_factor, $user, $planet_row) {return  30 * $level * pow(1.05 + 0.01 * mrc_get_level($user, null, TECH_ENERGY), $level) * (0.1 * $production_factor);},
+      RES_DEUTERIUM => function($level, $production_factor, $user, $planet_row) {return -10 * $level * pow(1.1, $level) * (0.1 * $production_factor); },
+      RES_ENERGY    => function($level, $production_factor, $user, $planet_row) {return  30 * $level * pow(1.05 + 0.01 * mrc_get_level($user, null, TECH_ENERGY), $level) * (0.1 * $production_factor); },
     ),
     P_MINING_IS_MANAGED => true,
   ),
@@ -105,7 +105,7 @@ 
       'factor' => 2,
     ),
     'storage' => array(
-      RES_METAL => function($level) {return BASE_STORAGE_SIZE * pow(1.5, $level);},
+      RES_METAL => function($level) {return BASE_STORAGE_SIZE * pow(1.5, $level); },
     ),
   ),
 
@@ -121,7 +121,7 @@ 
       'factor' => 2,
     ),
     'storage' => array(
-      RES_CRYSTAL => function($level) {return BASE_STORAGE_SIZE * pow(1.5, $level);},
+      RES_CRYSTAL => function($level) {return BASE_STORAGE_SIZE * pow(1.5, $level); },
     ),
   ),
 
@@ -137,7 +137,7 @@ 
       'factor' => 2,
     ),
     'storage' => array(
-      RES_DEUTERIUM => function($level) {return BASE_STORAGE_SIZE * pow(1.5, $level);},
+      RES_DEUTERIUM => function($level) {return BASE_STORAGE_SIZE * pow(1.5, $level); },
     ),
   ),
 

includes/includes/user_birthday_celebrate.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/pages/chat.php

Spacing +13 added lines, -13 removed lines

@@ -36,7 +36,7 @@ 
   $user_auth_level = isset($user['authlevel']) ? $user['authlevel'] : AUTH_LEVEL_ANONYMOUS;
 
   $mode = sys_get_param_int('mode');
-  switch($mode) {
+  switch ($mode) {
     case CHAT_MODE_ALLY:
       $template_result['ALLY'] = intval($user['ally_id']);
       $page_title = classLocale::$lang['chat_ally'];
@@ -49,12 +49,12 @@ 
   }
 
   $template_result['.']['smiles'] = array();
-  foreach($supernova->design['smiles'] as $auth_level => $replaces) {
-    if($auth_level > $user_auth_level) {
+  foreach ($supernova->design['smiles'] as $auth_level => $replaces) {
+    if ($auth_level > $user_auth_level) {
       continue;
     }
 
-    foreach($replaces as $bbcode => $filename) {
+    foreach ($replaces as $bbcode => $filename) {
       $template_result['.']['smiles'][] = array(
         'BBCODE'   => $bbcode,
         'FILENAME' => $filename,
@@ -77,11 +77,11 @@ 
   define('IN_AJAX', true);
   $skip_fleet_update = true;
 
-  if(classSupernova::$config->_MODE != CACHER_NO_CACHE && classSupernova::$config->chat_timeout && SN_TIME_MICRO - classSupernova::$config->array_get('users', $user['id'], 'chat_last_activity') > classSupernova::$config->chat_timeout) {
+  if (classSupernova::$config->_MODE != CACHER_NO_CACHE && classSupernova::$config->chat_timeout && SN_TIME_MICRO - classSupernova::$config->array_get('users', $user['id'], 'chat_last_activity') > classSupernova::$config->chat_timeout) {
     die();
   }
 
-  if(($message = sys_get_param_str('message')) && $user['username']) {
+  if (($message = sys_get_param_str('message')) && $user['username']) {
     $ally_id = sys_get_param('ally') && $user['ally_id'] ? $user['ally_id'] : 0;
     $nick = db_escape(player_nick_compact(player_nick_render_current_to_array($user, array('color' => true, 'icons' => true, 'ally' => !$ally_id))));
 
@@ -103,7 +103,7 @@ 
   $skip_fleet_update = true;
 
   $history = sys_get_param_str('history');
-  if(!$history) {
+  if (!$history) {
     classSupernova::$config->array_set('users', $user['id'], 'chat_last_refresh', SN_TIME_MICRO);
   }
 
@@ -111,7 +111,7 @@ 
   $last_message = '';
   $alliance = 0;
   $template_result['.']['chat'] = array();
-  if(!$history && classSupernova::$config->_MODE != CACHER_NO_CACHE && classSupernova::$config->chat_timeout && SN_TIME_MICRO - classSupernova::$config->array_get('users', $user['id'], 'chat_last_activity') > classSupernova::$config->chat_timeout) {
+  if (!$history && classSupernova::$config->_MODE != CACHER_NO_CACHE && classSupernova::$config->chat_timeout && SN_TIME_MICRO - classSupernova::$config->array_get('users', $user['id'], 'chat_last_activity') > classSupernova::$config->chat_timeout) {
     $result['disable'] = true;
     $template_result['.']['chat'][] = array(
       'TIME'    => date(FMT_DATE_TIME, htmlentities(SN_CLIENT_TIME_LOCAL, ENT_QUOTES, 'utf-8')),
@@ -124,11 +124,11 @@ 
 
     $where_add = '';
     $last_message = 0;
-    if($history) {
+    if ($history) {
       $rows = db_chat_message_count_by_ally($alliance);
       $page_count = ceil($rows['CNT'] / $page_limit);
 
-      for($i = 0; $i < $page_count; $i++) {
+      for ($i = 0; $i < $page_count; $i++) {
         $template_result['.']['page'][] = array(
           'NUMBER' => $i
         );
@@ -142,12 +142,12 @@ 
 
     $start_row = $page * $page_limit;
     $query = db_chat_message_get_page($alliance, $where_add, $start_row, $page_limit);
-    while($chat_row = db_fetch($query)) {
+    while ($chat_row = db_fetch($query)) {
       // Little magik here - to retain HTML codes from DB and stripping HTML codes from nick
       $chat_row['user'] = player_nick_render_to_html($chat_row['user']);
       $nick_stripped = htmlentities(strip_tags($chat_row['user']), ENT_QUOTES, 'utf-8');
       $nick = str_replace(strip_tags($chat_row['user']), $nick_stripped, $chat_row['user']);
-      if(!$history) {
+      if (!$history) {
         $nick = "<span style=\"cursor: pointer;\" onclick=\"addSmiley('({$nick_stripped})');\">{$nick}</span>";
       }
 
@@ -172,7 +172,7 @@ 
   $template = gettemplate('chat_messages', $template);
   $template->assign_recursive($template_result);
 
-  if($history) {
+  if ($history) {
     display($template, "{$classLocale['chat_history']} - {$classLocale[$alliance ? 'chat_ally' : 'chat_common']}", true, '', false, true);
   } else {
     $result['last_message'] = $last_message;

includes/classes/Player.php

Spacing +8 added lines, -8 removed lines

@@ -228,8 +228,8 @@ 
    * @return int|mixed
    */
   public function calcColonyMaxCount($astrotech = -1) {
-    if($astrotech == -1) {
-      if(!isset($this->_dbRow[UNIT_PLAYER_COLONIES_MAX])) {
+    if ($astrotech == -1) {
+      if (!isset($this->_dbRow[UNIT_PLAYER_COLONIES_MAX])) {
 
         $expeditions = get_player_max_expeditons($this->_dbRow);
         $astrotech = mrc_get_level($this->_dbRow, null, TECH_ASTROTECH);
@@ -302,7 +302,7 @@ 
 
 
   public function expeditionsMax() {
-    if($this->expeditionsMax === null) {
+    if ($this->expeditionsMax === null) {
       $this->expeditionsMax = get_player_max_expeditons($this->_dbRow);
     }
 
@@ -310,7 +310,7 @@ 
   }
 
   public function expeditionsFlying() {
-    if($this->expeditionsFlying === null) {
+    if ($this->expeditionsFlying === null) {
       $this->expeditionsFlying = FleetList::fleet_count_flying($this->_dbId, MT_EXPLORE);
     }
 
@@ -319,7 +319,7 @@ 
 
 
   public function fleetsMax() {
-    if($this->fleetMax === null) {
+    if ($this->fleetMax === null) {
       $this->fleetMax = GetMaxFleets($this->_dbRow);
     }
 
@@ -327,7 +327,7 @@ 
   }
 
   public function fleetsFlying() {
-    if($this->fleetFlying === null) {
+    if ($this->fleetFlying === null) {
       $this->fleetFlying = FleetList::fleet_count_flying($this->_dbId);
     }
 
@@ -336,7 +336,7 @@ 
 
 
   public function coloniesMax() {
-    if($this->coloniesMax === null) {
+    if ($this->coloniesMax === null) {
       $this->coloniesMax = get_player_max_colonies($this->_dbRow);
     }
 
@@ -344,7 +344,7 @@ 
   }
 
   public function coloniesCurrent() {
-    if($this->coloniesCurrent === null) {
+    if ($this->coloniesCurrent === null) {
       $this->coloniesCurrent = get_player_current_colonies($this->_dbRow);
     }
 

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'] == FLIGHT_ALLOWED) {
+  foreach ($planet_list as $planet_id => $planet_data) {
+    if ($planet_data['RESULT'] == FLIGHT_ALLOWED) {
       $planet_data['RESULT'] = flt_t_send_fleet($user, $planet_data['PLANET_DB_DATA'], $planetrow, $planet_data['FLEET'], MT_TRANSPORT);
     }
 
     $planet_data['MESSAGE'] = classLocale::$lang['fl_attack_error'][$planet_data['RESULT']];
 
     $template->assign_block_vars('results', $planet_data);
-    if(!empty($planet_data['FLEET']) && $planet_data['RESULT'] == FLIGHT_ALLOWED) {
-      foreach($planet_data['FLEET'] as $unit_id => $amount) {
+    if (!empty($planet_data['FLEET']) && $planet_data['RESULT'] == FLIGHT_ALLOWED) {
+      foreach ($planet_data['FLEET'] as $unit_id => $amount) {
         $template->assign_block_vars('results.units', array(
           'ID'     => $unit_id,
           'NAME'   => classLocale::$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']) : classLocale::$lang['flt_no_fuel'];
   $template->assign_block_vars('colonies', $planet_data);
 }

includes/includes/flt_functions.php

Spacing +78 added lines, -78 removed lines

@@ -1,14 +1,14 @@ 
 <?php
 
 function flt_fleet_speed($user, $fleet) {
-  if(!is_array($fleet)) {
+  if (!is_array($fleet)) {
     $fleet = array($fleet => 1);
   }
 
   $speeds = array();
-  if(!empty($fleet)) {
-    foreach($fleet as $ship_id => $amount) {
-      if($amount && in_array($ship_id, sn_get_groups(array('fleet', 'missile')))) {
+  if (!empty($fleet)) {
+    foreach ($fleet as $ship_id => $amount) {
+      if ($amount && in_array($ship_id, sn_get_groups(array('fleet', 'missile')))) {
         $single_ship_data = get_ship_data($ship_id, $user);
         $speeds[] = $single_ship_data['speed'];
       }
@@ -51,14 +51,14 @@ 
 
   $game_fleet_speed = flt_server_flight_speed_multiplier();
   $fleet_speed = flt_fleet_speed($user_row, $fleet_array);
-  if(!empty($fleet_array) && $fleet_speed && $game_fleet_speed) {
+  if (!empty($fleet_array) && $fleet_speed && $game_fleet_speed) {
     $speed_percent = $speed_percent ? max(min($speed_percent, 10), 1) : 10;
     $real_speed = $speed_percent * sqrt($fleet_speed);
 
     $duration = max(1, round((35000 / $speed_percent * sqrt($distance * 10 / $fleet_speed) + 10) / $game_fleet_speed));
 
-    foreach($fleet_array as $ship_id => $ship_count) {
-      if(!$ship_id || !$ship_count) {
+    foreach ($fleet_array as $ship_id => $ship_count) {
+      if (!$ship_id || !$ship_count) {
         continue;
       }
 
@@ -86,19 +86,19 @@ 
 function flt_bashing_check($user, $enemy, $planet_dst, $mission, $flight_duration, $fleet_group = 0) {
   $config_bashing_attacks = classSupernova::$config->fleet_bashing_attacks;
   $config_bashing_interval = classSupernova::$config->fleet_bashing_interval;
-  if(!$config_bashing_attacks) {
+  if (!$config_bashing_attacks) {
     // Bashing allowed - protection disabled
     return FLIGHT_ALLOWED;
   }
 
   $bashing_result = FLIGHT_MISSION_ATTACK_BASHING;
-  if($user['ally_id'] && $enemy['ally_id']) {
+  if ($user['ally_id'] && $enemy['ally_id']) {
     $relations = ali_relations($user['ally_id'], $enemy['ally_id']);
-    if(!empty($relations)) {
+    if (!empty($relations)) {
       $relations = $relations[$enemy['ally_id']];
-      switch($relations['alliance_diplomacy_relation']) {
+      switch ($relations['alliance_diplomacy_relation']) {
         case ALLY_DIPLOMACY_WAR:
-          if(SN_TIME_NOW - $relations['alliance_diplomacy_time'] <= classSupernova::$config->fleet_bashing_war_delay) {
+          if (SN_TIME_NOW - $relations['alliance_diplomacy_time'] <= classSupernova::$config->fleet_bashing_war_delay) {
             $bashing_result = FLIGHT_MISSION_ATTACK_BASHING_WAR_DELAY;
           } else {
             return FLIGHT_ALLOWED;
@@ -120,9 +120,9 @@ 
 
   // Retrieving flying fleets
   $objFleetsBashing = FleetList::dbGetFleetListBashing($user['id'], $planet_dst);
-  foreach($objFleetsBashing->_container as $fleetBashing) {
+  foreach ($objFleetsBashing->_container as $fleetBashing) {
     // Checking for ACS - each ACS count only once
-    if($fleetBashing->group_id) {
+    if ($fleetBashing->group_id) {
       $bashing_list["{$user['id']}_{$fleetBashing->group_id}"] = $fleetBashing->time_arrive_to_target;
     } else {
       $bashing_list[] = $fleetBashing->time_arrive_to_target;
@@ -130,12 +130,12 @@ 
   }
 
   // Check for joining to ACS - if there are already fleets in ACS no checks should be done
-  if($mission == MT_ACS && $bashing_list["{$user['id']}_{$fleet_group}"]) {
+  if ($mission == MT_ACS && $bashing_list["{$user['id']}_{$fleet_group}"]) {
     return FLIGHT_ALLOWED;
   }
 
   $query = db_bashing_list_get($user, $planet_dst, $time_limit);
-  while($bashing_row = db_fetch($query)) {
+  while ($bashing_row = db_fetch($query)) {
     $bashing_list[] = $bashing_row['bashing_time'];
   }
 
@@ -144,9 +144,9 @@ 
   $last_attack = 0;
   $wave = 0;
   $attack = 1;
-  foreach($bashing_list as &$bash_time) {
+  foreach ($bashing_list as &$bash_time) {
     $attack++;
-    if($bash_time - $last_attack > $config_bashing_interval || $attack > $config_bashing_attacks) {
+    if ($bash_time - $last_attack > $config_bashing_interval || $attack > $config_bashing_attacks) {
       $attack = 1;
       $wave++;
     }
@@ -163,16 +163,16 @@ 
   //TODO: try..catch
   global $user;
 
-  if($user['vacation']) {
+  if ($user['vacation']) {
     return $result = FLIGHT_PLAYER_VACATION_OWN;
   }
 
-  if(empty($fleet) || !is_array($fleet)) {
+  if (empty($fleet) || !is_array($fleet)) {
     return $result = FLIGHT_SHIPS_NO_SHIPS;
   }
 
   $sn_groups_mission = sn_get_groups('missions');
-  if(!isset($sn_groups_mission[$mission])) {
+  if (!isset($sn_groups_mission[$mission])) {
     return $result = FLIGHT_MISSION_UNKNOWN;
   }
   $sn_data_mission = $sn_groups_mission[$mission];
@@ -191,32 +191,32 @@ 
   $resources = 0;
   $ship_ids = sn_get_groups('fleet');
   $resource_ids = sn_get_groups('resources_loot');
-  foreach($fleet as $ship_id => $ship_count) {
+  foreach ($fleet as $ship_id => $ship_count) {
     $is_ship = in_array($ship_id, $ship_ids);
     $is_resource = in_array($ship_id, $resource_ids);
-    if(!$is_ship && !$is_resource) {
+    if (!$is_ship && !$is_resource) {
       // TODO Спецобработчик для Капитана и модулей
 //      return FLIGHT_SHIPS_UNIT_WRONG;
     }
 
-    if($ship_count < 0) {
+    if ($ship_count < 0) {
       return $result = $is_ship ? FLIGHT_SHIPS_NEGATIVE : FLIGHT_RESOURCES_NEGATIVE;
     }
 
-    if($ship_count > mrc_get_level($user, $planet_src, $ship_id)) {
+    if ($ship_count > mrc_get_level($user, $planet_src, $ship_id)) {
       // TODO FLIGHT_MISSION_MISSILE_NO_MISSILES
       return $result = $is_ship ? FLIGHT_SHIPS_NOT_ENOUGH_OR_RESOURCES : FLIGHT_RESOURCES_NOT_ENOUGH;
     }
 
-    if($is_ship) {
+    if ($is_ship) {
       $single_ship_data = get_ship_data($ship_id, $user);
-      if($single_ship_data[P_SPEED] <= 0) {
+      if ($single_ship_data[P_SPEED] <= 0) {
         return $result = FLIGHT_SHIPS_UNMOVABLE;
       }
       $ships += $ship_count;
       $recyclers += in_array($ship_id, sn_get_groups('flt_recyclers')) ? $ship_count : 0;
       $spies += $ship_id == SHIP_SPY ? $ship_count : 0;
-    } elseif($is_resource) {
+    } elseif ($is_resource) {
       $resources += $ship_count;
     }
   }
@@ -227,7 +227,7 @@ 
     }
   */
 
-  if(isset($options['resources']) && $options['resources'] > 0 && !(isset($sn_data_mission['transport']) && $sn_data_mission['transport'])) {
+  if (isset($options['resources']) && $options['resources'] > 0 && !(isset($sn_data_mission['transport']) && $sn_data_mission['transport'])) {
     return $result = FLIGHT_RESOURCES_FORBIDDEN;
   }
 
@@ -239,78 +239,78 @@ 
   */
 
   $speed = $options['fleet_speed_percent'];
-  if($speed && ($speed != intval($speed) || $speed < 1 || $speed > 10)) {
+  if ($speed && ($speed != intval($speed) || $speed < 1 || $speed > 10)) {
     return $result = FLIGHT_FLEET_SPEED_WRONG;
   }
 
   $travel_data = flt_travel_data($user, $planet_src, $planet_dst, $fleet, $options['fleet_speed_percent']);
 
 
-  if(mrc_get_level($user, $planet_src, RES_DEUTERIUM) < $fleet[RES_DEUTERIUM] + $travel_data['consumption']) {
+  if (mrc_get_level($user, $planet_src, RES_DEUTERIUM) < $fleet[RES_DEUTERIUM] + $travel_data['consumption']) {
     return $result = FLIGHT_RESOURCES_FUEL_NOT_ENOUGH;
   }
 
-  if($travel_data['consumption'] > $travel_data['capacity']) {
+  if ($travel_data['consumption'] > $travel_data['capacity']) {
     return $result = FLIGHT_FLEET_TOO_FAR;
   }
 
-  if($travel_data['hold'] < $resources) {
+  if ($travel_data['hold'] < $resources) {
     return $result = FLIGHT_FLEET_OVERLOAD;
   }
 
   $fleet_start_time = SN_TIME_NOW + $travel_data['duration'];
 
   $fleet_group = $options['fleet_group'];
-  if($fleet_group) {
-    if($mission != MT_ACS) {
+  if ($fleet_group) {
+    if ($mission != MT_ACS) {
       return $result = FLIGHT_MISSION_IMPOSSIBLE;
     };
 
     $acs = db_acs_get_by_group_id($fleet_group);
-    if(!$acs['id']) {
+    if (!$acs['id']) {
       return $result = FLIGHT_MISSION_ACS_NOT_EXISTS;
     }
 
-    if($planet_dst['galaxy'] != $acs['galaxy'] || $planet_dst['system'] != $acs['system'] || $planet_dst['planet'] != $acs['planet'] || $planet_dst['planet_type'] != $acs['planet_type']) {
+    if ($planet_dst['galaxy'] != $acs['galaxy'] || $planet_dst['system'] != $acs['system'] || $planet_dst['planet'] != $acs['planet'] || $planet_dst['planet_type'] != $acs['planet_type']) {
       return $result = FLIGHT_MISSION_ACS_WRONG_TARGET;
     }
 
-    if($fleet_start_time > $acs['ankunft']) {
+    if ($fleet_start_time > $acs['ankunft']) {
       return $result = FLIGHT_MISSION_ACS_TOO_LATE;
     }
   }
 
   $flying_fleets = $options['flying_fleets'];
-  if(!$flying_fleets) {
+  if (!$flying_fleets) {
     $flying_fleets = FleetList::fleet_count_flying($user['id']);
   }
-  if(GetMaxFleets($user) <= $flying_fleets && $mission != MT_MISSILE) {
+  if (GetMaxFleets($user) <= $flying_fleets && $mission != MT_MISSILE) {
     return $result = FLIGHT_FLEET_NO_SLOTS;
   }
 
   // В одиночку шпионские зонды могут летать только в миссии Шпионаж, Передислокация и Транспорт
-  if($ships && $spies && $spies == $ships && !($mission == MT_SPY || $mission == MT_RELOCATE || $mission == MT_TRANSPORT)) {
+  if ($ships && $spies && $spies == $ships && !($mission == MT_SPY || $mission == MT_RELOCATE || $mission == MT_TRANSPORT)) {
     return $result = FLIGHT_SHIPS_NOT_ONLY_SPIES;
   }
 
   // Checking for no planet
-  if(!$planet_dst['id_owner']) {
-    if($mission == MT_COLONIZE && !$fleet[SHIP_COLONIZER]) {
+  if (!$planet_dst['id_owner']) {
+    if ($mission == MT_COLONIZE && !$fleet[SHIP_COLONIZER]) {
       return $result = FLIGHT_SHIPS_NO_COLONIZER;
     }
 
-    if($mission == MT_EXPLORE || $mission == MT_COLONIZE) {
+    if ($mission == MT_EXPLORE || $mission == MT_COLONIZE) {
       return $result = FLIGHT_ALLOWED;
     }
 
     return $result = FLIGHT_VECTOR_NO_TARGET;
   }
 
-  if($mission == MT_RECYCLE) {
-    if($planet_dst['debris_metal'] + $planet_dst['debris_crystal'] <= 0) {
+  if ($mission == MT_RECYCLE) {
+    if ($planet_dst['debris_metal'] + $planet_dst['debris_crystal'] <= 0) {
       return $result = FLIGHT_MISSION_RECYCLE_NO_DEBRIS;
     }
-    if($recyclers <= 0) {
+    if ($recyclers <= 0) {
       return $result = FLIGHT_SHIPS_NO_RECYCLERS;
     }
 
@@ -318,8 +318,8 @@ 
   }
 
   // Got planet. Checking if it is ours
-  if($planet_dst['id_owner'] == $user['id']) {
-    if($mission == MT_TRANSPORT || $mission == MT_RELOCATE) {
+  if ($planet_dst['id_owner'] == $user['id']) {
+    if ($mission == MT_TRANSPORT || $mission == MT_RELOCATE) {
       return $result = FLIGHT_ALLOWED;
     }
 
@@ -327,19 +327,19 @@ 
   }
 
   // No, planet not ours. Cutting mission that can't be send to not-ours planet
-  if($mission == MT_RELOCATE || $mission == MT_COLONIZE || $mission == MT_EXPLORE) {
+  if ($mission == MT_RELOCATE || $mission == MT_COLONIZE || $mission == MT_EXPLORE) {
     return $result = FLIGHT_MISSION_IMPOSSIBLE;
   }
 
   $enemy = db_user_by_id($planet_dst['id_owner']);
   // We cannot attack or send resource to users in VACATION mode
-  if($enemy['vacation'] && $mission != MT_RECYCLE) {
+  if ($enemy['vacation'] && $mission != MT_RECYCLE) {
     return $result = FLIGHT_PLAYER_VACATION;
   }
 
   // Multi IP protection
   // TODO: Here we need a procedure to check proxies
-  if(sys_is_multiaccount($user, $enemy)) {
+  if (sys_is_multiaccount($user, $enemy)) {
     return $result = FLIGHT_PLAYER_SAME_IP;
   }
 
@@ -347,8 +347,8 @@ 
   $enemy_points = $enemy['total_points'];
 
   // Is it transport? If yes - checking for buffing to prevent mega-alliance destroyer
-  if($mission == MT_TRANSPORT) {
-    if($user_points >= $enemy_points || classSupernova::$config->allow_buffing) {
+  if ($mission == MT_TRANSPORT) {
+    if ($user_points >= $enemy_points || classSupernova::$config->allow_buffing) {
       return $result = FLIGHT_ALLOWED;
     } else {
       return $result = FLIGHT_PLAYER_BUFFING;
@@ -358,66 +358,66 @@ 
   // Only aggresive missions passed to this point. HOLD counts as passive but aggresive
 
   // Is it admin with planet protection?
-  if($planet_dst['id_level'] > $user['authlevel']) {
+  if ($planet_dst['id_level'] > $user['authlevel']) {
     return $result = FLIGHT_PLAYER_ADMIN;
   }
 
   // Okay. Now skipping protection checks for inactive longer then 1 week
-  if(!$enemy['onlinetime'] || $enemy['onlinetime'] >= (SN_TIME_NOW - 60 * 60 * 24 * 7)) {
-    if(
+  if (!$enemy['onlinetime'] || $enemy['onlinetime'] >= (SN_TIME_NOW - 60 * 60 * 24 * 7)) {
+    if (
       ($enemy_points <= classSupernova::$config->game_noob_points && $user_points > classSupernova::$config->game_noob_points)
       ||
       (classSupernova::$config->game_noob_factor && $user_points > $enemy_points * classSupernova::$config->game_noob_factor)
     ) {
-      if($mission != MT_HOLD) {
+      if ($mission != MT_HOLD) {
         return $result = FLIGHT_PLAYER_NOOB;
       }
-      if($mission == MT_HOLD && !($user['ally_id'] && $user['ally_id'] == $enemy['ally_id'] && classSupernova::$config->ally_help_weak)) {
+      if ($mission == MT_HOLD && !($user['ally_id'] && $user['ally_id'] == $enemy['ally_id'] && classSupernova::$config->ally_help_weak)) {
         return $result = FLIGHT_PLAYER_NOOB;
       }
     }
   }
 
   // Is it HOLD mission? If yes - there should be ally deposit
-  if($mission == MT_HOLD) {
-    if(mrc_get_level($user, $planet_dst, STRUC_ALLY_DEPOSIT)) {
+  if ($mission == MT_HOLD) {
+    if (mrc_get_level($user, $planet_dst, STRUC_ALLY_DEPOSIT)) {
       return $result = FLIGHT_ALLOWED;
     }
 
     return $result = FLIGHT_MISSION_HOLD_NO_ALLY_DEPOSIT;
   }
 
-  if($mission == MT_SPY) {
+  if ($mission == MT_SPY) {
     return $result = $spies >= 1 ? FLIGHT_ALLOWED : FLIGHT_MISSION_SPY_NO_SPIES;
   }
 
   // Is it MISSILE mission?
-  if($mission == MT_MISSILE) {
+  if ($mission == MT_MISSILE) {
     $sn_data_mip = get_unit_param(UNIT_DEF_MISSILE_INTERPLANET);
-    if(mrc_get_level($user, $planet_src, STRUC_SILO) < $sn_data_mip[P_REQUIRE][STRUC_SILO]) {
+    if (mrc_get_level($user, $planet_src, STRUC_SILO) < $sn_data_mip[P_REQUIRE][STRUC_SILO]) {
       return $result = FLIGHT_MISSION_MISSILE_NO_SILO;
     }
 
-    if(!$fleet[UNIT_DEF_MISSILE_INTERPLANET]) {
+    if (!$fleet[UNIT_DEF_MISSILE_INTERPLANET]) {
       return $result = FLIGHT_MISSION_MISSILE_NO_MISSILES;
     }
 
     $distance = abs($planet_dst['system'] - $planet_src['system']);
     $mip_range = flt_get_missile_range($user);
-    if($distance > $mip_range || $planet_dst['galaxy'] != $planet_src['galaxy']) {
+    if ($distance > $mip_range || $planet_dst['galaxy'] != $planet_src['galaxy']) {
       return $result = FLIGHT_MISSION_MISSILE_TOO_FAR;
     }
 
-    if(isset($options['target_structure']) && $options['target_structure'] && !in_array($options['target_structure'], sn_get_groups('defense_active'))) {
+    if (isset($options['target_structure']) && $options['target_structure'] && !in_array($options['target_structure'], sn_get_groups('defense_active'))) {
       return $result = FLIGHT_MISSION_MISSILE_WRONG_STRUCTURE;
     }
   }
 
-  if($mission == MT_DESTROY && $planet_dst['planet_type'] != PT_MOON) {
+  if ($mission == MT_DESTROY && $planet_dst['planet_type'] != PT_MOON) {
     return $result = FLIGHT_MISSION_IMPOSSIBLE;
   }
 
-  if($mission == MT_ATTACK || $mission == MT_ACS || $mission == MT_DESTROY) {
+  if ($mission == MT_ATTACK || $mission == MT_ACS || $mission == MT_DESTROY) {
     return $result = flt_bashing_check($user, $enemy, $planet_dst, $mission, $travel_data['duration'], $fleet_group);
   }
 
@@ -444,7 +444,7 @@ 
   $from = $from['planet'];
 
   $can_attack = flt_can_attack($from, $to, $fleet_REAL_array, $mission, $options);
-  if($can_attack != FLIGHT_ALLOWED) {
+  if ($can_attack != FLIGHT_ALLOWED) {
     $internal_transaction ? sn_db_transaction_rollback() : false;
 
     return $can_attack;
@@ -455,7 +455,7 @@ 
   $travel_data = flt_travel_data($user, $from, $to, $fleet_REAL_array, $options['fleet_speed_percent']);
 
   $time_on_mission = 0;
-  if($mission == MT_EXPLORE || $mission == MT_HOLD) {
+  if ($mission == MT_EXPLORE || $mission == MT_HOLD) {
     // TODO - include some checks about maximum and minumum stay_duration
     $time_on_mission = $options['stay_time'] * 3600;
   }
@@ -478,14 +478,14 @@ 
   $sn_group_resources_loot = sn_get_groups('resources_loot');
   $db_changeset = array();
   $planet_row_changed_fields = array();
-  foreach($fleet_REAL_array as $unit_id => $amount) {
-    if(!$amount || !$unit_id) {
+  foreach ($fleet_REAL_array as $unit_id => $amount) {
+    if (!$amount || !$unit_id) {
       continue;
     }
 
-    if(in_array($unit_id, $sn_group_fleet)) {
+    if (in_array($unit_id, $sn_group_fleet)) {
       $db_changeset['unit'][] = sn_db_unit_changeset_prepare($unit_id, -$amount, $user, $from['id']);
-    } elseif(in_array($unit_id, $sn_group_resources_loot)) {
+    } elseif (in_array($unit_id, $sn_group_resources_loot)) {
       $planet_row_changed_fields[pname_resource_name($unit_id)]['delta'] -= $amount;
     }
   }
@@ -524,16 +524,16 @@ 
 
   $ship_data = array();
   $fleet_array = array();
-  foreach($ship_list as $transport_id => $cork) {
+  foreach ($ship_list as $transport_id => $cork) {
     $ship_data[$transport_id] = flt_travel_data($user, $from, $to, array($transport_id => 1), 10);
   }
   uasort($ship_data, 'flt_calculate_ship_to_transport_sort');
 
   $fleet_capacity = 0;
   $fuel_total = $fuel_left = mrc_get_level($user, $from, RES_DEUTERIUM);
-  foreach($ship_data as $transport_id => &$ship_info) {
+  foreach ($ship_data as $transport_id => &$ship_info) {
     $ship_loaded = min($ship_list[$transport_id], ceil($resource_amount / $ship_info['hold']), floor($fuel_left / $ship_info['consumption']));
-    if($ship_loaded) {
+    if ($ship_loaded) {
       $fleet_array[$transport_id] = $ship_loaded;
       $resource_amount -= min($resource_amount, $ship_info['hold'] * $ship_loaded);
       $fuel_left -= $ship_info['consumption'] * $ship_loaded;

includes/functions/int_fleet_events.php

Spacing +11 added lines, -11 removed lines

@@ -6,26 +6,26 @@ 
   $fleet_events = array();
   $fleet_number = 0;
 
-  if($objFleetList->count() <= 0) {
+  if ($objFleetList->count() <= 0) {
     return;
   }
 
-  foreach($objFleetList->_container as $objFleet) {
+  foreach ($objFleetList->_container as $objFleet) {
     $planet_start_type = $objFleet->fleet_start_type == PT_MOON ? PT_MOON : PT_PLANET;
     $planet_start = db_planet_by_gspt($objFleet->fleet_start_galaxy, $objFleet->fleet_start_system, $objFleet->fleet_start_planet, $planet_start_type, false, 'name');
     $objFleet->fleet_start_name = $planet_start['name'];
 
     $planet_end_type = $objFleet->fleet_end_type == PT_MOON ? PT_MOON : PT_PLANET;
-    if($objFleet->fleet_end_planet > Vector::$knownPlanets) {
+    if ($objFleet->fleet_end_planet > Vector::$knownPlanets) {
       $objFleet->fleet_end_name = classLocale::$lang['ov_fleet_exploration'];
-    } elseif($objFleet->mission_type == MT_COLONIZE) {
+    } elseif ($objFleet->mission_type == MT_COLONIZE) {
       $objFleet->fleet_end_name = classLocale::$lang['ov_fleet_colonization'];
     } else {
       $planet_end = db_planet_by_gspt($objFleet->fleet_end_galaxy, $objFleet->fleet_end_system, $objFleet->fleet_end_planet, $planet_end_type, false, 'name');
       $objFleet->fleet_end_name = $planet_end['name'];
     }
 
-    if($objFleet->time_arrive_to_target > SN_TIME_NOW && !$objFleet->isReturning() && $objFleet->mission_type != MT_MISSILE &&
+    if ($objFleet->time_arrive_to_target > SN_TIME_NOW && !$objFleet->isReturning() && $objFleet->mission_type != MT_MISSILE &&
       ($planet_scanned === false
         ||
         (
@@ -39,11 +39,11 @@ 
       $fleet_events[] = flt_register_event_objFleet($objFleet, 0, $planet_end_type);
     }
 
-    if($objFleet->time_mission_job_complete > SN_TIME_NOW && !$objFleet->isReturning() && $planet_scanned === false && $objFleet->mission_type != MT_MISSILE) {
+    if ($objFleet->time_mission_job_complete > SN_TIME_NOW && !$objFleet->isReturning() && $planet_scanned === false && $objFleet->mission_type != MT_MISSILE) {
       $fleet_events[] = flt_register_event_objFleet($objFleet, 1, $planet_end_type);
     }
 
-    if(
+    if (
       $objFleet->time_return_to_source > SN_TIME_NOW && $objFleet->mission_type != MT_MISSILE && ($objFleet->isReturning() || ($objFleet->mission_type != MT_RELOCATE && $objFleet->mission_type != MT_COLONIZE)) &&
       (
         ($planet_scanned === false && $objFleet->playerOwnerId == $user['id'])
@@ -59,7 +59,7 @@ 
       $fleet_events[] = flt_register_event_objFleet($objFleet, 2, $planet_end_type);
     }
 
-    if($objFleet->mission_type == MT_MISSILE) {
+    if ($objFleet->mission_type == MT_MISSILE) {
       $fleet_events[] = flt_register_event_objFleet($objFleet, 3, $planet_end_type);
     }
   }
@@ -79,7 +79,7 @@ 
 
   $is_this_planet = false;
 
-  switch($objFleet->ov_label = $ov_label) {
+  switch ($objFleet->ov_label = $ov_label) {
     case 0:
       $objFleet->event_time = $objFleet->time_arrive_to_target;
       $is_this_planet = (
@@ -110,9 +110,9 @@ 
 
   }
 
-  $objFleet->ov_this_planet = $is_this_planet;// || $planet_scanned != false;
+  $objFleet->ov_this_planet = $is_this_planet; // || $planet_scanned != false;
 
-  if($objFleet->playerOwnerId == $user['id']) {
+  if ($objFleet->playerOwnerId == $user['id']) {
     $user_data = $user;
   } else {
     $user_data = db_user_by_id($objFleet->playerOwnerId);

ajax_version_check.php

Spacing +16 added lines, -16 removed lines

@@ -1,42 +1,42 @@ 
 <?php
 
-require_once('includes/init.' . substr(strrchr(__FILE__, '.'), 1));
+require_once('includes/init.'.substr(strrchr(__FILE__, '.'), 1));
 
 $mode = sys_get_param_int('mode');
 $ajax = sys_get_param_int('ajax');
 
-$url = 'http://supernova.ws/version_check.php?mode=' . $mode
-  . '&db=' . DB_VERSION
-  . '&release=' . SN_RELEASE
-  . '&version=' . SN_VERSION
-  . '&key=' . urlencode(classSupernova::$config->server_updater_key)
-  . '&id=' . urlencode(classSupernova::$config->server_updater_id);
+$url = 'http://supernova.ws/version_check.php?mode='.$mode
+  . '&db='.DB_VERSION
+  . '&release='.SN_RELEASE
+  . '&version='.SN_VERSION
+  . '&key='.urlencode(classSupernova::$config->server_updater_key)
+  . '&id='.urlencode(classSupernova::$config->server_updater_id);
 
-switch($mode) {
+switch ($mode) {
   case SNC_MODE_REGISTER:
-    if(classSupernova::$config->server_updater_key || classSupernova::$config->server_updater_id) {
-      if($ajax) {
+    if (classSupernova::$config->server_updater_key || classSupernova::$config->server_updater_id) {
+      if ($ajax) {
         print(SNC_VER_REGISTER_ERROR_REGISTERED);
       }
       die();
     }
-    $url .= "&name=" . urlencode(classSupernova::$config->game_name) . "&url=" . urlencode(SN_ROOT_VIRTUAL);
+    $url .= "&name=".urlencode(classSupernova::$config->game_name)."&url=".urlencode(SN_ROOT_VIRTUAL);
   break;
 }
 
 $check_result = sn_get_url_contents($url);
-if(!$check_result) {
+if (!$check_result) {
   $version_check = SNC_VER_ERROR_CONNECT;
-} elseif(($version_check = intval($check_result)) && $version_check == $check_result) {
+} elseif (($version_check = intval($check_result)) && $version_check == $check_result) {
   $version_check = $check_result;
 } else {
   // JSON decode if string
   $check_result = json_decode($check_result, true);
   $version_check = $check_result === null ? SNC_VER_UNKNOWN_RESPONSE : $check_result['version_check'];
 
-  switch($mode) {
+  switch ($mode) {
     case SNC_MODE_REGISTER:
-      if($check_result['site']['site_key'] && $check_result['site']['site_id'] && $check_result['site']['result'] == SNC_VER_REGISTER_REGISTERED) {
+      if ($check_result['site']['site_key'] && $check_result['site']['site_id'] && $check_result['site']['result'] == SNC_VER_REGISTER_REGISTERED) {
         classSupernova::$config->db_saveItem('server_updater_key', $check_result['site']['site_key']);
         classSupernova::$config->db_saveItem('server_updater_id', $check_result['site']['site_id']);
       }
@@ -49,7 +49,7 @@ 
 classSupernova::$config->db_saveItem('server_updater_check_last', SN_TIME_NOW);
 classSupernova::$config->db_saveItem('server_updater_check_result', $version_check);
 
-if($ajax) {
+if ($ajax) {
   define('IN_AJAX', true);
   print($version_check);
 }

metamatter.php

Spacing +42 added lines, -42 removed lines

@@ -4,9 +4,9 @@ 
 // Может добавить спецстатус "Ответ системы платежа" и парсить дальше getMessage
 // см constants.php
 
-include_once('common.' . substr(strrchr(__FILE__, '.'), 1));
+include_once('common.'.substr(strrchr(__FILE__, '.'), 1));
 
-if(!sn_module_get_active_count('payment')) {
+if (!sn_module_get_active_count('payment')) {
   sys_redirect('dark_matter.php');
   die();
 }
@@ -23,9 +23,9 @@ 
 
 // Таблица скидок
 $prev_discount = 0;
-if(isset(sn_module_payment::$bonus_table) && is_array(sn_module_payment::$bonus_table)) {
-  foreach(sn_module_payment::$bonus_table as $sum => $discount) {
-    if($discount && $discount != $prev_discount) {
+if (isset(sn_module_payment::$bonus_table) && is_array(sn_module_payment::$bonus_table)) {
+  foreach (sn_module_payment::$bonus_table as $sum => $discount) {
+    if ($discount && $discount != $prev_discount) {
       $template->assign_block_vars('discount', array(
         'SUM'          => $sum,
         'DISCOUNT'     => $discount * 100,
@@ -38,19 +38,19 @@ 
 }
 
 // Результат платежа
-if($payment_id = sys_get_param_id('payment_id')) {
+if ($payment_id = sys_get_param_id('payment_id')) {
   $payment = db_payment_get($payment_id);
-  if($payment && $payment['payment_user_id'] == $user['id']) {
-    if($payment['payment_status'] == PAYMENT_STATUS_COMPLETE) {
+  if ($payment && $payment['payment_user_id'] == $user['id']) {
+    if ($payment['payment_status'] == PAYMENT_STATUS_COMPLETE) {
       $template->assign_block_vars('result', array('MESSAGE' => sprintf(classLocale::$lang['pay_msg_mm_purchase_complete'], $payment['payment_dark_matter_paid'], $payment['payment_module_name'], $payment['payment_dark_matter_gained'])));
     }
-    if($payment['payment_status'] == PAYMENT_STATUS_NONE) {
+    if ($payment['payment_status'] == PAYMENT_STATUS_NONE) {
       $template->assign_block_vars('result', array(
         'MESSAGE' => sprintf(classLocale::$lang['pay_msg_mm_purchase_incomplete'], $payment['payment_dark_matter_paid'], $payment['payment_module_name']),
         'STATUS'  => 1,
       ));
     }
-    if($payment['payment_test']) {
+    if ($payment['payment_test']) {
       $template->assign_block_vars('result', array(
         'MESSAGE' => sprintf(classLocale::$lang['pay_msg_mm_purchase_test']),
         'STATUS'  => -1,
@@ -65,28 +65,28 @@ 
   'metamatter' => sys_get_param_float('metamatter'),
 );
 
-if(!$request['metamatter']) {
+if (!$request['metamatter']) {
   unset($_POST);
 }
 
 $payment_methods_available = array_combine(array_keys(sn_module_payment::$payment_methods), array_fill(0, count(sn_module_payment::$payment_methods), null));
-array_walk($payment_methods_available, function (&$value, $index) {
+array_walk($payment_methods_available, function(&$value, $index) {
   $value = !empty(sn_module_payment::$payment_methods[$index]) ? array_combine(array_keys(sn_module_payment::$payment_methods[$index]), array_fill(0, count(sn_module_payment::$payment_methods[$index]), null)) : $value;
 });
 
 // pdump($payment_methods_available);
 $payment_module_valid = false;
 $payment_module = sys_get_param_str('payment_module');
-foreach(sn_module::$sn_module_list['payment'] as $module_name => $module) {
-  if(!is_object($module) || !$module->manifest['active']) {
+foreach (sn_module::$sn_module_list['payment'] as $module_name => $module) {
+  if (!is_object($module) || !$module->manifest['active']) {
     continue;
   }
 
   lng_include($module_name, $module->manifest['root_relative']);
 
-  foreach(sn_module_payment::$payment_methods as $payment_type_id => $available_methods) {
-    foreach($available_methods as $payment_method => $payment_currency) {
-      if(isset($module->manifest['payment_method'][$payment_method])) {
+  foreach (sn_module_payment::$payment_methods as $payment_type_id => $available_methods) {
+    foreach ($available_methods as $payment_method => $payment_currency) {
+      if (isset($module->manifest['payment_method'][$payment_method])) {
         $payment_methods_available[$payment_type_id][$payment_method][$module_name] = $module->manifest['payment_method'][$payment_method];
       }
     }
@@ -97,8 +97,8 @@ 
 
 global $template_result;
 // Доступные платежные методы
-foreach($payment_methods_available as $payment_type_id => $payment_methods) {
-  if(empty($payment_methods)) {
+foreach ($payment_methods_available as $payment_type_id => $payment_methods) {
+  if (empty($payment_methods)) {
     continue;
   }
 
@@ -106,8 +106,8 @@ 
     'ID'   => $payment_type_id,
     'NAME' => classLocale::$lang['pay_methods'][$payment_type_id],
   );
-  foreach($payment_methods as $payment_method_id => $module_list) {
-    if(empty($module_list)) {
+  foreach ($payment_methods as $payment_method_id => $module_list) {
+    if (empty($module_list)) {
       continue;
     }
     $template_result['.']['payment'][$payment_type_id]['.']['method'][$payment_method_id] = array(
@@ -118,14 +118,14 @@ 
       'NAME_FORCE' => isset(sn_module_payment::$payment_methods[$payment_type_id][$payment_method_id]['name']),
       'BUTTON'     => isset(sn_module_payment::$payment_methods[$payment_type_id][$payment_method_id]['button']),
     );
-    foreach($module_list as $payment_module_name => $payment_module_method_details) {
+    foreach ($module_list as $payment_module_name => $payment_module_method_details) {
       $template_result['.']['payment'][$payment_type_id]['.']['method'][$payment_method_id]['.']['module'][] = array(
         'MODULE' => $payment_module_name,
       );
     }
   }
 
-  if(empty($template_result['.']['payment'][$payment_type_id]['.'])) {
+  if (empty($template_result['.']['payment'][$payment_type_id]['.'])) {
     unset($template_result['.']['payment'][$payment_type_id]);
   }
 }
@@ -138,19 +138,19 @@ 
 $payment_module_valid = $payment_module_valid && (!$payment_method_selected || isset($payment_methods_available[$payment_type_selected][$payment_method_selected][$module_name]));
 
 // If payment_module invalid - making it empty OR if there is only one payment_module - selecting it
-if($payment_module_valid) {
+if ($payment_module_valid) {
   // $payment_module = $payment_module; // Really - do nothing
-} elseif($payment_type_selected && count($payment_methods_available[$payment_type_selected][$payment_method_selected]) == 1) {
+} elseif ($payment_type_selected && count($payment_methods_available[$payment_type_selected][$payment_method_selected]) == 1) {
   reset($payment_methods_available[$payment_type_selected][$payment_method_selected]);
   $payment_module = key($payment_methods_available[$payment_type_selected][$payment_method_selected]);
-} elseif(count(sn_module::$sn_module_list['payment']) == 1) {
+} elseif (count(sn_module::$sn_module_list['payment']) == 1) {
   $payment_module = $module_name;
 } else {
   $payment_module = '';
 }
 
-if($payment_type_selected && $payment_method_selected) {
-  foreach($payment_methods_available[$payment_type_selected][$payment_method_selected] as $module_name => $temp) {
+if ($payment_type_selected && $payment_method_selected) {
+  foreach ($payment_methods_available[$payment_type_selected][$payment_method_selected] as $module_name => $temp) {
     $template->assign_block_vars('payment_module', array(
       'ID'          => $module_name,
       'NAME'        => classLocale::$lang["module_{$module_name}_name"],
@@ -159,9 +159,9 @@ 
   }
 }
 
-foreach(classLocale::$lang['pay_currency_list'] as $key => $value) {
+foreach (classLocale::$lang['pay_currency_list'] as $key => $value) {
   $course = get_exchange_rate($key);
-  if(!$course) {
+  if (!$course) {
     continue;
   }
   $template->assign_block_vars('exchange', array(
@@ -176,17 +176,17 @@ 
   ));
 }
 
-if($request['metamatter'] && $payment_module) {
+if ($request['metamatter'] && $payment_module) {
   try {
     // Any possible errors about generating paylink should be raised in module!
     $pay_link = sn_module::$sn_module[$payment_module]->compile_request($request);
 
     // Поддержка дополнительной информации
-    if(is_array($pay_link['RENDER'])) {
-      foreach($pay_link['RENDER'] as $html_data) {
+    if (is_array($pay_link['RENDER'])) {
+      foreach ($pay_link['RENDER'] as $html_data) {
         $template->assign_block_vars('render', $html_data);
-        if(isset($html_data['VALUE']) && is_array($html_data['VALUE'])) {
-          foreach($html_data['VALUE'] as $value_id => $value_value) {
+        if (isset($html_data['VALUE']) && is_array($html_data['VALUE'])) {
+          foreach ($html_data['VALUE'] as $value_id => $value_value) {
             $template->assign_block_vars('render.value', array(
               'FIELD' => $value_id,
               'VALUE' => $value_value,
@@ -197,8 +197,8 @@ 
     }
 
     // Поддержка передачи данных для многошаговых платежных систем
-    if(is_array($pay_link['DATA'])) {
-      foreach($pay_link['DATA'] as $key => $value) {
+    if (is_array($pay_link['DATA'])) {
+      foreach ($pay_link['DATA'] as $key => $value) {
         $template->assign_block_vars('pay_link_data', array(
           'FIELD' => $key,
           'VALUE' => $value,
@@ -206,7 +206,7 @@ 
       }
     }
 
-    if(is_array($pay_link) && in_array($pay_link['PAY_LINK_METHOD'], array('POST', 'GET', 'LINK', 'STEP'))) {
+    if (is_array($pay_link) && in_array($pay_link['PAY_LINK_METHOD'], array('POST', 'GET', 'LINK', 'STEP'))) {
       // TODO Переделать это под assign_vars_recursive и возвращать пустые строки если нет платежного метода - для унификации формы в темплейте
       $template->assign_vars(array(
         'PAY_LINK_METHOD' => $pay_link['PAY_LINK_METHOD'],
@@ -215,17 +215,17 @@ 
     } else {
       throw new exception(classLocale::$lang['pay_msg_request_paylink_unsupported'], ERR_ERROR);
     }
-  } catch(exception $e) {
+  } catch (exception $e) {
     $template->assign_block_vars('result', $response = array(
       'STATUS'  => $e->getCode(),
       'MESSAGE' => $e->getMessage(),
     ));
-    classSupernova::$debug->warning('Результат операции: код ' . $e->getCode() . ' сообщение "' . $e->getMessage() . '"', 'Ошибка платежа', LOG_INFO_PAYMENT);
+    classSupernova::$debug->warning('Результат операции: код '.$e->getCode().' сообщение "'.$e->getMessage().'"', 'Ошибка платежа', LOG_INFO_PAYMENT);
   }
 }
 
 // Прегенерированные пакеты
-foreach($unit_available_amount_list as $unit_amount => $discount) {
+foreach ($unit_available_amount_list as $unit_amount => $discount) {
   $temp = sn_module_payment::currency_convert($unit_amount, 'MM_', $player_currency);
   $template->assign_block_vars('mm_amount', array(
     'VALUE'            => $unit_amount,
@@ -260,7 +260,7 @@ 
   'PLAYER_CURRENCY'              => $player_currency,
   'PLAYER_CURRENCY_PRICE_PER_MM' => sn_module_payment::currency_convert(1, $player_currency, 'MM_', 10),
 
-  'UNIT_AMOUNT'                 => (float)$request['metamatter'],
+  'UNIT_AMOUNT'                 => (float) $request['metamatter'],
   'UNIT_AMOUNT_TEXT'            => pretty_number($request['metamatter']),
   'UNIT_AMOUNT_BONUS_PERCENT'   => $bonus_percent,
   'UNIT_AMOUNT_TEXT_DISCOUNTED' => $income_metamatter_text,