supernova-ws / SuperNova

includes/functions/sys_maintenance.php

Braces +2 added lines, -4 removed lines

@@ -1,7 +1,6 @@ 
 <?php
 
-function sys_maintenance()
-{
+function sys_maintenance() {
   global $config;
 
   $bashing_time_limit = SN_TIME_NOW - $config->fleet_bashing_scope;
@@ -42,8 +41,7 @@ 
  * TODO: 2. [<m|w|d|h|m|s>@]<time>
  */
 
-function sys_schedule_get_prev_run($scheduleList, $recorded_run = SN_TIME_NOW, $return_next_run = false)
-{
+function sys_schedule_get_prev_run($scheduleList, $recorded_run = SN_TIME_NOW, $return_next_run = false) {
   static $date_part_names_reverse = array('seconds', 'minutes', 'hours', 'days', 'months', 'years',);
 
   $possible_schedules = array();

Spacing +9 added lines, -9 removed lines

@@ -17,11 +17,11 @@ 
     array('query' => "DELETE FROM `{{planets}}` WHERE `id_owner` = 0 AND `destruyed` < UNIX_TIMESTAMP();", 'result' => false, 'error' => '', 'affected_rows' => 0),
   );
 
-  foreach($queries as &$query)
+  foreach ($queries as &$query)
   {
     $query['result'] = doquery($query['query']);
     $query['error']  = SN::$db->db_error();
-    $query['affected_rows']  = SN::$db->db_affected_rows();
+    $query['affected_rows'] = SN::$db->db_affected_rows();
   }
 
   return $queries;
@@ -53,30 +53,30 @@ 
   $recorded_run = strtotime($recorded_run);
 
   $prev_run_array = getdate($recorded_run);
-  $prev_run_array = array($prev_run_array['seconds'],$prev_run_array['minutes'],$prev_run_array['hours'],$prev_run_array['mday'],$prev_run_array['mon'],$prev_run_array['year']);
+  $prev_run_array = array($prev_run_array['seconds'], $prev_run_array['minutes'], $prev_run_array['hours'], $prev_run_array['mday'], $prev_run_array['mon'], $prev_run_array['year']);
   $today_array = getdate(SN_TIME_NOW);
-  $today_array = array($today_array['seconds'],$today_array['minutes'],$today_array['hours'],$today_array['mday'],$today_array['mon'],$today_array['year']);
+  $today_array = array($today_array['seconds'], $today_array['minutes'], $today_array['hours'], $today_array['mday'], $today_array['mon'], $today_array['year']);
   $scheduleList = explode(',', $scheduleList);
   array_walk($scheduleList, function(&$schedule) use ($prev_run_array, $today_array, $date_part_names_reverse, &$possible_schedules) {
     $schedule = array('schedule_array' => array_reverse(explode(':', trim($schedule))));
 
     $interval = $date_part_names_reverse[count($schedule['schedule_array'])];
 
-    foreach($prev_run_array as $index => $date_part) {
+    foreach ($prev_run_array as $index => $date_part) {
       $schedule['array']['recorded'][$index] = isset($schedule['schedule_array'][$index]) ? intval($schedule['schedule_array'][$index]) : $date_part;
       $schedule['array']['now'][$index] = isset($schedule['schedule_array'][$index]) ? intval($schedule['schedule_array'][$index]) : $today_array[$index];
     }
-    if($schedule['array']['recorded'] == $schedule['array']['now']) {
+    if ($schedule['array']['recorded'] == $schedule['array']['now']) {
       unset($schedule['array']['now']);
     }
 
-    foreach($schedule['array'] as $name => $array) {
+    foreach ($schedule['array'] as $name => $array) {
       $schedule['string'][$name] = "{$array[5]}-{$array[4]}-{$array[3]} {$array[2]}:{$array[1]}:{$array[0]}";
       $schedule['string'][$name . '_next'] = $schedule['string'][$name] . ' +1 ' . $interval;
       $schedule['string'][$name . '_prev'] = $schedule['string'][$name] . ' -1 ' . $interval;
     }
 
-    foreach($schedule['string'] as $string) {
+    foreach ($schedule['string'] as $string) {
       $timestamp = strtotime($string);
       $schedule['timestamp'][$timestamp] = $possible_schedules[$timestamp] = date(FMT_DATE_TIME_SQL, strtotime($string));
     }
@@ -86,7 +86,7 @@ 
 
   $prev_run = 0;
   $next_run = 0;
-  foreach($possible_schedules as $timestamp => $string_date) {
+  foreach ($possible_schedules as $timestamp => $string_date) {
     $prev_run = SN_TIME_NOW >= $timestamp ? $timestamp : $prev_run;
     $next_run = SN_TIME_NOW < $timestamp && !$next_run ? $timestamp : $next_run;
   }

includes/functions/lng_language.php

Braces +7 added lines, -14 removed lines

@@ -1,14 +1,12 @@ 
 <?php
 
 // ----------------------------------------------------------------------------------------------------------------
-function lng_try_filepath($path, $file_path_relative)
-{
+function lng_try_filepath($path, $file_path_relative) {
   $file_path = SN_ROOT_PHYSICAL . ($path && file_exists(SN_ROOT_PHYSICAL . $path . $file_path_relative) ? $path : '') . $file_path_relative;
   return file_exists($file_path) ? $file_path : false;
 }
 
-function lng_die_not_an_object()
-{
+function lng_die_not_an_object() {
   print('Ошибка - $lang не объект! Сообщите Администратору сервера и приложите содержимое страницы');
   $trace = debug_backtrace();
   unset($trace[0]);
@@ -17,32 +15,27 @@ 
 }
 
 // ----------------------------------------------------------------------------------------------------------------
-function lng_include($filename, $path = '', $ext = '.mo.php')
-{
+function lng_include($filename, $path = '', $ext = '.mo.php') {
   global $lang;
   return is_object($lang) ? $lang->lng_include($filename, $path, $ext) : lng_die_not_an_object();
 }
 
-function lng_get_list()
-{
+function lng_get_list() {
   global $lang;
   return is_object($lang) ? $lang->lng_get_list() : lng_die_not_an_object();
 }
 
-function lng_get_info($entry)
-{
+function lng_get_info($entry) {
   global $lang;
   return is_object($lang) ? $lang->lng_get_info($entry) : lng_die_not_an_object();
 }
 
-function lng_switch($language_new)
-{
+function lng_switch($language_new) {
   global $lang;
   return is_object($lang) ? $lang->lng_switch($language_new) : lng_die_not_an_object();
 }
 
-function lng_load_i18n($i18n)
-{
+function lng_load_i18n($i18n) {
   global $lang;
   return is_object($lang) ? $lang->lng_load_i18n($i18n) : lng_die_not_an_object();
 }

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_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() .

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