supernova-ws / SuperNova

classes/Core/SnBootstrap.php

Spacing +1 added lines, -1 removed lines

@@ -11,7 +11,7 @@
 class SnBootstrap {
 
   public static function install_benchmark() {
-    register_shutdown_function(function () {
+    register_shutdown_function(function() {
       if (defined('IN_AJAX')) {
         return;
       }

classes/StatUpdateLauncher.php

Spacing +1 added lines, -1 removed lines

@@ -58,7 +58,7 @@
         $config->pass()->game_disable = GAME_DISABLE_STAT;
 
         $statMinimalInterval = intval($config->pass()->stats_minimal_interval);
-        $config->pass()->var_stat_update_end= date(FMT_DATE_TIME_SQL, SN_TIME_NOW + ($statMinimalInterval ? $statMinimalInterval : STATS_RUN_INTERVAL_MINIMUM));
+        $config->pass()->var_stat_update_end = date(FMT_DATE_TIME_SQL, SN_TIME_NOW + ($statMinimalInterval ? $statMinimalInterval : STATS_RUN_INTERVAL_MINIMUM));
         $config->pass()->var_stat_update_msg = 'Update started';
         sn_db_transaction_commit();
 

scheduler.php

Spacing +2 added lines, -2 removed lines

@@ -22,11 +22,11 @@
 
 define('IN_AJAX', true);
 
-if(($result = StatUpdateLauncher::scheduler_process()) && !defined('IN_ADMIN')) {
+if (($result = StatUpdateLauncher::scheduler_process()) && !defined('IN_ADMIN')) {
   $result = htmlspecialchars($result, ENT_QUOTES, 'UTF-8');
   print(json_encode($result));
 }
 
-if(!defined('IN_ADMIN')) {
+if (!defined('IN_ADMIN')) {
   die();
 }

admin/admin_locale.php

Spacing +29 added lines, -29 removed lines

@@ -7,9 +7,9 @@ 
  *
  */
 
-define('INSIDE'  , true);
-define('INSTALL' , false);
-define('IN_ADMIN'  , true);
+define('INSIDE', true);
+define('INSTALL', false);
+define('IN_ADMIN', true);
 
 require('../common.' . substr(strrchr(__FILE__, '.'), 1));
 
@@ -20,12 +20,12 @@ 
 function adm_lng_assign_string($lang_id, $locale_string_name, $value) {
   global $locale_string_template, $languages_info, $languages, $domain;
 
-  if(is_array($value)) {
-    foreach($value as $sub_key => $sub_value) {
+  if (is_array($value)) {
+    foreach ($value as $sub_key => $sub_value) {
       adm_lng_assign_string($lang_id, "{$locale_string_name}[{$sub_key}]", $sub_value);
     }
-  } elseif($value) {
-    if(!isset($locale_string_template[$locale_string_name])) {
+  } elseif ($value) {
+    if (!isset($locale_string_template[$locale_string_name])) {
       $locale_string_template[$locale_string_name] = array();
     }
     $locale_string_template[$locale_string_name] = array_merge($locale_string_template[$locale_string_name], array("[{$lang_id}]" => htmlentities($value, ENT_COMPAT, 'utf-8')));
@@ -46,11 +46,11 @@ 
   global $domain, $lang_id;
 
   $return = "{$ident}'{$string_name}' => ";
-  if(isset($string_value[$lang_id]) && !is_array($string_value[$lang_id])) {
+  if (isset($string_value[$lang_id]) && !is_array($string_value[$lang_id])) {
     $return .= "'" . str_replace(array("\\", "'"), array('\\\\', "\\'"), $string_value[$lang_id]) . "',";
   } else {
     $return .= "array(\r\n";
-    foreach($string_value as $arr_name => $arr_data) {
+    foreach ($string_value as $arr_name => $arr_data) {
       $return .= adm_lng_parse_string($arr_name, $arr_data, $ident . '  ');
     }
     $return .= "{$ident}),\r\n";
@@ -103,12 +103,12 @@ 
 
   $string_name_new = false;
 
-  if(isset($honor_constants[$domain][$string_name_prefix])) {
+  if (isset($honor_constants[$domain][$string_name_prefix])) {
     $found_constants = array_keys($constants, $string_name);
-    foreach($found_constants as $constant_name) {
+    foreach ($found_constants as $constant_name) {
       $honor_prefix_list = is_array($honor_constants[$domain][$string_name_prefix]) ? $honor_constants[$domain][$string_name_prefix] : array($honor_constants[$domain][$string_name_prefix]);
-      foreach($honor_prefix_list as $honor_prefix) {
-        if(strpos($constant_name, $honor_prefix) === 0) {
+      foreach ($honor_prefix_list as $honor_prefix) {
+        if (strpos($constant_name, $honor_prefix) === 0) {
           $string_name_new = $constant_name;
           break;
         }
@@ -118,13 +118,13 @@ 
 
   $string_name_new = $string_name_new ? $string_name_new : "'{$string_name}'";
   fwrite($file_handler, "{$ident}{$string_name_new} => ");
-  if(isset($string_value[$lang_id]) && !is_array($string_value[$lang_id])) {
+  if (isset($string_value[$lang_id]) && !is_array($string_value[$lang_id])) {
     fwrite($file_handler, "'" . str_replace(array("\\", "'"), array('\\\\', "\\'"), $string_value[$lang_id]) . "',");
 //    fwrite($file_handler, "'" . addslashes($string_value[$lang_id]) . "',");
   } else {
     $string_name_prefix = $string_name_prefix . "[{$string_name}]";
     fwrite($file_handler, "array(\r\n");
-    foreach($string_value as $arr_name => $arr_data) {
+    foreach ($string_value as $arr_name => $arr_data) {
       adm_lng_write_string($arr_name, $arr_data, $ident . '  ', $string_name_prefix);
     }
     fwrite($file_handler, "{$ident}),\r\n");
@@ -144,13 +144,13 @@ 
 $languages_info = lng_get_list();
 $domain = sys_get_param_str('domain');
 
-if($domain) {
+if ($domain) {
   $lang_new = sys_get_param('lang_new');
-  if(!empty($lang_new) && is_array($lang_new)) {
+  if (!empty($lang_new) && is_array($lang_new)) {
     $constants = get_defined_constants(true);
     $constants = $constants['user'];
     ksort($constants);
-    foreach($languages_info as $lang_id => $land_data) {
+    foreach ($languages_info as $lang_id => $land_data) {
       $file_handler = fopen(SN_ROOT_PHYSICAL . "language/{$lang_id}/{$domain}.mo.php.new", 'w');
       fwrite($file_handler, "<?php\r\n\r\n/*\r\n#############################################################################
 #  Filename: {$domain}.mo.php
@@ -158,7 +158,7 @@ 
 #  Website: http://www.supernova.ws
 #  Description: Massive Multiplayer Online Browser Space Startegy Game\r\n#\r\n");
 
-      foreach($land_data['LANG_COPYRIGHT'] as $lang_copyright) {
+      foreach ($land_data['LANG_COPYRIGHT'] as $lang_copyright) {
         $lang_copyright = str_replace(array('&copy;', '&quot;', '&lt;', '&gt;'), array('©', '"', '<', '>'), $lang_copyright);
         fwrite($file_handler, "#  {$lang_copyright}\r\n");
       }
@@ -166,7 +166,7 @@ 
 /**\r\n*\r\n* @package language\r\n* @system [{$land_data['LANG_NAME_ENGLISH']}]\r\n* @version " . SN_VERSION . "\r\n*\r\n*/\r\n
 /**\r\n* DO NOT CHANGE\r\n*/\r\n\r\nif (!defined('INSIDE')) die();\r\n
 \$a_lang_array = array(\r\n");
-      foreach($lang_new as $string_name => $string_value) {
+      foreach ($lang_new as $string_name => $string_value) {
         adm_lng_write_string($string_name, $string_value);
       }
       fwrite($file_handler, ");\r\n");
@@ -176,21 +176,21 @@ 
     sys_redirect("admin_locale.php?domain={$domain}");
   }
 
-  foreach($languages_info as $lang_id => $lang_data) {
+  foreach ($languages_info as $lang_id => $lang_data) {
     $template->assign_block_vars('language', $lang_data);
     $full_filename = SN_ROOT_PHYSICAL . "language/{$lang_id}/{$domain}.mo.php";
     $languages[$lang_id] = adm_lng_load($full_filename . (file_exists($full_filename . '.new') ? '.new' : ''));
-    foreach($languages[$lang_id] as $locale_string_name => $cork) {
+    foreach ($languages[$lang_id] as $locale_string_name => $cork) {
       adm_lng_assign_string($lang_id, "[{$locale_string_name}]", $languages[$lang_id][$locale_string_name]);
     }
   }
 
-  foreach($locale_string_template as $locale_string_name => $locale_string_list) {
+  foreach ($locale_string_template as $locale_string_name => $locale_string_list) {
     $template->assign_block_vars('string', array(
       'NAME' => $locale_string_name,
     ));
 
-    foreach($languages_info as $lang_id => $cork2) {
+    foreach ($languages_info as $lang_id => $cork2) {
       $template->assign_block_vars('string.locale', array(
         'LANG' => $lang_id,
         'VALUE' => $locale_string_list["[{$lang_id}]"],
@@ -206,17 +206,17 @@ 
   $dir = dir($path);
   while (false !== ($lang_id = $dir->read())) {
     $full_path = $path . $lang_id;
-    if($lang_id[0] != "." && is_dir($full_path)) {
+    if ($lang_id[0] != "." && is_dir($full_path)) {
       $lang_file_list = dir($full_path);
       while (false !== ($filename = $lang_file_list->read())) {
         $lang_domain = strtolower(substr($filename, 0, strpos($filename, '.')));
-        if(!$lang_domain) {
+        if (!$lang_domain) {
           continue;
         }
 
         $file_ext = strtolower(substr($filename, strpos($filename, '.')));
-        if($lang_domain != 'language') {
-          if($file_ext == '.mo.php.new' || ($file_ext == '.mo.php' && empty($languages[$lang_id][$lang_domain]))) {
+        if ($lang_domain != 'language') {
+          if ($file_ext == '.mo.php.new' || ($file_ext == '.mo.php' && empty($languages[$lang_id][$lang_domain]))) {
             $language_domains[$lang_domain] = $lang_domain;
             $languages[$lang_id][$lang_domain] = $lang_domain;
           }
@@ -226,7 +226,7 @@ 
   }
   $dir->close();
 
-  foreach($language_domains as $lang_domain) {
+  foreach ($language_domains as $lang_domain) {
     $template->assign_block_vars('domain', array(
       'NAME' => $lang_domain,
     ));

fleet.php

Spacing +14 added lines, -14 removed lines

@@ -39,11 +39,11 @@ 
 $planet = sys_get_param_int('planet', $planetrow['planet']);
 
 $target_mission = sys_get_param_int('target_mission');
-if($target_mission == MT_COLONIZE || $target_mission == MT_EXPLORE) {
+if ($target_mission == MT_COLONIZE || $target_mission == MT_EXPLORE) {
   $planet_type = PT_PLANET;
-} elseif($target_mission == MT_RECYCLE) {
+} elseif ($target_mission == MT_RECYCLE) {
   $planet_type = PT_DEBRIS;
-} elseif($target_mission == MT_DESTROY) {
+} elseif ($target_mission == MT_DESTROY) {
   $planet_type = PT_MOON;
 } else {
   $planet_type = sys_get_param_int('planet_type');
@@ -59,15 +59,15 @@ 
 //$FlyingFleets = doquery("SELECT COUNT(fleet_id) as Number FROM {{fleets}} WHERE `fleet_owner`='{$user['id']}'", true);
 //$FlyingFleets = $FlyingFleets['Number'];
 $FlyingFleets = fleet_count_flying($user['id']);
-if($MaxFleets <= $FlyingFleets && $fleet_page && $fleet_page != 4) {
+if ($MaxFleets <= $FlyingFleets && $fleet_page && $fleet_page != 4) {
   messageBox($lang['fl_noslotfree'], $lang['fl_error'], "fleet." . PHP_EX, 5);
 }
 
 $MaxExpeditions = get_player_max_expeditons($user);
-if($MaxExpeditions) {
+if ($MaxExpeditions) {
 //  $FlyingExpeditions  = doquery("SELECT COUNT(fleet_owner) AS `expedi` FROM {{fleets}} WHERE `fleet_owner` = {$user['id']} AND `fleet_mission` = '" . MT_EXPLORE . "';", '', true);
 //  $FlyingExpeditions  = $FlyingExpeditions['expedi'];
-  $FlyingExpeditions  = fleet_count_flying($user['id'], MT_EXPLORE);
+  $FlyingExpeditions = fleet_count_flying($user['id'], MT_EXPLORE);
 } else {
   $FlyingExpeditions = 0;
 }
@@ -80,8 +80,8 @@ 
     $fleetarray     = json_decode(base64_decode(str_rot13(sys_get_param('usedfleet'))), true);
     $fleetarray = is_array($fleetarray) ? $fleetarray : array();
 
-    foreach($fleetarray as $ship_id => &$ship_amount) {
-      if(!in_array($ship_id, sn_get_groups('fleet')) || (string)floatval($ship_amount) != $ship_amount || $ship_amount < 1) {
+    foreach ($fleetarray as $ship_id => &$ship_amount) {
+      if (!in_array($ship_id, sn_get_groups('fleet')) || (string) floatval($ship_amount) != $ship_amount || $ship_amount < 1) {
         $debug->warning('Supplying wrong ship in ship list on fleet page', 'Hack attempt', 302, array('base_dump' => true));
         die();
       }
@@ -112,11 +112,11 @@ 
           $target_mission = MT_COLONIZE;
           $planet_type = PT_PLANET;
         } else {
-          messageBox ("<font color=\"red\"><b>". $lang['fl_no_planet_type'] ."</b></font>", $lang['fl_error']);
+          messageBox("<font color=\"red\"><b>" . $lang['fl_no_planet_type'] . "</b></font>", $lang['fl_error']);
         }
       } else {
         $recyclers = 0;
-        foreach(sn_get_groups('flt_recyclers') as $recycler_id) {
+        foreach (sn_get_groups('flt_recyclers') as $recycler_id) {
           $recyclers += $fleetarray[$recycler_id];
         }
         if ($recyclers > 0 && $planet_type == PT_DEBRIS) {
@@ -141,7 +141,7 @@ 
 
                 $missiontype[MT_HOLD] = $lang['type_mission'][MT_HOLD];
 
-                if($planet_type == PT_MOON && $fleetarray[SHIP_HUGE_DEATH_STAR]) {
+                if ($planet_type == PT_MOON && $fleetarray[SHIP_HUGE_DEATH_STAR]) {
                   $missiontype[MT_DESTROY] = $lang['type_mission'][MT_DESTROY];
                 }
               }
@@ -201,14 +201,14 @@ 
 );
 
 $is_transport_missions = false;
-if($missiontype) {
+if ($missiontype) {
   $sn_group_missions = sn_get_groups('missions');
-  foreach($missiontype as $mission_data_id => $mission_data) {
+  foreach ($missiontype as $mission_data_id => $mission_data) {
     $is_transport_missions = $is_transport_missions || (isset($sn_group_missions[$mission_data_id]['transport']) && $sn_group_missions[$mission_data_id]['transport']);
   }
 }
 
-switch($fleet_page) {
+switch ($fleet_page) {
   case 1:
     require('includes/includes/flt_page1.inc');
   break;

Switch Indentation +131 added lines, -131 removed lines

@@ -75,121 +75,121 @@ 
 }
 
 switch ($fleet_page) {
-  case 3:
+    case 3:
 
-  case 2:
-    $fleet_group_mr = sys_get_param_id('fleet_group');
-    $fleetarray     = json_decode(base64_decode(str_rot13(sys_get_param('usedfleet'))), true);
-    $fleetarray = is_array($fleetarray) ? $fleetarray : array();
+    case 2:
+      $fleet_group_mr = sys_get_param_id('fleet_group');
+      $fleetarray     = json_decode(base64_decode(str_rot13(sys_get_param('usedfleet'))), true);
+      $fleetarray = is_array($fleetarray) ? $fleetarray : array();
 
-    foreach($fleetarray as $ship_id => &$ship_amount) {
-      if(!in_array($ship_id, sn_get_groups('fleet')) || (string)floatval($ship_amount) != $ship_amount || $ship_amount < 1) {
-        $debug->warning('Supplying wrong ship in ship list on fleet page', 'Hack attempt', 302, array('base_dump' => true));
-        die();
-      }
-      $ship_amount = floatval($ship_amount);
-    }
-
-    $UsedPlanet = false;
-    $YourPlanet = false;
-    $missiontype = array();
-    if ($planet > SN::$config->game_maxPlanet) {
-      $target_mission = MT_EXPLORE;
-      $missiontype[MT_EXPLORE] = $lang['type_mission'][MT_EXPLORE];
-    } elseif ($galaxy && $system && $planet) {
-      $check_type = $planet_type == PT_MOON ? PT_MOON : PT_PLANET;
-
-      $TargetPlanet = DBStaticPlanet::db_planet_by_gspt($galaxy, $system, $planet, $check_type);
-
-      if ($TargetPlanet['id_owner']) {
-        $UsedPlanet = true;
-        if ($TargetPlanet['id_owner'] == $user['id']) {
-          $YourPlanet = true;
+      foreach($fleetarray as $ship_id => &$ship_amount) {
+        if(!in_array($ship_id, sn_get_groups('fleet')) || (string)floatval($ship_amount) != $ship_amount || $ship_amount < 1) {
+          $debug->warning('Supplying wrong ship in ship list on fleet page', 'Hack attempt', 302, array('base_dump' => true));
+          die();
         }
+        $ship_amount = floatval($ship_amount);
       }
 
-      if (!$UsedPlanet) {
-        if ($fleetarray[SHIP_COLONIZER]) {
-          $missiontype[MT_COLONIZE] = $lang['type_mission'][MT_COLONIZE];
-          $target_mission = MT_COLONIZE;
-          $planet_type = PT_PLANET;
-        } else {
-          messageBox ("<font color=\"red\"><b>". $lang['fl_no_planet_type'] ."</b></font>", $lang['fl_error']);
-        }
-      } else {
-        $recyclers = 0;
-        foreach(sn_get_groups('flt_recyclers') as $recycler_id) {
-          $recyclers += $fleetarray[$recycler_id];
+      $UsedPlanet = false;
+      $YourPlanet = false;
+      $missiontype = array();
+      if ($planet > SN::$config->game_maxPlanet) {
+        $target_mission = MT_EXPLORE;
+        $missiontype[MT_EXPLORE] = $lang['type_mission'][MT_EXPLORE];
+      } elseif ($galaxy && $system && $planet) {
+        $check_type = $planet_type == PT_MOON ? PT_MOON : PT_PLANET;
+
+        $TargetPlanet = DBStaticPlanet::db_planet_by_gspt($galaxy, $system, $planet, $check_type);
+
+        if ($TargetPlanet['id_owner']) {
+          $UsedPlanet = true;
+          if ($TargetPlanet['id_owner'] == $user['id']) {
+            $YourPlanet = true;
+          }
         }
-        if ($recyclers > 0 && $planet_type == PT_DEBRIS) {
-          $target_mission = MT_RECYCLE;
-          $missiontype[MT_RECYCLE] = $lang['type_mission'][MT_RECYCLE];
-        } elseif ($planet_type == PT_PLANET || $planet_type == PT_MOON) {
-          if ($YourPlanet) {
-            $missiontype[MT_RELOCATE] = $lang['type_mission'][MT_RELOCATE];
-            $missiontype[MT_TRANSPORT] = $lang['type_mission'][MT_TRANSPORT];
+
+        if (!$UsedPlanet) {
+          if ($fleetarray[SHIP_COLONIZER]) {
+            $missiontype[MT_COLONIZE] = $lang['type_mission'][MT_COLONIZE];
+            $target_mission = MT_COLONIZE;
+            $planet_type = PT_PLANET;
           } else {
-            // Not Your Planet
-            if ($fleetarray[SHIP_SPY]) {
-              // Only spy missions if any spy
-              $missiontype[MT_SPY] = $lang['type_mission'][MT_SPY];
+            messageBox ("<font color=\"red\"><b>". $lang['fl_no_planet_type'] ."</b></font>", $lang['fl_error']);
+          }
+        } else {
+          $recyclers = 0;
+          foreach(sn_get_groups('flt_recyclers') as $recycler_id) {
+            $recyclers += $fleetarray[$recycler_id];
+          }
+          if ($recyclers > 0 && $planet_type == PT_DEBRIS) {
+            $target_mission = MT_RECYCLE;
+            $missiontype[MT_RECYCLE] = $lang['type_mission'][MT_RECYCLE];
+          } elseif ($planet_type == PT_PLANET || $planet_type == PT_MOON) {
+            if ($YourPlanet) {
+              $missiontype[MT_RELOCATE] = $lang['type_mission'][MT_RELOCATE];
+              $missiontype[MT_TRANSPORT] = $lang['type_mission'][MT_TRANSPORT];
             } else {
-              // If no spies...
-              if ($fleet_group_mr) {
-                $missiontype[MT_AKS] = $lang['type_mission'][MT_AKS];
+              // Not Your Planet
+              if ($fleetarray[SHIP_SPY]) {
+                // Only spy missions if any spy
+                $missiontype[MT_SPY] = $lang['type_mission'][MT_SPY];
               } else {
-                $missiontype[MT_ATTACK] = $lang['type_mission'][MT_ATTACK];
-                $missiontype[MT_TRANSPORT] = $lang['type_mission'][MT_TRANSPORT];
-
-                $missiontype[MT_HOLD] = $lang['type_mission'][MT_HOLD];
-
-                if($planet_type == PT_MOON && $fleetarray[SHIP_HUGE_DEATH_STAR]) {
-                  $missiontype[MT_DESTROY] = $lang['type_mission'][MT_DESTROY];
+                // If no spies...
+                if ($fleet_group_mr) {
+                  $missiontype[MT_AKS] = $lang['type_mission'][MT_AKS];
+                } else {
+                  $missiontype[MT_ATTACK] = $lang['type_mission'][MT_ATTACK];
+                  $missiontype[MT_TRANSPORT] = $lang['type_mission'][MT_TRANSPORT];
+
+                  $missiontype[MT_HOLD] = $lang['type_mission'][MT_HOLD];
+
+                  if($planet_type == PT_MOON && $fleetarray[SHIP_HUGE_DEATH_STAR]) {
+                    $missiontype[MT_DESTROY] = $lang['type_mission'][MT_DESTROY];
+                  }
                 }
               }
             }
           }
         }
       }
-    }
-
-    if (!$target_mission && is_array($missiontype)) {
-      $target_mission = MT_ATTACK;
-    }
-
-//    $sn_group_missions = sn_get_groups('missions');
-//    foreach($sn_group_missions as $mission_id => $cork) {
-//      $missiontype[$mission_id] = $lang['type_mission'][$mission_id];
-//    }
-//
-//
-    ksort($missiontype);
-
-    $speed_percent = sys_get_param_int('speed', 10);
-    $travel_data   = flt_travel_data($user, $planetrow, array('galaxy' => $galaxy, 'system' => $system, 'planet' => $planet), $fleetarray, $speed_percent);
-
-//    $fleet_speed   = flt_fleet_speed($user, $fleetarray);
-    $fleet_speed   = $travel_data['fleet_speed'];
-    $distance      = $travel_data['distance'];
-    $duration      = $travel_data['duration'];
-    $consumption   = $travel_data['consumption'];
-  // No Break
-
-  case 1:
-    if ($galaxy && $system && $planet) {
-      $check_type = $planet_type == PT_MOON ? PT_MOON : PT_PLANET;
-
-      $TargetPlanet = DBStaticPlanet::db_planet_by_gspt($galaxy, $system, $planet, $check_type);
-    }
-
-  case 0:
-    $template_result += array(
-      'thisgalaxy'      => $planetrow['galaxy'],
-      'thissystem'      => $planetrow['system'],
-      'thisplanet'      => $planetrow['planet'],
-      'thisplanet_type' => $planetrow['planet_type'],
-    );
-  // no break
+
+      if (!$target_mission && is_array($missiontype)) {
+        $target_mission = MT_ATTACK;
+      }
+
+  //    $sn_group_missions = sn_get_groups('missions');
+  //    foreach($sn_group_missions as $mission_id => $cork) {
+  //      $missiontype[$mission_id] = $lang['type_mission'][$mission_id];
+  //    }
+  //
+  //
+      ksort($missiontype);
+
+      $speed_percent = sys_get_param_int('speed', 10);
+      $travel_data   = flt_travel_data($user, $planetrow, array('galaxy' => $galaxy, 'system' => $system, 'planet' => $planet), $fleetarray, $speed_percent);
+
+  //    $fleet_speed   = flt_fleet_speed($user, $fleetarray);
+      $fleet_speed   = $travel_data['fleet_speed'];
+      $distance      = $travel_data['distance'];
+      $duration      = $travel_data['duration'];
+      $consumption   = $travel_data['consumption'];
+    // No Break
+
+    case 1:
+      if ($galaxy && $system && $planet) {
+        $check_type = $planet_type == PT_MOON ? PT_MOON : PT_PLANET;
+
+        $TargetPlanet = DBStaticPlanet::db_planet_by_gspt($galaxy, $system, $planet, $check_type);
+      }
+
+    case 0:
+      $template_result += array(
+        'thisgalaxy'      => $planetrow['galaxy'],
+        'thissystem'      => $planetrow['system'],
+        'thisplanet'      => $planetrow['planet'],
+        'thisplanet_type' => $planetrow['planet_type'],
+      );
+    // no break
 
 }
 
@@ -211,35 +211,35 @@ 
 }
 
 switch($fleet_page) {
-  case 1:
-    require('includes/includes/flt_page1.inc');
-  break;
-
-  case 2:
-    require_once('includes/includes/flt_page2.inc');
-    sn_fleet_page2();
-  break;
-
-  case 3:
-    require_once('includes/includes/flt_page3.inc');
-    sn_fleet_page3();
-  break;
-
-  case 4:
-    require('includes/includes/flt_page4.inc');
-  break;
-
-  case 5:
-    $template = gettemplate('fleet5', true);
-    $pageFleet5Gathering = new \Deprecated\PageFleet5Gathering();
-    $pageFleet5Gathering->modelFleet5Gathering($user, $planetrow, $template);
-    // Building list of own planets & moons
-    $pageFleet5Gathering->viewPage5Gathering($user, $planetrow, $template);
-  break;
-
-  default:
-    define('SN_RENDER_NAVBAR_PLANET', true);
-
-    require('includes/includes/flt_page0.inc');
-  break;
+    case 1:
+      require('includes/includes/flt_page1.inc');
+    break;
+
+    case 2:
+      require_once('includes/includes/flt_page2.inc');
+      sn_fleet_page2();
+    break;
+
+    case 3:
+      require_once('includes/includes/flt_page3.inc');
+      sn_fleet_page3();
+    break;
+
+    case 4:
+      require('includes/includes/flt_page4.inc');
+    break;
+
+    case 5:
+      $template = gettemplate('fleet5', true);
+      $pageFleet5Gathering = new \Deprecated\PageFleet5Gathering();
+      $pageFleet5Gathering->modelFleet5Gathering($user, $planetrow, $template);
+      // Building list of own planets & moons
+      $pageFleet5Gathering->viewPage5Gathering($user, $planetrow, $template);
+    break;
+
+    default:
+      define('SN_RENDER_NAVBAR_PLANET', true);
+
+      require('includes/includes/flt_page0.inc');
+    break;
 }

classes/Meta/Economic/EconomicHelper.php

Spacing +2 added lines, -2 removed lines

@@ -75,11 +75,11 @@
    * @return float[] - [int resourceId] -> [float ratesNormalizedToResourceCost]
    */
   public function getResourceExchangeIn($resourceId) {
-    if(empty($this->resourceExchangeRates[$resourceId])) {
+    if (empty($this->resourceExchangeRates[$resourceId])) {
       $defaultRates = $this->getResourcesExchange();
 
       $this->resourceExchangeRates[$resourceId] = [];
-      foreach($defaultRates as $defaultResourceId => $defaultRate) {
+      foreach ($defaultRates as $defaultResourceId => $defaultRate) {
         $this->resourceExchangeRates[$resourceId][$defaultResourceId] = $defaultRate / $defaultRates[$resourceId];
       }
     }

classes/phpbb_hook.php

Indentation +224 added lines, -224 removed lines

@@ -16,7 +16,7 @@ 
 */
 if (!defined('IN_PHPBB'))
 {
-	exit;
+  exit;
 }
 
 /**
@@ -24,227 +24,227 @@ 
 */
 class phpbb_hook
 {
-	/**
-	* Registered hooks
-	*/
-	var $hooks = array();
-
-	/**
-	* Results returned by functions called
-	*/
-	var $hook_result = array();
-
-	/**
-	* internal pointer
-	*/
-	var $current_hook = NULL;
-
-	/**
-	* Initialize hook class.
-	*
-	* @param array $valid_hooks array containing the hookable functions/methods
-	*/
-	function phpbb_hook($valid_hooks)
-	{
-		foreach ($valid_hooks as $_null => $method)
-		{
-			$this->add_hook($method);
-		}
-
-		if (function_exists('phpbb_hook_register'))
-		{
-			phpbb_hook_register($this);
-		}
-	}
-
-	/**
-	* Register function/method to be called within hook
-	* This function is normally called by the modification/application to attach/register the functions.
-	*
-	* @param mixed $definition Declaring function (with __FUNCTION__) or class with array(__CLASS__, __FUNCTION__)
-	* @param mixed $hook The replacement function/method to be called. Passing function name or array with object/class definition
-	* @param string $mode Specify the priority/chain mode. 'normal' -> hook gets appended to the chain. 'standalone' -> only the specified hook gets called - later hooks are not able to overwrite this (E_NOTICE is triggered then). 'first' -> hook is called as the first one within the chain. 'last' -> hook is called as the last one within the chain.
-	*/
-	function register($definition, $hook, $mode = 'normal')
-	{
-		$class = (!is_array($definition)) ? '__global' : $definition[0];
-		$function = (!is_array($definition)) ? $definition : $definition[1];
-
-		// Method able to be hooked?
-		if (isset($this->hooks[$class][$function]))
-		{
-			switch ($mode)
-			{
-				case 'standalone':
-					if (!isset($this->hooks[$class][$function]['standalone']))
-					{
-						$this->hooks[$class][$function] = array('standalone' => $hook);
-					}
-					else
-					{
-						trigger_error('Hook not able to be called standalone, previous hook already standalone.', E_NOTICE);
-					}
-				break;
-
-				case 'first':
-				case 'last':
-					$this->hooks[$class][$function][$mode][] = $hook;
-				break;
-
-				case 'normal':
-				default:
-					$this->hooks[$class][$function]['normal'][] = $hook;
-				break;
-			}
-		}
-	}
-
-	/**
-	* Calling all functions/methods attached to a specified hook.
-	* Called by the function allowing hooks...
-	*
-	* @param mixed $definition Declaring function (with __FUNCTION__) or class with array(__CLASS__, __FUNCTION__)
-	* @return bool False if no hook got executed, true otherwise
-	*/
-	function call_hook($definition)
-	{
-		$class = (!is_array($definition)) ? '__global' : $definition[0];
-		$function = (!is_array($definition)) ? $definition : $definition[1];
-
-		if (!empty($this->hooks[$class][$function]))
-		{
-			// Developer tries to call a hooked function within the hooked function...
-			if ($this->current_hook !== NULL && $this->current_hook['class'] === $class && $this->current_hook['function'] === $function)
-			{
-				return false;
-			}
-
-			// Call the hook with the arguments attached and store result
-			$arguments = func_get_args();
-			$this->current_hook = array('class' => $class, 'function' => $function);
-			$arguments[0] = &$this;
-
-			// Call the hook chain...
-			if (isset($this->hooks[$class][$function]['standalone']))
-			{
-				$this->hook_result[$class][$function] = call_user_func_array($this->hooks[$class][$function]['standalone'], $arguments);
-			}
-			else
-			{
-				foreach (array('first', 'normal', 'last') as $mode)
-				{
-					if (!isset($this->hooks[$class][$function][$mode]))
-					{
-						continue;
-					}
-
-					foreach ($this->hooks[$class][$function][$mode] as $hook)
-					{
-						$this->hook_result[$class][$function] = call_user_func_array($hook, $arguments);
-					}
-				}
-			}
-
-			$this->current_hook = NULL;
-			return true;
-		}
-
-		$this->current_hook = NULL;
-		return false;
-	}
-
-	/**
-	* Get result from previously called functions/methods for the same hook
-	*
-	* @param mixed $definition Declaring function (with __FUNCTION__) or class with array(__CLASS__, __FUNCTION__)
-	* @return mixed False if nothing returned if there is no result, else array('result' => ... )
-	*/
-	function previous_hook_result($definition)
-	{
-		$class = (!is_array($definition)) ? '__global' : $definition[0];
-		$function = (!is_array($definition)) ? $definition : $definition[1];
-
-		if (!empty($this->hooks[$class][$function]) && isset($this->hook_result[$class][$function]))
-		{
-			return array('result' => $this->hook_result[$class][$function]);
-		}
-
-		return false;
-	}
-
-	/**
-	* Check if the called functions/methods returned something.
-	*
-	* @param mixed $definition Declaring function (with __FUNCTION__) or class with array(__CLASS__, __FUNCTION__)
-	* @return bool True if results are there, false if not
-	*/
-	function hook_return($definition)
-	{
-		$class = (!is_array($definition)) ? '__global' : $definition[0];
-		$function = (!is_array($definition)) ? $definition : $definition[1];
-
-		if (!empty($this->hooks[$class][$function]) && isset($this->hook_result[$class][$function]))
-		{
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	* Give actual result from called functions/methods back.
-	*
-	* @param mixed $definition Declaring function (with __FUNCTION__) or class with array(__CLASS__, __FUNCTION__)
-	* @return mixed The result
-	*/
-	function hook_return_result($definition)
-	{
-		$class = (!is_array($definition)) ? '__global' : $definition[0];
-		$function = (!is_array($definition)) ? $definition : $definition[1];
-
-		if (!empty($this->hooks[$class][$function]) && isset($this->hook_result[$class][$function]))
-		{
-			$result = $this->hook_result[$class][$function];
-			unset($this->hook_result[$class][$function]);
-			return $result;
-		}
-
-		return;
-	}
-
-	/**
-	* Add new function to the allowed hooks.
-	*
-	* @param mixed $definition Declaring function (with __FUNCTION__) or class with array(__CLASS__, __FUNCTION__)
-	*/
-	function add_hook($definition)
-	{
-		if (!is_array($definition))
-		{
-			$definition = array('__global', $definition);
-		}
-
-		$this->hooks[$definition[0]][$definition[1]] = array();
-	}
-
-	/**
-	* Remove function from the allowed hooks.
-	*
-	* @param mixed $definition Declaring function (with __FUNCTION__) or class with array(__CLASS__, __FUNCTION__)
-	*/
-	function remove_hook($definition)
-	{
-		$class = (!is_array($definition)) ? '__global' : $definition[0];
-		$function = (!is_array($definition)) ? $definition : $definition[1];
-
-		if (isset($this->hooks[$class][$function]))
-		{
-			unset($this->hooks[$class][$function]);
-
-			if (isset($this->hook_result[$class][$function]))
-			{
-				unset($this->hook_result[$class][$function]);
-			}
-		}
-	}
+  /**
+   * Registered hooks
+   */
+  var $hooks = array();
+
+  /**
+   * Results returned by functions called
+   */
+  var $hook_result = array();
+
+  /**
+   * internal pointer
+   */
+  var $current_hook = NULL;
+
+  /**
+   * Initialize hook class.
+   *
+   * @param array $valid_hooks array containing the hookable functions/methods
+   */
+  function phpbb_hook($valid_hooks)
+  {
+    foreach ($valid_hooks as $_null => $method)
+    {
+      $this->add_hook($method);
+    }
+
+    if (function_exists('phpbb_hook_register'))
+    {
+      phpbb_hook_register($this);
+    }
+  }
+
+  /**
+   * Register function/method to be called within hook
+   * This function is normally called by the modification/application to attach/register the functions.
+   *
+   * @param mixed $definition Declaring function (with __FUNCTION__) or class with array(__CLASS__, __FUNCTION__)
+   * @param mixed $hook The replacement function/method to be called. Passing function name or array with object/class definition
+   * @param string $mode Specify the priority/chain mode. 'normal' -> hook gets appended to the chain. 'standalone' -> only the specified hook gets called - later hooks are not able to overwrite this (E_NOTICE is triggered then). 'first' -> hook is called as the first one within the chain. 'last' -> hook is called as the last one within the chain.
+   */
+  function register($definition, $hook, $mode = 'normal')
+  {
+    $class = (!is_array($definition)) ? '__global' : $definition[0];
+    $function = (!is_array($definition)) ? $definition : $definition[1];
+
+    // Method able to be hooked?
+    if (isset($this->hooks[$class][$function]))
+    {
+      switch ($mode)
+      {
+        case 'standalone':
+          if (!isset($this->hooks[$class][$function]['standalone']))
+          {
+            $this->hooks[$class][$function] = array('standalone' => $hook);
+          }
+          else
+          {
+            trigger_error('Hook not able to be called standalone, previous hook already standalone.', E_NOTICE);
+          }
+        break;
+
+        case 'first':
+        case 'last':
+          $this->hooks[$class][$function][$mode][] = $hook;
+        break;
+
+        case 'normal':
+        default:
+          $this->hooks[$class][$function]['normal'][] = $hook;
+        break;
+      }
+    }
+  }
+
+  /**
+   * Calling all functions/methods attached to a specified hook.
+   * Called by the function allowing hooks...
+   *
+   * @param mixed $definition Declaring function (with __FUNCTION__) or class with array(__CLASS__, __FUNCTION__)
+   * @return bool False if no hook got executed, true otherwise
+   */
+  function call_hook($definition)
+  {
+    $class = (!is_array($definition)) ? '__global' : $definition[0];
+    $function = (!is_array($definition)) ? $definition : $definition[1];
+
+    if (!empty($this->hooks[$class][$function]))
+    {
+      // Developer tries to call a hooked function within the hooked function...
+      if ($this->current_hook !== NULL && $this->current_hook['class'] === $class && $this->current_hook['function'] === $function)
+      {
+        return false;
+      }
+
+      // Call the hook with the arguments attached and store result
+      $arguments = func_get_args();
+      $this->current_hook = array('class' => $class, 'function' => $function);
+      $arguments[0] = &$this;
+
+      // Call the hook chain...
+      if (isset($this->hooks[$class][$function]['standalone']))
+      {
+        $this->hook_result[$class][$function] = call_user_func_array($this->hooks[$class][$function]['standalone'], $arguments);
+      }
+      else
+      {
+        foreach (array('first', 'normal', 'last') as $mode)
+        {
+          if (!isset($this->hooks[$class][$function][$mode]))
+          {
+            continue;
+          }
+
+          foreach ($this->hooks[$class][$function][$mode] as $hook)
+          {
+            $this->hook_result[$class][$function] = call_user_func_array($hook, $arguments);
+          }
+        }
+      }
+
+      $this->current_hook = NULL;
+      return true;
+    }
+
+    $this->current_hook = NULL;
+    return false;
+  }
+
+  /**
+   * Get result from previously called functions/methods for the same hook
+   *
+   * @param mixed $definition Declaring function (with __FUNCTION__) or class with array(__CLASS__, __FUNCTION__)
+   * @return mixed False if nothing returned if there is no result, else array('result' => ... )
+   */
+  function previous_hook_result($definition)
+  {
+    $class = (!is_array($definition)) ? '__global' : $definition[0];
+    $function = (!is_array($definition)) ? $definition : $definition[1];
+
+    if (!empty($this->hooks[$class][$function]) && isset($this->hook_result[$class][$function]))
+    {
+      return array('result' => $this->hook_result[$class][$function]);
+    }
+
+    return false;
+  }
+
+  /**
+   * Check if the called functions/methods returned something.
+   *
+   * @param mixed $definition Declaring function (with __FUNCTION__) or class with array(__CLASS__, __FUNCTION__)
+   * @return bool True if results are there, false if not
+   */
+  function hook_return($definition)
+  {
+    $class = (!is_array($definition)) ? '__global' : $definition[0];
+    $function = (!is_array($definition)) ? $definition : $definition[1];
+
+    if (!empty($this->hooks[$class][$function]) && isset($this->hook_result[$class][$function]))
+    {
+      return true;
+    }
+
+    return false;
+  }
+
+  /**
+   * Give actual result from called functions/methods back.
+   *
+   * @param mixed $definition Declaring function (with __FUNCTION__) or class with array(__CLASS__, __FUNCTION__)
+   * @return mixed The result
+   */
+  function hook_return_result($definition)
+  {
+    $class = (!is_array($definition)) ? '__global' : $definition[0];
+    $function = (!is_array($definition)) ? $definition : $definition[1];
+
+    if (!empty($this->hooks[$class][$function]) && isset($this->hook_result[$class][$function]))
+    {
+      $result = $this->hook_result[$class][$function];
+      unset($this->hook_result[$class][$function]);
+      return $result;
+    }
+
+    return;
+  }
+
+  /**
+   * Add new function to the allowed hooks.
+   *
+   * @param mixed $definition Declaring function (with __FUNCTION__) or class with array(__CLASS__, __FUNCTION__)
+   */
+  function add_hook($definition)
+  {
+    if (!is_array($definition))
+    {
+      $definition = array('__global', $definition);
+    }
+
+    $this->hooks[$definition[0]][$definition[1]] = array();
+  }
+
+  /**
+   * Remove function from the allowed hooks.
+   *
+   * @param mixed $definition Declaring function (with __FUNCTION__) or class with array(__CLASS__, __FUNCTION__)
+   */
+  function remove_hook($definition)
+  {
+    $class = (!is_array($definition)) ? '__global' : $definition[0];
+    $function = (!is_array($definition)) ? $definition : $definition[1];
+
+    if (isset($this->hooks[$class][$function]))
+    {
+      unset($this->hooks[$class][$function]);
+
+      if (isset($this->hook_result[$class][$function]))
+      {
+        unset($this->hook_result[$class][$function]);
+      }
+    }
+  }
 }

Braces +11 added lines, -22 removed lines

@@ -22,8 +22,7 @@ 
 /**
 * phpBB Hook Class
 */
-class phpbb_hook
-{
+class phpbb_hook {
 	/**
 	* Registered hooks
 	*/
@@ -44,8 +43,7 @@ 
 	*
 	* @param array $valid_hooks array containing the hookable functions/methods
 	*/
-	function phpbb_hook($valid_hooks)
-	{
+	function phpbb_hook($valid_hooks) {
 		foreach ($valid_hooks as $_null => $method)
 		{
 			$this->add_hook($method);
@@ -65,8 +63,7 @@ 
 	* @param mixed $hook The replacement function/method to be called. Passing function name or array with object/class definition
 	* @param string $mode Specify the priority/chain mode. 'normal' -> hook gets appended to the chain. 'standalone' -> only the specified hook gets called - later hooks are not able to overwrite this (E_NOTICE is triggered then). 'first' -> hook is called as the first one within the chain. 'last' -> hook is called as the last one within the chain.
 	*/
-	function register($definition, $hook, $mode = 'normal')
-	{
+	function register($definition, $hook, $mode = 'normal') {
 		$class = (!is_array($definition)) ? '__global' : $definition[0];
 		$function = (!is_array($definition)) ? $definition : $definition[1];
 
@@ -79,8 +76,7 @@ 
 					if (!isset($this->hooks[$class][$function]['standalone']))
 					{
 						$this->hooks[$class][$function] = array('standalone' => $hook);
-					}
-					else
+					} else
 					{
 						trigger_error('Hook not able to be called standalone, previous hook already standalone.', E_NOTICE);
 					}
@@ -106,8 +102,7 @@ 
 	* @param mixed $definition Declaring function (with __FUNCTION__) or class with array(__CLASS__, __FUNCTION__)
 	* @return bool False if no hook got executed, true otherwise
 	*/
-	function call_hook($definition)
-	{
+	function call_hook($definition) {
 		$class = (!is_array($definition)) ? '__global' : $definition[0];
 		$function = (!is_array($definition)) ? $definition : $definition[1];
 
@@ -128,8 +123,7 @@ 
 			if (isset($this->hooks[$class][$function]['standalone']))
 			{
 				$this->hook_result[$class][$function] = call_user_func_array($this->hooks[$class][$function]['standalone'], $arguments);
-			}
-			else
+			} else
 			{
 				foreach (array('first', 'normal', 'last') as $mode)
 				{
@@ -159,8 +153,7 @@ 
 	* @param mixed $definition Declaring function (with __FUNCTION__) or class with array(__CLASS__, __FUNCTION__)
 	* @return mixed False if nothing returned if there is no result, else array('result' => ... )
 	*/
-	function previous_hook_result($definition)
-	{
+	function previous_hook_result($definition) {
 		$class = (!is_array($definition)) ? '__global' : $definition[0];
 		$function = (!is_array($definition)) ? $definition : $definition[1];
 
@@ -178,8 +171,7 @@ 
 	* @param mixed $definition Declaring function (with __FUNCTION__) or class with array(__CLASS__, __FUNCTION__)
 	* @return bool True if results are there, false if not
 	*/
-	function hook_return($definition)
-	{
+	function hook_return($definition) {
 		$class = (!is_array($definition)) ? '__global' : $definition[0];
 		$function = (!is_array($definition)) ? $definition : $definition[1];
 
@@ -197,8 +189,7 @@ 
 	* @param mixed $definition Declaring function (with __FUNCTION__) or class with array(__CLASS__, __FUNCTION__)
 	* @return mixed The result
 	*/
-	function hook_return_result($definition)
-	{
+	function hook_return_result($definition) {
 		$class = (!is_array($definition)) ? '__global' : $definition[0];
 		$function = (!is_array($definition)) ? $definition : $definition[1];
 
@@ -217,8 +208,7 @@ 
 	*
 	* @param mixed $definition Declaring function (with __FUNCTION__) or class with array(__CLASS__, __FUNCTION__)
 	*/
-	function add_hook($definition)
-	{
+	function add_hook($definition) {
 		if (!is_array($definition))
 		{
 			$definition = array('__global', $definition);
@@ -232,8 +222,7 @@ 
 	*
 	* @param mixed $definition Declaring function (with __FUNCTION__) or class with array(__CLASS__, __FUNCTION__)
 	*/
-	function remove_hook($definition)
-	{
+	function remove_hook($definition) {
 		$class = (!is_array($definition)) ? '__global' : $definition[0];
 		$function = (!is_array($definition)) ? $definition : $definition[1];
 

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

@@ -37,7 +37,7 @@ 
 	/**
 	* internal pointer
 	*/
-	var $current_hook = NULL;
+	var $current_hook = null;
 
 	/**
 	* Initialize hook class.
@@ -114,7 +114,7 @@ 
 		if (!empty($this->hooks[$class][$function]))
 		{
 			// Developer tries to call a hooked function within the hooked function...
-			if ($this->current_hook !== NULL && $this->current_hook['class'] === $class && $this->current_hook['function'] === $function)
+			if ($this->current_hook !== null && $this->current_hook['class'] === $class && $this->current_hook['function'] === $function)
 			{
 				return false;
 			}
@@ -145,11 +145,11 @@ 
 				}
 			}
 
-			$this->current_hook = NULL;
+			$this->current_hook = null;
 			return true;
 		}
 
-		$this->current_hook = NULL;
+		$this->current_hook = null;
 		return false;
 	}
 

admin/includes/admin_planet_edit.inc.php

Spacing +6 added lines, -6 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-function admin_planet_edit_mode(&$template, &$admin_planet_edit_mode_list){return sn_function_call('admin_planet_edit_mode', array(&$template, &$admin_planet_edit_mode_list));}
+function admin_planet_edit_mode(&$template, &$admin_planet_edit_mode_list) {return sn_function_call('admin_planet_edit_mode', array(&$template, &$admin_planet_edit_mode_list)); }
 function sn_admin_planet_edit_mode(&$template, &$admin_planet_edit_mode_list)
 {
   global $lang;
@@ -19,7 +19,7 @@ 
   return $mode;
 }
 
-function admin_planet_edit_template(&$template, $edit_planet_row, $mode){return sn_function_call('admin_planet_edit_template', array(&$template, $edit_planet_row, $mode));}
+function admin_planet_edit_template(&$template, $edit_planet_row, $mode) {return sn_function_call('admin_planet_edit_template', array(&$template, $edit_planet_row, $mode)); }
 /**
  * @param template $template
  * @param $edit_planet_row
@@ -30,13 +30,13 @@ 
   global $lang;
 
   $unit_list = sn_get_groups($mode);
-  if(empty($unit_list))
+  if (empty($unit_list))
   {
     return;
   }
   $name_list = $lang['tech'];
 
-  foreach($unit_list as $unit_id)
+  foreach ($unit_list as $unit_id)
   {
     $template->assign_block_vars('unit', array(
       'ID'    => $unit_id,
@@ -47,10 +47,10 @@ 
   }
 }
 
-function admin_planet_edit_query_string($unit_id, $unit_amount, $mode){return sn_function_call('admin_planet_edit_query_string', array($unit_id, $unit_amount, $mode));}
+function admin_planet_edit_query_string($unit_id, $unit_amount, $mode) {return sn_function_call('admin_planet_edit_query_string', array($unit_id, $unit_amount, $mode)); }
 function sn_admin_planet_edit_query_string($unit_id, $unit_amount, $mode)
 {
-  if($unit_amount && in_array($unit_id, sn_get_groups($mode)))
+  if ($unit_amount && in_array($unit_id, sn_get_groups($mode)))
   {
     $unit_amount = round($unit_amount);
     $unit_name = get_unit_param($unit_id, P_NAME);

Braces +4 added lines, -8 removed lines

@@ -1,8 +1,7 @@ 
 <?php
 
 function admin_planet_edit_mode(&$template, &$admin_planet_edit_mode_list){return sn_function_call('admin_planet_edit_mode', array(&$template, &$admin_planet_edit_mode_list));}
-function sn_admin_planet_edit_mode(&$template, &$admin_planet_edit_mode_list)
-{
+function sn_admin_planet_edit_mode(&$template, &$admin_planet_edit_mode_list) {
   global $lang;
 
   $admin_planet_edit_mode_list = array_merge(isset($admin_planet_edit_mode_list) ? $admin_planet_edit_mode_list : array(), array(
@@ -25,8 +24,7 @@ 
  * @param $edit_planet_row
  * @param $mode
  */
-function sn_admin_planet_edit_template(&$template, $edit_planet_row, $mode)
-{
+function sn_admin_planet_edit_template(&$template, $edit_planet_row, $mode) {
   global $lang;
 
   $unit_list = sn_get_groups($mode);
@@ -48,15 +46,13 @@ 
 }
 
 function admin_planet_edit_query_string($unit_id, $unit_amount, $mode){return sn_function_call('admin_planet_edit_query_string', array($unit_id, $unit_amount, $mode));}
-function sn_admin_planet_edit_query_string($unit_id, $unit_amount, $mode)
-{
+function sn_admin_planet_edit_query_string($unit_id, $unit_amount, $mode) {
   if($unit_amount && in_array($unit_id, sn_get_groups($mode)))
   {
     $unit_amount = round($unit_amount);
     $unit_name = get_unit_param($unit_id, P_NAME);
     $result = "{$unit_name} = GREATEST(0, {$unit_name} + ({$unit_amount}))";
-  }
-  else
+  } else
   {
     $result = '';
   }

includes/includes/market_fleeter.inc

Spacing +26 added lines, -26 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if(!defined('SN_IN_MARKET') || SN_IN_MARKET !== true) {
+if (!defined('SN_IN_MARKET') || SN_IN_MARKET !== true) {
   $debug->error("Attempt to call market page mode {$mode} directly - not from market.php", 'Forbidden', 403);
 }
 
@@ -12,8 +12,8 @@ 
   'rpg_cost' => $rpg_cost,
 ));
 
-if(is_array($shipList)) {
-  if(mrc_get_level($user, null, RES_DARK_MATTER) < $rpg_cost) {
+if (is_array($shipList)) {
+  if (mrc_get_level($user, null, RES_DARK_MATTER) < $rpg_cost) {
     $intError = MARKET_NO_DM;
   }
 
@@ -30,30 +30,30 @@ 
   $qry = array();
   $total = array();
   $db_changeset = array();
-  foreach($shipList as $shipID => &$shipCount) {
+  foreach ($shipList as $shipID => &$shipCount) {
     $shipCount = ceil(floatval($shipCount));
-    if(!$shipCount) {
+    if (!$shipCount) {
       continue;
     }
 
-    if($shipCount < 0) {
+    if ($shipCount < 0) {
       $debug->warning('User supplied negative ship count on Black Market page', 'Hack Attempt', 307);
       $intError = MARKET_NEGATIVE_SHIPS;
       break;
     }
 
-    if($mode == MARKET_SCRAPPER) {
+    if ($mode == MARKET_SCRAPPER) {
       $amount = mrc_get_level($user, $planetrow, $shipID, true, true); // $planetrow[get_unit_param($shipID, P_NAME)];
-    } elseif($mode == MARKET_STOCKMAN) {
+    } elseif ($mode == MARKET_STOCKMAN) {
       $amount = $stock[$shipID];
     }
 
-    if($amount < $shipCount) {
+    if ($amount < $shipCount) {
       $intError = $error_no_stock;
       break;
     }
 
-    if(!in_array($shipID, sn_get_groups('fleet'))) {
+    if (!in_array($shipID, sn_get_groups('fleet'))) {
       $debug->warning('Hack Attempt', 'User supplied non-ship unit ID on Black Market page', 306);
       $intError = MARKET_NOT_A_SHIP;
       break;
@@ -69,16 +69,16 @@ 
     $resTemp[RES_CRYSTAL] = floor($build_data[BUILD_CREATE][RES_CRYSTAL] * $shipCount * $config_rpg_scrape_crystal * (-$multiplier));
     $resTemp[RES_DEUTERIUM] = floor($build_data[BUILD_CREATE][RES_DEUTERIUM] * $shipCount * $config_rpg_scrape_deuterium * (-$multiplier));
 
-    foreach($resTemp as $resID => $resCount) {
+    foreach ($resTemp as $resID => $resCount) {
       $total[$resID] += $resCount;
     }
 
     $message .= "<li>{$lang['tech'][$shipID]}: " . HelperString::numberFloorAndFormat($shipCount);
   }
 
-  if($mode == MARKET_STOCKMAN && $intError == MARKET_DEAL) {
-    foreach($total as $resID => $resCount) {
-      if(mrc_get_level($user, $planetrow, $resID, true, true) < -$resCount) {
+  if ($mode == MARKET_STOCKMAN && $intError == MARKET_DEAL) {
+    foreach ($total as $resID => $resCount) {
+      if (mrc_get_level($user, $planetrow, $resID, true, true) < -$resCount) {
         $intError = MARKET_NO_RESOURCES;
         $debug->warning('Trying to use bug in s/h market', 'S/H Ship Market', 301);
         break;
@@ -88,10 +88,10 @@ 
 
   $intError = ($intError == MARKET_DEAL) && (array_sum($total) == 0) ? $error_zero_res : $intError;
 
-  if($intError == MARKET_DEAL) {
+  if ($intError == MARKET_DEAL) {
     $message .= '</ul>' . $lang["eco_mrk_{$submode}_res"] . '<ul>';
-    foreach($total as $resID => $resCount) {
-      if(!$resCount) {
+    foreach ($total as $resID => $resCount) {
+      if (!$resCount) {
         continue;
       }
 
@@ -125,38 +125,38 @@ 
       'MESSAGE' => $lang['eco_mrk_errors'][$intError],
     ));
 
-    foreach($shipList as $shipID => $shipCount) {
+    foreach ($shipList as $shipID => $shipCount) {
       $data['ships'][$shipID] = max(0, intval($shipCount));
     }
   }
 }
 $message = '';
 
-if(!$config->eco_stockman_fleet && $config->eco_stockman_fleet_populate) {
-  $config->db_saveItem('eco_stockman_fleet', sys_unit_arr2str(array_map(function($item){return mt_rand(1, 1000);}, sn_get_groups('fleet'))));
+if (!$config->eco_stockman_fleet && $config->eco_stockman_fleet_populate) {
+  $config->db_saveItem('eco_stockman_fleet', sys_unit_arr2str(array_map(function($item) {return mt_rand(1, 1000); }, sn_get_groups('fleet'))));
 }
 
 tpl_set_resource_info($template, $planetrow, array());
 
-if(!$array) {
+if (!$array) {
   $array = array();
 }
 
 $group_fleet = sn_get_groups('fleet');
-foreach($array as $key => $value) {
-  if($mode == MARKET_SCRAPPER) {
+foreach ($array as $key => $value) {
+  if ($mode == MARKET_SCRAPPER) {
     $shipID = $value;
     $amount = mrc_get_level($user, $planetrow, $shipID, false, true); // $planetrow[get_unit_param($shipID, P_NAME)];
-  } elseif($mode == MARKET_STOCKMAN) {
+  } elseif ($mode == MARKET_STOCKMAN) {
     $shipID = $key;
     $amount = $value;
   }
 
-  if(!in_array($shipID, $group_fleet)) {
+  if (!in_array($shipID, $group_fleet)) {
     continue;
   }
 
-  if($amount > 0) {
+  if ($amount > 0) {
     $build_data = eco_get_build_data($user, $planetrow, $shipID);
     $template->assign_block_vars('ships', array(
       'ID'        => $shipID,