supernova-ws / SuperNova

includes/includes/user_birthday_celebrate.php

Spacing +1 added lines, -1 removed lines

@@ -8,7 +8,7 @@
 
   $query = db_user_list_to_celebrate($config->user_birthday_range);
 
-  while($row = db_fetch($query))
+  while ($row = db_fetch($query))
   {
     $row['username'] = db_escape($row['username']);
     rpg_points_change($row['id'], RPG_BIRTHDAY, $config->user_birthday_gift, "Birthday gift for user {$row['username']} ID {$row['id']} on his birthday on {$row['user_birthday']}. Gift last gaved at {$row['user_birthday_celebrated']}");

Braces +1 added lines, -2 removed lines

@@ -1,7 +1,6 @@
 <?php
 
-function sn_user_birthday_celebrate()
-{
+function sn_user_birthday_celebrate() {
   global $config, $lang;
 
   sn_db_transaction_start();

includes/includes/ube_zi_helpers.php

Spacing +4 added lines, -4 removed lines

@@ -27,9 +27,9 @@ 
   print($round);
   print('<table border=1>');
   print('<tr align="left">');
-  foreach($header as $key => $value)
+  foreach ($header as $key => $value)
   {
-    if(is_array($value))
+    if (is_array($value))
     {
       continue;
     }
@@ -61,9 +61,9 @@ 
   );
 
   print('<tr align="right">');
-  foreach($debug_unit_crossfire_result as $key => $value)
+  foreach ($debug_unit_crossfire_result as $key => $value)
   {
-    if(is_array($value))
+    if (is_array($value))
     {
       continue;
     }

Braces +3 added lines, -6 removed lines

@@ -1,7 +1,6 @@ 
 <?php
 
-function sn_ube_combat_helper_round_header($round)
-{
+function sn_ube_combat_helper_round_header($round) {
   $header = array(
     'ИД1',
     'ИД2',
@@ -40,13 +39,11 @@ 
   print('</tr>');
 }
 
-function sn_ube_combat_helper_round_footer($round = 0)
-{
+function sn_ube_combat_helper_round_footer($round = 0) {
   print('</table>');
 }
 
-function sn_ube_combat_helper_round_row(&$debug_unit_crossfire_result)
-{
+function sn_ube_combat_helper_round_row(&$debug_unit_crossfire_result) {
   $SN = array(
     SHIP_CARGO_SMALL => 'МаТр', SHIP_CARGO_BIG => 'БоТр', SHIP_CARGO_SUPER => 'СуТр', SHIP_CARGO_HYPER => 'ГпТр',
     SHIP_SATTELITE_SOLAR => 'СоСп', 

includes/includes/flt_mission_colonize.php

Spacing +4 added lines, -4 removed lines

@@ -17,12 +17,12 @@ 
 
   global $lang;
 
-  $TargetAdress = sprintf ($lang['sys_adress_planet'], $fleet_row['fleet_end_galaxy'], $fleet_row['fleet_end_system'], $fleet_row['fleet_end_planet']);
+  $TargetAdress = sprintf($lang['sys_adress_planet'], $fleet_row['fleet_end_galaxy'], $fleet_row['fleet_end_system'], $fleet_row['fleet_end_planet']);
 
   $fleet_array = sys_unit_str2arr($fleet_row['fleet_array']);
 
   $TheMessage = $lang['sys_colo_no_colonizer'];
-  if($fleet_array[SHIP_COLONIZER] >= 1)
+  if ($fleet_array[SHIP_COLONIZER] >= 1)
   {
     $TheMessage = $lang['sys_colo_notfree'];
     if (!$mission_data['dst_planet'] || empty($mission_data['dst_planet']))
@@ -31,7 +31,7 @@ 
 
       // Can we colonize more planets?
       $TheMessage = $lang['sys_colo_maxcolo'];
-      if($iPlanetCount < get_player_max_colonies($src_user_row))
+      if ($iPlanetCount < get_player_max_colonies($src_user_row))
       {
         // Yes, we can colonize
         $TheMessage = $lang['sys_colo_badpos'];
@@ -42,7 +42,7 @@ 
         if ($NewOwnerPlanet)
         {
           $TheMessage = $lang['sys_colo_arrival'] . $TargetAdress . $lang['sys_colo_allisok'];
-          msg_send_simple_message ( $fleet_row['fleet_owner'], '', $fleet_row['fleet_start_time'], MSG_TYPE_SPY, $lang['sys_colo_mess_from'], $lang['sys_colo_mess_report'], $TheMessage);
+          msg_send_simple_message($fleet_row['fleet_owner'], '', $fleet_row['fleet_start_time'], MSG_TYPE_SPY, $lang['sys_colo_mess_from'], $lang['sys_colo_mess_report'], $TheMessage);
 
           $fleet_array[SHIP_COLONIZER]--;
           $fleet_row['fleet_amount']--;

Braces +1 added lines, -2 removed lines

@@ -10,8 +10,7 @@
 // ----------------------------------------------------------------------------------------------------------------
 // Mission Case 9: -> Coloniser
 //
-function flt_mission_colonize(&$mission_data)
-{
+function flt_mission_colonize(&$mission_data) {
   $fleet_row          = &$mission_data['fleet'];
   $src_user_row       = &$mission_data['src_user'];
 

includes/includes/sys_avatar.php

Spacing +9 added lines, -9 removed lines

@@ -9,28 +9,28 @@ 
     $avatar_filename = $fullsize_filename = SN_ROOT_PHYSICAL . 'images/avatar/' . $prefix . '_' . $subject_id;
     $avatar_filename .= '.png';
     $fullsize_filename .= '_full.png';
-    if(sys_get_param_int('avatar_remove'))
+    if (sys_get_param_int('avatar_remove'))
     {
-      if(file_exists($avatar_filename) && !unlink($avatar_filename))
+      if (file_exists($avatar_filename) && !unlink($avatar_filename))
       {
         throw new Exception($lang['opt_msg_avatar_error_delete'], ERR_ERROR);
       }
       $avatar_field = 0;
       throw new Exception($lang['opt_msg_avatar_removed'], ERR_NONE);
     }
-    elseif($_FILES['avatar']['size'])
+    elseif ($_FILES['avatar']['size'])
     {
-      if(!in_array($_FILES['avatar']['type'], array('image/gif', 'image/jpeg', 'image/jpg', 'image/pjpeg', 'image/png')) || $_FILES['avatar']['size'] > 204800)
+      if (!in_array($_FILES['avatar']['type'], array('image/gif', 'image/jpeg', 'image/jpg', 'image/pjpeg', 'image/png')) || $_FILES['avatar']['size'] > 204800)
       {
         throw new Exception($lang['opt_msg_avatar_error_unsupported'], ERR_WARNING);
       }
 
-      if($_FILES['avatar']['error'])
+      if ($_FILES['avatar']['error'])
       {
         throw new Exception(sprintf($lang['opt_msg_avatar_error_upload'], $_FILES['avatar']['error']), ERR_ERROR);
       }
 
-      if(!($avatar_image = imagecreatefromstring(file_get_contents($_FILES['avatar']['tmp_name']))))
+      if (!($avatar_image = imagecreatefromstring(file_get_contents($_FILES['avatar']['tmp_name']))))
       {
         throw new Exception($lang['opt_msg_avatar_error_unsupported'], ERR_WARNING);
       }
@@ -38,7 +38,7 @@ 
       $avatar_size = getimagesize($_FILES['avatar']['tmp_name']);
       $avatar_max_width  = $config-> avatar_max_width;
       $avatar_max_height = $config-> avatar_max_height;
-      if($avatar_size[0] > $avatar_max_width || $avatar_size[1] > $avatar_max_height)
+      if ($avatar_size[0] > $avatar_max_width || $avatar_size[1] > $avatar_max_height)
       {
         $aspect_ratio = min($avatar_max_width / $avatar_size[0], $avatar_max_height / $avatar_size[1]);
         $avatar_image_new = imagecreatetruecolor($avatar_size[0] * $aspect_ratio, $avatar_size[0] * $aspect_ratio);
@@ -47,12 +47,12 @@ 
         $avatar_image = $avatar_image_new;
       }
 
-      if(file_exists($avatar_filename) && !unlink($avatar_filename))
+      if (file_exists($avatar_filename) && !unlink($avatar_filename))
       {
         throw new Exception($lang['opt_msg_avatar_error_delete'], ERR_ERROR);
       }
 
-      if(!imagepng($avatar_image, $avatar_filename, 9))
+      if (!imagepng($avatar_image, $avatar_filename, 9))
       {
         throw new Exception($lang['opt_msg_avatar_error_writing'], ERR_ERROR);
       }

Braces +3 added lines, -6 removed lines

@@ -1,7 +1,6 @@ 
 <?php
 
-function sys_avatar_upload($subject_id, &$avatar_field, $prefix = 'avatar')
-{
+function sys_avatar_upload($subject_id, &$avatar_field, $prefix = 'avatar') {
   global $config, $lang, $user;
 
   try
@@ -17,8 +16,7 @@ 
       }
       $avatar_field = 0;
       throw new Exception($lang['opt_msg_avatar_removed'], ERR_NONE);
-    }
-    elseif($_FILES['avatar']['size'])
+    } elseif($_FILES['avatar']['size'])
     {
       if(!in_array($_FILES['avatar']['type'], array('image/gif', 'image/jpeg', 'image/jpg', 'image/pjpeg', 'image/png')) || $_FILES['avatar']['size'] > 204800)
       {
@@ -61,8 +59,7 @@ 
       imagedestroy($avatar_image);
       throw new Exception($lang['opt_msg_avatar_uploaded'], ERR_NONE);
     }
-  }
-  catch (Exception $e)
+  } catch (Exception $e)
   {
     return array(
       'STATUS'  => in_array($e->getCode(), array(ERR_NONE, ERR_WARNING, ERR_ERROR)) ? $e->getCode() : ERR_ERROR,

includes/includes/flt_mission_attack.php

Spacing +3 added lines, -3 removed lines

@@ -7,7 +7,7 @@ 
 */
 
 
-function flt_planet_capture(&$fleet_row, &$combat_data) {return sn_function_call('flt_planet_capture', array(&$fleet_row, &$combat_data, &$result));}
+function flt_planet_capture(&$fleet_row, &$combat_data) {return sn_function_call('flt_planet_capture', array(&$fleet_row, &$combat_data, &$result)); }
 function sn_flt_planet_capture(&$fleet_row, &$combat_data, &$result) {
   return $result;
 }
@@ -17,11 +17,11 @@ 
   $destination_user = $mission_data['dst_user'];
   $destination_planet = $mission_data['dst_planet'];
 
-  if(!$fleet_row) {
+  if (!$fleet_row) {
     return null;
   }
 
-  if(
+  if (
     // Нет данных о планете назначения или её владельце
     empty($destination_user) || empty($destination_planet) || !is_array($destination_user) || !is_array($destination_planet)
     ||

includes/pages/battle_report.php

Spacing +1 added lines, -1 removed lines

@@ -15,7 +15,7 @@
 
   $combat_data = sn_ube_report_load(sys_get_param_str('cypher'));
 
-  if($combat_data != UBE_REPORT_NOT_FOUND) {
+  if ($combat_data != UBE_REPORT_NOT_FOUND) {
     sn_ube_report_generate($combat_data, $template_result);
     $template = gettemplate('ube_combat_report', $template);
     $template->assign_vars(array(

includes/pages/techtree.php

Spacing +2 added lines, -2 removed lines

@@ -14,14 +14,14 @@
   global $lang, $user, $planetrow;
 
   $tech_tree = array();
-  foreach(get_unit_param('techtree') as $unit_group_id => $unit_list)
+  foreach (get_unit_param('techtree') as $unit_group_id => $unit_list)
   {
     $tech_tree[] = array(
       'NAME' => $lang['tech'][$unit_group_id],
       'GROUP_ID' => $unit_group_id,
     );
 
-    foreach($unit_list as $unit_id)
+    foreach ($unit_list as $unit_id)
     {
       $sn_data_unit = get_unit_param($unit_id);
       $level_basic = $sn_data_unit[P_STACKABLE] ? 0 : mrc_get_level($user, $planetrow, $unit_id, false, true);

Braces +1 added lines, -2 removed lines

@@ -6,8 +6,7 @@
  * version 2.0 copyright (c) 2012 by Gorlum for http://supernova.ws
  */
 
-function sn_techtree_view($template = null)
-{
+function sn_techtree_view($template = null) {
   global $lang, $user, $planetrow;
 
   $tech_tree = array();

includes/pages/contact.php

Spacing +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
   $query = db_user_list("`authlevel` > 0 ORDER BY `authlevel` ASC");
 
   // while($row = db_fetch($query))
-  foreach($query as $row)
+  foreach ($query as $row)
   {
     $template_result['.']['contact'][] = array(
       'NAME'  => $row['username'],

Braces +1 added lines, -2 removed lines

@@ -4,8 +4,7 @@
  * List of authorities: admin, ops, moders
  */
 
-function sn_contact_view($template = null)
-{
+function sn_contact_view($template = null) {
   global $template_result, $lang;
 
   $template = gettemplate('contact', $template);

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, "", 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, "", 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); },
     ),
   ),