supernova-ws / SuperNova

includes/includes/flt_mission_hold.php

Spacing +1 added lines, -1 removed lines

@@ -2,7 +2,7 @@
 
 function flt_mission_hold(&$mission_data)
 {
-  if($mission_data['fleet']['fleet_end_stay'] < SN_TIME_NOW)
+  if ($mission_data['fleet']['fleet_end_stay'] < SN_TIME_NOW)
   {
     fleet_send_back($mission_data['fleet']);
     // doquery("UPDATE {{fleets}} SET `fleet_mess` = 1 WHERE `fleet_id` = '{$fleet_row['fleet_id']}' LIMIT 1;");

Braces +1 added lines, -2 removed lines

@@ -1,7 +1,6 @@
 <?php
 
-function flt_mission_hold(&$mission_data)
-{
+function flt_mission_hold(&$mission_data) {
   if($mission_data['fleet']['fleet_end_stay'] < SN_TIME_NOW)
   {
     fleet_send_back($mission_data['fleet']);

includes/includes/flt_mission_recycle.php

Braces +7 added lines, -14 removed lines

@@ -7,8 +7,7 @@ 
  * @copyright 2008 By Chlorel for XNova
  */
 
-function flt_mission_recycle(&$mission_data)
-{
+function flt_mission_recycle(&$mission_data) {
   $fleet_row          = &$mission_data['fleet'];
   $destination_planet = &$mission_data['dst_planet'];
 
@@ -37,8 +36,7 @@ 
       if(in_array($unit_id, sn_get_groups('flt_recyclers')))
       {
         $RecyclerCapacity += $capacity;
-      }
-      else
+      } else
       {
         $OtherFleetCapacity += $capacity;
       }
@@ -55,16 +53,14 @@ 
   {
     $RecycledGoods["metal"]   = $destination_planet["debris_metal"];
     $RecycledGoods["crystal"] = $destination_planet["debris_crystal"];
-  }
-  else
+  } else
   {
     if (($destination_planet["debris_metal"]   > $RecyclerCapacity / 2) AND
       ($destination_planet["debris_crystal"] > $RecyclerCapacity / 2))
       {
       $RecycledGoods["metal"]   = $RecyclerCapacity / 2;
       $RecycledGoods["crystal"] = $RecyclerCapacity / 2;
-    }
-    else
+    } else
     {
       if ($destination_planet["debris_metal"] > $destination_planet["debris_crystal"])
       {
@@ -72,20 +68,17 @@ 
         if ($destination_planet["debris_metal"] > ($RecyclerCapacity - $RecycledGoods["crystal"]))
         {
           $RecycledGoods["metal"] = $RecyclerCapacity - $RecycledGoods["crystal"];
-        }
-        else
+        } else
         {
           $RecycledGoods["metal"] = $destination_planet["debris_metal"];
         }
-      }
-      else
+      } else
       {
         $RecycledGoods["metal"] = $destination_planet["debris_metal"];
         if ($destination_planet["debris_crystal"] > ($RecyclerCapacity - $RecycledGoods["metal"]))
         {
           $RecycledGoods["crystal"] = $RecyclerCapacity - $RecycledGoods["metal"];
-        }
-        else
+        } else
         {
           $RecycledGoods["crystal"] = $destination_planet["debris_crystal"];
         }

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

@@ -58,7 +58,7 @@
   }
   else
   {
-    if (($destination_planet["debris_metal"]   > $RecyclerCapacity / 2) AND
+    if (($destination_planet["debris_metal"]   > $RecyclerCapacity / 2) and
       ($destination_planet["debris_crystal"] > $RecyclerCapacity / 2))
       {
       $RecycledGoods["metal"]   = $RecyclerCapacity / 2;

Spacing +10 added lines, -10 removed lines

@@ -12,12 +12,12 @@ 
   $fleet_row          = &$mission_data['fleet'];
   $destination_planet = &$mission_data['dst_planet'];
 
-  if(!$fleet_row)
+  if (!$fleet_row)
   {
     return CACHE_NOTHING;
   }
 
-  if(!isset($destination_planet['id']))
+  if (!isset($destination_planet['id']))
   {
     // doquery("UPDATE {{fleets}} SET `fleet_mess` = 1 WHERE `fleet_id` = {$fleet_row['fleet_id']} LIMIT 1;");
     fleet_send_back($mission_data['fleet']);
@@ -29,12 +29,12 @@ 
   $RecyclerCapacity    = 0;
   $OtherFleetCapacity  = 0;
   $fleet_array = sys_unit_str2arr($fleet_row['fleet_array']);
-  foreach($fleet_array as $unit_id => $unit_count)
+  foreach ($fleet_array as $unit_id => $unit_count)
   {
-    if(in_array($unit_id, sn_get_groups('fleet')))
+    if (in_array($unit_id, sn_get_groups('fleet')))
     {
       $capacity = get_unit_param($unit_id, P_CAPACITY) * $unit_count;
-      if(in_array($unit_id, sn_get_groups('flt_recyclers')))
+      if (in_array($unit_id, sn_get_groups('flt_recyclers')))
       {
         $RecyclerCapacity += $capacity;
       }
@@ -46,19 +46,19 @@ 
   }
 
   $IncomingFleetGoods = $fleet_row["fleet_resource_metal"] + $fleet_row["fleet_resource_crystal"] + $fleet_row["fleet_resource_deuterium"];
-  if($IncomingFleetGoods > $OtherFleetCapacity)
+  if ($IncomingFleetGoods > $OtherFleetCapacity)
   {
     $RecyclerCapacity -= ($IncomingFleetGoods - $OtherFleetCapacity);
   }
 
-  if(($destination_planet["debris_metal"] + $destination_planet["debris_crystal"]) <= $RecyclerCapacity)
+  if (($destination_planet["debris_metal"] + $destination_planet["debris_crystal"]) <= $RecyclerCapacity)
   {
     $RecycledGoods["metal"]   = $destination_planet["debris_metal"];
     $RecycledGoods["crystal"] = $destination_planet["debris_crystal"];
   }
   else
   {
-    if (($destination_planet["debris_metal"]   > $RecyclerCapacity / 2) AND
+    if (($destination_planet["debris_metal"] > $RecyclerCapacity / 2) AND
       ($destination_planet["debris_crystal"] > $RecyclerCapacity / 2))
       {
       $RecycledGoods["metal"]   = $RecyclerCapacity / 2;
@@ -92,7 +92,7 @@ 
       }
     }
   }
-  $NewCargo['Metal']     = $fleet_row["fleet_resource_metal"]   + $RecycledGoods["metal"];
+  $NewCargo['Metal']     = $fleet_row["fleet_resource_metal"] + $RecycledGoods["metal"];
   $NewCargo['Crystal']   = $fleet_row["fleet_resource_crystal"] + $RecycledGoods["crystal"];
   $NewCargo['Deuterium'] = $fleet_row["fleet_resource_deuterium"];
 
@@ -105,7 +105,7 @@ 
     HelperString::numberFloorAndFormat($RecycledGoods["metal"]), $lang['Metal'],
     HelperString::numberFloorAndFormat($RecycledGoods["crystal"]), $lang['Crystal']
   );
-  msg_send_simple_message ( $fleet_row['fleet_owner'], '', $fleet_row['fleet_start_time'], MSG_TYPE_RECYCLE, $lang['sys_mess_spy_control'], $lang['sys_recy_report'], $Message);
+  msg_send_simple_message($fleet_row['fleet_owner'], '', $fleet_row['fleet_start_time'], MSG_TYPE_RECYCLE, $lang['sys_mess_spy_control'], $lang['sys_recy_report'], $Message);
 
 //  $QryUpdateFleet  = "UPDATE {{fleets}} SET `fleet_mess` = 1,`fleet_resource_metal` = '{$NewCargo['Metal']}',`fleet_resource_crystal` = '{$NewCargo['Crystal']}',`fleet_resource_deuterium` = '{$NewCargo['Deuterium']}' ";
 //  $QryUpdateFleet .= "WHERE `fleet_id` = '{$fleet_row['fleet_id']}' LIMIT 1;";

includes/includes/flt_mission_explore.php

Spacing +37 added lines, -38 removed lines

@@ -14,11 +14,11 @@ 
 
   $fleet_left = 1 - mt_rand(1, 3) * mt_rand(200000, 300000) / 1000000;
   $fleet_lost = array();
-  foreach($fleet as $unit_id => &$unit_amount) {
+  foreach ($fleet as $unit_id => &$unit_amount) {
     $ships_left = floor($unit_amount * $fleet_left);
     $fleet_lost[$unit_id] = $unit_amount - $ships_left;
     $unit_amount = $ships_left;
-    if(!$unit_amount) {
+    if (!$unit_amount) {
       unset($fleet[$unit_id]);
     }
   }
@@ -31,14 +31,14 @@ 
 //  $fleet = array();
 }
 
-function flt_mission_explore_addon(&$result){return sn_function_call('flt_mission_explore_addon', array(&$result));}
+function flt_mission_explore_addon(&$result) {return sn_function_call('flt_mission_explore_addon', array(&$result)); }
 function sn_flt_mission_explore_addon(&$result) {
   return $result;
 }
 
 
 function flt_mission_explore(&$mission_data) {
-  if(!isset($mission_data['fleet_event']) || $mission_data['fleet_event'] != EVENT_FLT_ACOMPLISH) {
+  if (!isset($mission_data['fleet_event']) || $mission_data['fleet_event'] != EVENT_FLT_ACOMPLISH) {
     return CACHE_NONE;
   }
 
@@ -71,10 +71,10 @@ 
   $outcome_list = &$result['$outcome_list'];
   $fleet_metal_points = &$result['$fleet_metal_points'];
 
-  if(!$ship_data) {
-    foreach(sn_get_groups('fleet') as $unit_id) {
+  if (!$ship_data) {
+    foreach (sn_get_groups('fleet') as $unit_id) {
       $unit_info = get_unit_param($unit_id);
-      if($unit_info[P_UNIT_TYPE] != UNIT_SHIPS || !isset($unit_info['engine'][0]['speed']) || !$unit_info['engine'][0]['speed']) {
+      if ($unit_info[P_UNIT_TYPE] != UNIT_SHIPS || !isset($unit_info['engine'][0]['speed']) || !$unit_info['engine'][0]['speed']) {
         continue;
       }
       $ship_data[$unit_id][P_COST_METAL] = get_unit_cost_in($unit_info[P_COST]);
@@ -86,7 +86,7 @@ 
   $fleet = sys_unit_str2arr($fleet_row['fleet_array']);
   $fleet_capacity = 0;
   $fleet_metal_points = 0;
-  foreach($fleet as $ship_id => $ship_amount) {
+  foreach ($fleet as $ship_id => $ship_amount) {
     $unit_info = get_unit_param($ship_id);
     $fleet_capacity += $ship_amount * $unit_info[P_CAPACITY];
     $fleet_metal_points += $ship_amount * $ship_data[$ship_id][P_COST_METAL];
@@ -96,11 +96,11 @@ 
   $flt_stay_hours = ($fleet_row['fleet_end_stay'] - $fleet_row['fleet_start_time']) / 3600 * ($config->game_speed_expedition ? $config->game_speed_expedition : 1);
 
   $outcome_list = sn_get_groups('mission_explore_outcome_list');
-  $outcome_list[FLT_EXPEDITION_OUTCOME_NONE]['chance'] = ceil(200 / pow($flt_stay_hours, 1/1.7));
+  $outcome_list[FLT_EXPEDITION_OUTCOME_NONE]['chance'] = ceil(200 / pow($flt_stay_hours, 1 / 1.7));
 
   $chance_max = 0;
-  foreach($outcome_list as $key => &$value) {
-    if(!$value['chance']) {
+  foreach ($outcome_list as $key => &$value) {
+    if (!$value['chance']) {
       unset($outcome_list[$key]);
       continue;
     }
@@ -109,13 +109,13 @@ 
   $outcome_value = mt_rand(0, $chance_max);
 // $outcome_value = 409;
   $outcome_description = &$outcome_list[$mission_outcome = FLT_EXPEDITION_OUTCOME_NONE];
-  foreach($outcome_list as $key => &$value) {
-    if(!$value['chance']) {
+  foreach ($outcome_list as $key => &$value) {
+    if (!$value['chance']) {
       continue;
     }
     $mission_outcome = $key;
     $outcome_description = $value;
-    if($outcome_value <= $outcome_description['value']) {
+    if ($outcome_value <= $outcome_description['value']) {
       break;
     }
   }
@@ -131,7 +131,7 @@ 
   $found_dark_matter = 0;
 //  $outcome_mission_sub = -1;
 
-  switch($mission_outcome) {
+  switch ($mission_outcome) {
 //  switch(FLT_EXPEDITION_OUTCOME_LOST_FLEET) { // TODO DEBUG!
     case FLT_EXPEDITION_OUTCOME_LOST_FLEET:
       flt_mission_explore_outcome_lost_fleet($result);
@@ -166,14 +166,14 @@ 
 
       // Рассчитываем стоимость самого дорого корабля в металле
       $max_metal_cost = 0;
-      foreach($fleet as $ship_id => $ship_amount) {
+      foreach ($fleet as $ship_id => $ship_amount) {
         $max_metal_cost = max($max_metal_cost, $ship_data[$ship_id]['metal_cost']);
       }
 
       // Ограничиваем корабли только теми, чья стоимость в металле меньше или равно стоимости самого дорогого корабля
       $can_be_found = array();
-      foreach($ship_data as $ship_id => $ship_info) {
-        if($ship_info['metal_cost'] < $max_metal_cost) {
+      foreach ($ship_data as $ship_id => $ship_info) {
+        if ($ship_info['metal_cost'] < $max_metal_cost) {
           $can_be_found[$ship_id] = $ship_info['metal_cost'];
         }
       }
@@ -182,13 +182,13 @@ 
       unset($can_be_found[SHIP_SPY]);
 
       $fleet_found = array();
-      while(count($can_be_found) && $found_in_metal >= max($can_be_found)) {
+      while (count($can_be_found) && $found_in_metal >= max($can_be_found)) {
         $found_index = mt_rand(1, count($can_be_found)) - 1;
         $found_ship = array_slice($can_be_found, $found_index, 1, true);
         $found_ship_cost = reset($found_ship);
         $found_ship_id = key($found_ship);
 
-        if($found_ship_cost > $found_in_metal) {
+        if ($found_ship_cost > $found_in_metal) {
           unset($can_be_found[$found_ship_id]);
         } else {
           $found_ship_count = mt_rand(1, floor($found_in_metal / $found_ship_cost));
@@ -197,10 +197,10 @@ 
         }
       }
 
-      if(empty($fleet_found)) {
+      if (empty($fleet_found)) {
         $msg_text_addon = $lang['flt_mission_expedition']['outcomes'][$mission_outcome]['no_result'];
       } else {
-        foreach($fleet_found as $unit_id => $unit_amount) {
+        foreach ($fleet_found as $unit_id => $unit_amount) {
           $fleet[$unit_id] += $unit_amount;
         }
       }
@@ -226,7 +226,7 @@ 
       $fleet_row['fleet_resource_crystal'] += $resources_found[RES_CRYSTAL];
       $fleet_row['fleet_resource_deuterium'] += $resources_found[RES_DEUTERIUM];
 
-      if(array_sum($resources_found) == 0) {
+      if (array_sum($resources_found) == 0) {
         $msg_text_addon = $lang['flt_mission_expedition']['outcomes'][$mission_outcome]['no_result'];
       }
     break;
@@ -237,7 +237,7 @@ 
       // Рассчитываем количество найденной ТМ
       $found_dark_matter = floor(min($outcome_percent * $fleet_metal_points / $rates[RES_DARK_MATTER], 10000) * mt_rand(750000, 1000000) / 1000000);
 
-      if(!$found_dark_matter) {
+      if (!$found_dark_matter) {
         $msg_text_addon = $lang['flt_mission_expedition']['outcomes'][$mission_outcome]['no_result'];
       }
     break;
@@ -251,31 +251,31 @@ 
 
   flt_mission_explore_addon($result);
 
-  if($found_dark_matter) {
+  if ($found_dark_matter) {
     rpg_points_change($fleet_row['fleet_owner'], RPG_EXPEDITION, $found_dark_matter, 'Expedition Bonus');
     $msg_text_addon = sprintf($lang['flt_mission_expedition']['found_dark_matter'], $found_dark_matter);
   }
 
-  if(!empty($fleet_lost)) {
+  if (!empty($fleet_lost)) {
     $msg_text_addon = $lang['flt_mission_expedition']['lost_fleet'];
-    foreach($fleet_lost as $ship_id => $ship_amount) {
+    foreach ($fleet_lost as $ship_id => $ship_amount) {
       $msg_text_addon .= $lang['tech'][$ship_id] . ' - ' . $ship_amount . "\r\n";
     }
   }
 
   $fleet_row['fleet_amount'] = array_sum($fleet);
-  if(!empty($fleet) && $fleet_row['fleet_amount']) {
-    if(!empty($fleet_found)) {
+  if (!empty($fleet) && $fleet_row['fleet_amount']) {
+    if (!empty($fleet_found)) {
       $msg_text_addon = $lang['flt_mission_expedition']['found_fleet'];
-      foreach($fleet_found as $ship_id => $ship_amount) {
+      foreach ($fleet_found as $ship_id => $ship_amount) {
         $msg_text_addon .= $lang['tech'][$ship_id] . ' - ' . $ship_amount . "\r\n";
       }
     }
 
     $query_delta = array();
-    if(!empty($resources_found) && array_sum($resources_found) > 0) {
+    if (!empty($resources_found) && array_sum($resources_found) > 0) {
       $msg_text_addon = $lang['flt_mission_expedition']['found_resources'];
-      foreach($resources_found as $ship_id => $ship_amount) {
+      foreach ($resources_found as $ship_id => $ship_amount) {
         $msg_text_addon .= $lang['tech'][$ship_id] . ' - ' . $ship_amount . "\r\n";
       }
 
@@ -288,7 +288,7 @@ 
     }
 
     $query_data = array();
-    if(!empty($fleet_lost) || !empty($fleet_found)) {
+    if (!empty($fleet_lost) || !empty($fleet_found)) {
       $fleet_row['fleet_array'] = sys_unit_arr2str($fleet);
 
 //      $query_data[] = "`fleet_amount` = {$fleet_row['fleet_amount']}";
@@ -316,17 +316,16 @@ 
 
   db_user_set_by_id($fleet_row['fleet_owner'], "`player_rpg_explore_xp` = `player_rpg_explore_xp` + 1");
 
-  if(!$msg_text) {
+  if (!$msg_text) {
     $messages = &$lang['flt_mission_expedition']['outcomes'][$mission_outcome]['messages'];
-    if($outcome_mission_sub >= 0 && is_array($messages)) {
+    if ($outcome_mission_sub >= 0 && is_array($messages)) {
       $messages = &$messages[$outcome_mission_sub];
     }
 
-    $msg_text = is_string($messages) ? $messages :
-      (is_array($messages) ? $messages[mt_rand(0, count($messages) - 1)] : '');
+    $msg_text = is_string($messages) ? $messages : (is_array($messages) ? $messages[mt_rand(0, count($messages) - 1)] : '');
   }
   $msg_text = sprintf($msg_text, $fleet_row['fleet_id'], uni_render_coordinates($fleet_row, 'fleet_end_')) .
-    ($msg_text_addon ? "\r\n" . $msg_text_addon: '');
+    ($msg_text_addon ? "\r\n" . $msg_text_addon : '');
 
   msg_send_simple_message($fleet_row['fleet_owner'], '', $fleet_row['fleet_end_stay'], MSG_TYPE_EXPLORE, $msg_sender, $msg_title, $msg_text);
 

includes/includes/flt_mission_relocate.php

Spacing +2 added lines, -2 removed lines

@@ -13,7 +13,7 @@ 
   $fleet_row          = &$mission_data['fleet'];
   $destination_planet = &$mission_data['dst_planet'];
 
-  if(!$destination_planet || !is_array($destination_planet) || $fleet_row['fleet_owner'] != $destination_planet['id_owner'])
+  if (!$destination_planet || !is_array($destination_planet) || $fleet_row['fleet_owner'] != $destination_planet['id_owner'])
   {
     // doquery("UPDATE {{fleets}} SET `fleet_mess` = 1 WHERE `fleet_id` = {$fleet_row['fleet_id']} LIMIT 1;");
     fleet_send_back($mission_data['fleet']);
@@ -26,7 +26,7 @@ 
       $mission_data['src_planet']['name'], uni_render_coordinates_href($fleet_row, 'fleet_start_', 3, ''), $destination_planet['name'], uni_render_coordinates_href($fleet_row, 'fleet_end_', 3, ''),
     $fleet_row['fleet_resource_metal'], $lang['Metal'], $fleet_row['fleet_resource_crystal'], $lang['Crystal'], $fleet_row['fleet_resource_deuterium'], $lang['Deuterium']) .
   '<br />' . $lang['sys_relocate_mess_user'];
-  foreach(sys_unit_str2arr($fleet_row['fleet_array']) as $ship_id => $ship_count)
+  foreach (sys_unit_str2arr($fleet_row['fleet_array']) as $ship_id => $ship_count)
   {
     $Message .= $lang['tech'][$ship_id] . ' - ' . $ship_count . '<br />';
   }

Braces +1 added lines, -2 removed lines

@@ -8,8 +8,7 @@
  * @version 1.1
  * @copyright 2008 by Chlorel for XNova
  */
-function flt_mission_relocate($mission_data)
-{
+function flt_mission_relocate($mission_data) {
   $fleet_row          = &$mission_data['fleet'];
   $destination_planet = &$mission_data['dst_planet'];
 

includes/includes/flt_mission_destroy.php

Spacing +1 added lines, -1 removed lines

@@ -8,7 +8,7 @@
 function flt_mission_destroy($mission_data) {
   $fleet_row = $mission_data['fleet'];
   $destination_planet = $mission_data['dst_planet'];
-  if(!$destination_planet || !is_array($destination_planet) || $destination_planet['planet_type'] != PT_MOON) {
+  if (!$destination_planet || !is_array($destination_planet) || $destination_planet['planet_type'] != PT_MOON) {
     fleet_send_back($fleet_row);
 
     return CACHE_FLEET;

includes/includes/upd_helpers.php

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

@@ -170,7 +170,7 @@
 
 function upd_db_unit_by_location($user_id = 0, $location_type, $location_id, $unit_snid = 0, $for_update = false, $fields = '*') {
   return db_fetch(upd_do_query(
-    "SELECT {$fields}
+    "select {$fields}
     FROM {{unit}}
     WHERE
       `unit_location_type` = {$location_type} AND `unit_location_id` = {$location_id} AND " . DBStaticUnit::db_unit_time_restrictions() .

Spacing +38 added lines, -38 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if(!defined('IN_UPDATE')) {
+if (!defined('IN_UPDATE')) {
   die('Trying to call update helpers externally!');
 }
 
@@ -8,12 +8,12 @@ 
   global $update_tables;
 
   upd_add_more_time();
-  if(!$no_log) {
+  if (!$no_log) {
     upd_log_message("Performing query '{$query}'");
   }
 
-  if(strpos($query, '{{') !== false) {
-    foreach($update_tables as $tableName => $cork) {
+  if (strpos($query, '{{') !== false) {
+    foreach ($update_tables as $tableName => $cork) {
       $query = str_replace("{{{$tableName}}}", classSupernova::$db->db_prefix . $tableName, $query);
     }
   }
@@ -25,9 +25,9 @@ 
   global $config, $sys_log_disabled;
 
   $config->db_loadItem($key);
-  if($condition || !isset($config->$key)) {
+  if ($condition || !isset($config->$key)) {
     upd_add_more_time();
-    if(!$sys_log_disabled) {
+    if (!$sys_log_disabled) {
       upd_log_message("Updating config key '{$key}' with value '{$default_value}'");
     }
     $config->db_saveItem($key, $default_value);
@@ -55,7 +55,7 @@ 
 function upd_log_message($message) {
   global $sys_log_disabled, $upd_log, $debug;
 
-  if($sys_log_disabled)
+  if ($sys_log_disabled)
   {
 //    print("{$message}<br />");
   } else {
@@ -67,15 +67,15 @@ 
 function upd_unset_table_info($table_name) {
   global $update_tables, $update_indexes, $update_foreigns;
 
-  if(isset($update_tables[$table_name])) {
+  if (isset($update_tables[$table_name])) {
     unset($update_tables[$table_name]);
   }
 
-  if(isset($update_indexes[$table_name])) {
+  if (isset($update_indexes[$table_name])) {
     unset($update_indexes[$table_name]);
   }
 
-  if(isset($update_foreigns[$table_name])) {
+  if (isset($update_foreigns[$table_name])) {
     unset($update_foreigns[$table_name]);
   }
 }
@@ -89,18 +89,18 @@ 
   upd_unset_table_info($tableName);
 
   $q1 = upd_do_query("SHOW FULL COLUMNS FROM {$prefix_table_name};", true);
-  while($r1 = db_fetch($q1)) {
+  while ($r1 = db_fetch($q1)) {
     $update_tables[$tableName][$r1['Field']] = $r1;
   }
 
   $q1 = upd_do_query("SHOW INDEX FROM {$prefix_table_name};", true);
-  while($r1 = db_fetch($q1)) {
+  while ($r1 = db_fetch($q1)) {
     $update_indexes[$tableName][$r1['Key_name']] .= "{$r1['Column_name']},";
     $update_indexes_full[$tableName][$r1['Key_name']][$r1['Column_name']] = $r1;
   }
 
-  $q1 = upd_do_query("SELECT * FROM `information_schema`.`KEY_COLUMN_USAGE` WHERE `TABLE_SCHEMA` = '" . db_escape(classSupernova::$db_name). "' AND TABLE_NAME = '{$prefix_table_name}' AND REFERENCED_TABLE_NAME is not null;", true);
-  while($r1 = db_fetch($q1)) {
+  $q1 = upd_do_query("SELECT * FROM `information_schema`.`KEY_COLUMN_USAGE` WHERE `TABLE_SCHEMA` = '" . db_escape(classSupernova::$db_name) . "' AND TABLE_NAME = '{$prefix_table_name}' AND REFERENCED_TABLE_NAME is not null;", true);
+  while ($r1 = db_fetch($q1)) {
     $table_referenced = str_replace($config->db_prefix, '', $r1['REFERENCED_TABLE_NAME']);
 
     $update_foreigns[$tableName][$r1['CONSTRAINT_NAME']] .= "{$r1['COLUMN_NAME']},{$table_referenced},{$r1['REFERENCED_COLUMN_NAME']};";
@@ -110,7 +110,7 @@ 
 function upd_alter_table($table, $alters, $condition = true) {
   global $config, $update_tables;
 
-  if(!$condition) {
+  if (!$condition) {
     return;
   }
 
@@ -118,7 +118,7 @@ 
   $alters_print = is_array($alters) ? dump($alters) : $alters;
   upd_log_message("Altering table '{$table}' with alterations {$alters_print}");
 
-  if(!is_array($alters)) {
+  if (!is_array($alters)) {
     $alters = array($alters);
   }
 
@@ -128,7 +128,7 @@ 
 
   $result = upd_do_query($qry);
   $error = db_error();
-  if($error) {
+  if ($error) {
     die("Altering error for table `{$table}`: {$error}<br />{$alters_print}");
   }
 
@@ -155,19 +155,19 @@ 
 function upd_create_table($table_name, $declaration, $tableOptions = '') {
   global $config, $update_tables;
 
-  if(!$update_tables[$table_name]) {
+  if (!$update_tables[$table_name]) {
     upd_do_query('set foreign_key_checks = 0;', true);
     $declaration = trim($declaration);
-    if(substr($declaration, 0, 1) != '(') {
+    if (substr($declaration, 0, 1) != '(') {
       $declaration = "($declaration)";
     }
     $tableOptions = trim($tableOptions);
-    if(!empty($tableOptions)) {
+    if (!empty($tableOptions)) {
       $declaration .= $tableOptions;
     }
     $result = upd_do_query("CREATE TABLE IF NOT EXISTS `{$config->db_prefix}{$table_name}` {$declaration}");
     $error = db_error();
-    if($error) {
+    if ($error) {
       die("Creating error for table `{$table_name}`: {$error}<br />" . dump($declaration));
     }
     upd_do_query('set foreign_key_checks = 1;', true);
@@ -193,14 +193,14 @@ 
 
 
 function upd_db_unit_changeset_prepare($unit_id, $unit_value, $user, $planet_id = null) {
-  if(!is_array($user)) {
+  if (!is_array($user)) {
     // TODO - remove later
     print('<h1>СООБЩИТЕ ЭТО АДМИНУ: upd_db_unit_changeset_prepare() - USER is not ARRAY</h1>');
     pdump(debug_backtrace());
     die('USER is not ARRAY');
   }
 
-  if(!isset($user['id']) || !$user['id']) {
+  if (!isset($user['id']) || !$user['id']) {
     // TODO - remove later
     print('<h1>СООБЩИТЕ ЭТО АДМИНУ: upd_db_unit_changeset_prepare() - USER[id] пустой</h1>');
     pdump($user);
@@ -215,7 +215,7 @@ 
 
   $db_changeset = array();
   $temp = upd_db_unit_by_location($user['id'], $unit_location, $location_id, $unit_id, true, 'unit_id');
-  if($temp['unit_id']) {
+  if ($temp['unit_id']) {
     // update
     $db_changeset = array(
       'action' => SQL_OP_UPDATE,
@@ -261,53 +261,53 @@ 
 
 
 function upd_db_changeset_apply($db_changeset) {
-  if(!is_array($db_changeset) || empty($db_changeset)) {
+  if (!is_array($db_changeset) || empty($db_changeset)) {
     return;
   }
 
-  foreach($db_changeset as $table_name => $table_data) {
-    foreach($table_data as $record_id => $conditions) {
+  foreach ($db_changeset as $table_name => $table_data) {
+    foreach ($table_data as $record_id => $conditions) {
       $where = '';
-      if(!empty($conditions['where'])) {
+      if (!empty($conditions['where'])) {
         $where = 'WHERE ' . implode(' AND ', $conditions['where']);
       }
 
       $fields = array();
-      if($conditions['fields']) {
-        foreach($conditions['fields'] as $field_name => $field_data) {
+      if ($conditions['fields']) {
+        foreach ($conditions['fields'] as $field_name => $field_data) {
           $condition = "`{$field_name}` = ";
           $value = '';
-          if($field_data['delta']) {
+          if ($field_data['delta']) {
             $value = "`{$field_name}`" . ($field_data['delta'] >= 0 ? '+' : '') . $field_data['delta'];
-          } elseif($field_data['set']) {
-            $value = (is_string($field_data['set']) ? "'{$field_data['set']}'": $field_data['set']);
+          } elseif ($field_data['set']) {
+            $value = (is_string($field_data['set']) ? "'{$field_data['set']}'" : $field_data['set']);
           }
-          if($value) {
+          if ($value) {
             $fields[] = $condition . $value;
           }
         }
       }
       $fields = implode(',', $fields);
 
-      switch($conditions['action']) {
+      switch ($conditions['action']) {
         case SQL_OP_DELETE:
           upd_do_query("DELETE FROM {{{$table_name}}} {$where}");
           break;
 
         case SQL_OP_UPDATE:
-          if($fields) {
+          if ($fields) {
             upd_do_query("UPDATE {{{$table_name}}} SET {$fields} {$where}");
           }
           break;
 
         case SQL_OP_INSERT:
-          if($fields) {
+          if ($fields) {
             upd_do_query("INSERT INTO {{{$table_name}}} SET {$fields}");
           }
           break;
 
         case SQL_OP_REPLACE:
-          if($fields) {
+          if ($fields) {
             upd_do_query("REPLACE INTO {{{$table_name}}} SET {$fields}");
           }
           break;

includes/includes/flt_mission_transport.php

Spacing +3 added lines, -3 removed lines

@@ -14,7 +14,7 @@ 
   $source_planet      = &$mission_data['src_planet'];
   $destination_planet = &$mission_data['dst_planet'];
 
-  if(!isset($destination_planet['id']) || !$destination_planet['id_owner'])
+  if (!isset($destination_planet['id']) || !$destination_planet['id_owner'])
   {
     // doquery("UPDATE {{fleets}} SET `fleet_mess` = 1 WHERE `fleet_id` = {$fleet_row['fleet_id']} LIMIT 1;");
     fleet_send_back($fleet_row);
@@ -27,10 +27,10 @@ 
     $destination_planet['name'], uni_render_coordinates_href($fleet_row, 'fleet_end_', 3, ''),
     $fleet_row['fleet_resource_metal'], $lang['Metal'],
     $fleet_row['fleet_resource_crystal'], $lang['Crystal'],
-    $fleet_row['fleet_resource_deuterium'], $lang['Deuterium'] );
+    $fleet_row['fleet_resource_deuterium'], $lang['Deuterium']);
   msg_send_simple_message($fleet_row['fleet_target_owner'], '', $fleet_row['fleet_start_time'], MSG_TYPE_TRANSPORT, $lang['sys_mess_tower'], $lang['sys_mess_transport'], $Message);
 
-  if($fleet_row['fleet_target_owner'] <> $fleet_row['fleet_owner'])
+  if ($fleet_row['fleet_target_owner'] <> $fleet_row['fleet_owner'])
   {
     msg_send_simple_message($fleet_row['fleet_owner'], '', $fleet_row['fleet_start_time'], MSG_TYPE_TRANSPORT, $lang['sys_mess_tower'], $lang['sys_mess_transport'], $Message);
   }

Braces +1 added lines, -2 removed lines

@@ -8,8 +8,7 @@
  * @copyright 2008 By Chlorel for XNova
  */
 
-function flt_mission_transport(&$mission_data)
-{
+function flt_mission_transport(&$mission_data) {
   $fleet_row          = &$mission_data['fleet'];
   $source_planet      = &$mission_data['src_planet'];
   $destination_planet = &$mission_data['dst_planet'];

index.php

Spacing +3 added lines, -3 removed lines

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

classes/sn_module.php

Spacing +34 added lines, -34 removed lines

@@ -104,13 +104,13 @@ 
     // Trying to load configuration from file
     $config_exists = false;
     // Конфигурация может лежать в config_path в манифеста или в корне модуля
-    if(isset($this->manifest['config_path']) && file_exists($config_filename = $this->manifest['config_path'] . '/config.php')) {
+    if (isset($this->manifest['config_path']) && file_exists($config_filename = $this->manifest['config_path'] . '/config.php')) {
       $config_exists = true;
-    } elseif(file_exists($config_filename = dirname($filename) . '/config.php')) {
+    } elseif (file_exists($config_filename = dirname($filename) . '/config.php')) {
       $config_exists = true;
     }
 
-    if($config_exists) {
+    if ($config_exists) {
       include($config_filename);
       $module_config_array = $class_module_name . '_config';
       $this->config = $$module_config_array;
@@ -121,8 +121,8 @@ 
   }
 
   protected function __patch_menu(&$sn_menu_extra, &$menu_patch) {
-    if(isset($menu_patch) && is_array($menu_patch) && !empty($menu_patch)) {
-      foreach($menu_patch as $menu_item_name => $menu_item_data) {
+    if (isset($menu_patch) && is_array($menu_patch) && !empty($menu_patch)) {
+      foreach ($menu_patch as $menu_item_name => $menu_item_data) {
         $sn_menu_extra[$menu_item_name] = $menu_item_data;
       }
     }
@@ -132,13 +132,13 @@ 
   public function initialize() {
     // Checking module status - is it installed and active
     $this->check_status();
-    if(!$this->manifest['active']) {
+    if (!$this->manifest['active']) {
       return;
     }
 
     // Setting constants - if any
-    if(isset($this->manifest['constants']) && is_array($this->manifest['constants']) && !empty($this->manifest['constants'])) {
-      foreach($this->manifest['constants'] as $constant_name => $constant_value) {
+    if (isset($this->manifest['constants']) && is_array($this->manifest['constants']) && !empty($this->manifest['constants'])) {
+      foreach ($this->manifest['constants'] as $constant_name => $constant_value) {
         defined($constant_name) or define($constant_name, $constant_value);
       }
     }
@@ -149,34 +149,34 @@ 
     // New values from module variables will overwrite previous values (for root variables) and array elements with corresponding indexes (for arrays)
     // Constants as array indexes are honored - it's make valid such declarations as 'sn_data[ques][QUE_STRUCTURES]'
     $this->manifest['vars'] = $this->__assign_vars();
-    if(!empty($this->manifest['vars'])) {
+    if (!empty($this->manifest['vars'])) {
       $vars_assigned = array();
-      foreach($this->manifest['vars'] as $var_name => $var_value) {
+      foreach ($this->manifest['vars'] as $var_name => $var_value) {
         $sub_vars = explode('[', str_replace(']', '', $var_name));
         $var_name = $sub_vars[0];
 
-        if(!isset($vars_assigned[$var_name])) {
+        if (!isset($vars_assigned[$var_name])) {
           $vars_assigned[$var_name] = true;
           global $$var_name;
         }
 
         $pointer = &$$var_name;
-        if(($n = count($sub_vars)) > 1) {
-          for($i = 1; $i < $n; $i++) {
-            if(defined($sub_vars[$i])) {
+        if (($n = count($sub_vars)) > 1) {
+          for ($i = 1; $i < $n; $i++) {
+            if (defined($sub_vars[$i])) {
               $sub_vars[$i] = constant($sub_vars[$i]);
             }
 
-            if(!isset($pointer[$sub_vars[$i]]) && $i != $n) {
+            if (!isset($pointer[$sub_vars[$i]]) && $i != $n) {
               $pointer[$sub_vars[$i]] = array();
             }
             $pointer = &$pointer[$sub_vars[$i]];
           }
         }
 
-        if(!isset($pointer) || !is_array($pointer)) {
+        if (!isset($pointer) || !is_array($pointer)) {
           $pointer = $var_value;
-        } elseif(is_array($$var_name)) {
+        } elseif (is_array($$var_name)) {
           $pointer = array_merge_recursive_numeric($pointer, $var_value);
         }
       }
@@ -192,50 +192,50 @@ 
     isset($this->manifest['menu_admin']) and $this->__patch_menu($sn_menu_admin_extra, $this->manifest['menu_admin']);
 
     global $sn_mvc;
-    foreach($sn_mvc as $handler_type => &$handler_data) {
+    foreach ($sn_mvc as $handler_type => &$handler_data) {
       sn_sys_handler_add($handler_data, $this->manifest['mvc'][$handler_type], $this, $handler_type);
     }
 
-    if(isset($this->manifest['i18n']) && is_array($this->manifest['i18n']) && !empty($this->manifest['i18n'])) {
-      foreach($this->manifest['i18n'] as $i18n_page_name => &$i18n_file_list) {
-        foreach($i18n_file_list as &$i18n_file_data) {
-          if(is_array($i18n_file_data) && !$i18n_file_data['path']) {
+    if (isset($this->manifest['i18n']) && is_array($this->manifest['i18n']) && !empty($this->manifest['i18n'])) {
+      foreach ($this->manifest['i18n'] as $i18n_page_name => &$i18n_file_list) {
+        foreach ($i18n_file_list as &$i18n_file_data) {
+          if (is_array($i18n_file_data) && !$i18n_file_data['path']) {
             $i18n_file_data['path'] = $this->manifest['root_relative'];
           }
         }
-        if(!isset($sn_mvc['i18n'][$i18n_page_name])) {
+        if (!isset($sn_mvc['i18n'][$i18n_page_name])) {
           $sn_mvc['i18n'][$i18n_page_name] = array();
         }
         $sn_mvc['i18n'][$i18n_page_name] += $i18n_file_list;
       }
     }
 
-    if(!empty($this->manifest['javascript']) && is_array($this->manifest['javascript'])) {
-      foreach($this->manifest['javascript'] as $javascript_page_name => &$javascript_list) {
+    if (!empty($this->manifest['javascript']) && is_array($this->manifest['javascript'])) {
+      foreach ($this->manifest['javascript'] as $javascript_page_name => &$javascript_list) {
         !isset($sn_mvc['javascript'][$javascript_page_name]) ? $sn_mvc['javascript'][$javascript_page_name] = array() : false;
-        foreach($javascript_list as $script_name => &$script_content) {
+        foreach ($javascript_list as $script_name => &$script_content) {
           $sn_mvc['javascript'][$javascript_page_name][$script_name] = $script_content;
         }
       }
     }
 
-    if(!empty($this->manifest['css']) && is_array($this->manifest['css'])) {
-      foreach($this->manifest['css'] as $javascript_page_name => &$javascript_list) {
+    if (!empty($this->manifest['css']) && is_array($this->manifest['css'])) {
+      foreach ($this->manifest['css'] as $javascript_page_name => &$javascript_list) {
         !isset($sn_mvc['css'][$javascript_page_name]) ? $sn_mvc['css'][$javascript_page_name] = array() : false;
-        foreach($javascript_list as $script_name => &$script_content) {
+        foreach ($javascript_list as $script_name => &$script_content) {
           $sn_mvc['css'][$javascript_page_name][$script_name] = $script_content;
         }
       }
     }
 
-    if(!empty($this->manifest['navbar_prefix_button']) && is_array($this->manifest['navbar_prefix_button'])) {
-      foreach($this->manifest['navbar_prefix_button'] as $button_image => $button_url_relative) {
+    if (!empty($this->manifest['navbar_prefix_button']) && is_array($this->manifest['navbar_prefix_button'])) {
+      foreach ($this->manifest['navbar_prefix_button'] as $button_image => $button_url_relative) {
         $sn_mvc['navbar_prefix_button'][$button_image] = $button_url_relative;
       }
     }
 
-    if(!empty($this->manifest['navbar_main_button']) && is_array($this->manifest['navbar_main_button'])) {
-      foreach($this->manifest['navbar_main_button'] as $button_image => $button_url_relative) {
+    if (!empty($this->manifest['navbar_main_button']) && is_array($this->manifest['navbar_main_button'])) {
+      foreach ($this->manifest['navbar_main_button'] as $button_image => $button_url_relative) {
         $sn_mvc['navbar_main_button'][$button_image] = $button_url_relative;
       }
     }
@@ -251,7 +251,7 @@ 
    */
   protected function __mvcRegisterPagesOld($pages) {
     !is_array($this->manifest['mvc']['pages']) ? $this->manifest['mvc']['pages'] = array() : false;
-    if(is_array($pages) && !empty($pages)) {
+    if (is_array($pages) && !empty($pages)) {
       $this->manifest['mvc']['pages'] = array_merge($this->manifest['mvc']['pages'], $pages);
     }
   }