supernova-ws / SuperNova

classes/Universe/Universe.php

Spacing +2 added lines, -2 removed lines

@@ -8,8 +8,8 @@
   const MOON_MIN_SIZE = 1100;
   const MOON_MAX_SIZE = 8999;
 
-  const MOON_DEBRIS_MIN = 1000000;    // Minimum amount of debris to span a moon
-  const MOON_CHANCE_MIN_PERCENT = 1;  // Minimum chance to span a moon
+  const MOON_DEBRIS_MIN = 1000000; // Minimum amount of debris to span a moon
+  const MOON_CHANCE_MIN_PERCENT = 1; // Minimum chance to span a moon
   const MOON_CHANCE_MAX_PERCENT = 30; // Maximum chance to span a moon
 
   /**

includes/includes/market_fleeter.inc

Spacing +26 added lines, -26 removed lines

@@ -3,7 +3,7 @@ 
 use DBAL\OldDbChangeSet;
 use Planet\DBStaticPlanet;
 
-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);
 }
 
@@ -15,8 +15,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;
   }
 
@@ -33,30 +33,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;
@@ -72,16 +72,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;
@@ -91,10 +91,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;
       }
 
@@ -128,38 +128,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,

classes/General/Helpers/URLHelper.php

Spacing +1 added lines, -1 removed lines

@@ -19,7 +19,7 @@
       }
     }
 
-    if(!empty($paramList)) {
+    if (!empty($paramList)) {
       $strParams = implode('&', $paramList);
     }
 

classes/Common/Pimple/Container.php

Spacing +1 added lines, -1 removed lines

@@ -239,7 +239,7 @@
 
         $factory = $this->values[$id];
 
-        $extended = function ($c) use ($callable, $factory) {
+        $extended = function($c) use ($callable, $factory) {
             return $callable($factory($c), $c);
         };
 

classes/template_compile.php

Spacing +14 added lines, -14 removed lines

@@ -141,9 +141,9 @@ 
 
     preg_match_all('#<!-- INCLUDE (\{\$?[A-Z0-9\-_]+\}|[a-zA-Z0-9\_\-\+\./]+) -->#', $code, $matches);
     $include_blocks = $matches[1];
-    if($include_blocks)
+    if ($include_blocks)
     {
-      foreach($include_blocks as &$included_file)
+      foreach ($include_blocks as &$included_file)
       {
         $included_file .= '.tpl.html';
       }
@@ -308,7 +308,7 @@ 
       $varname = $var_val[3];
       $new = $this->generate_block_varref($namespace, $varname, $var_val[2]);
 
-      if(!empty($var_val[4])) {
+      if (!empty($var_val[4])) {
         $new = \Ptl\PtlVariableDecorator::decorate($var_val[0], $new, $this->template);
       }
 
@@ -462,8 +462,8 @@ 
 
     $tag_template_php .= 'for ($_' . $tag_args . '_i = ' . $loop_start . '; $_' . $tag_args . '_i < ' . $loop_end . '; ++$_' . $tag_args . '_i){';
 //    $tag_template_php .= '$this->_block_counter["'. $tag_args . '"] = $_' . $tag_args . '_i;';
-    $tag_template_php .= '$_'. $tag_args . '_val = &' . $varref . '[$_'. $tag_args. '_i];';
-    $tag_template_php .= '$this->_block_value["'. $tag_args . '"] = &' . $varref . '[$_'. $tag_args. '_i];';
+    $tag_template_php .= '$_' . $tag_args . '_val = &' . $varref . '[$_' . $tag_args . '_i];';
+    $tag_template_php .= '$this->_block_value["' . $tag_args . '"] = &' . $varref . '[$_' . $tag_args . '_i];';
 
     return $tag_template_php;
   }
@@ -567,10 +567,10 @@ 
         break;
 
         case 'is':
-          $is_arg_start = ($tokens[$i-1] == ')') ? array_pop($is_arg_stack) : $i-1;
+          $is_arg_start = ($tokens[$i - 1] == ')') ? array_pop($is_arg_stack) : $i - 1;
           $is_arg = implode(' ', array_slice($tokens, $is_arg_start, $i - $is_arg_start));
 
-          $new_tokens = $this->_parse_is_expr($is_arg, array_slice($tokens, $i+1));
+          $new_tokens = $this->_parse_is_expr($is_arg, array_slice($tokens, $i + 1));
 
           array_splice($tokens, $is_arg_start, sizeof($tokens), $new_tokens);
 
@@ -834,11 +834,11 @@ 
     }
     else if ($include_last_iterator)
     {
-      return '$_'. $blocks[$blockcount] . '_val';
+      return '$_' . $blocks[$blockcount] . '_val';
     }
     else
     {
-      return '$_'. $blocks[$blockcount - 1] . '_val[\''. $blocks[$blockcount]. '\']';
+      return '$_' . $blocks[$blockcount - 1] . '_val[\'' . $blocks[$blockcount] . '\']';
     }
   }
 
@@ -855,7 +855,7 @@ 
     if ($fp = @fopen($filename, 'wb'))
     {
       @flock($fp, LOCK_EX);
-      @fwrite ($fp, $data);
+      @fwrite($fp, $data);
       @flock($fp, LOCK_UN);
       @fclose($fp);
 
@@ -873,7 +873,7 @@ 
   */
   function minify($html)
   {
-    if(!SN::$config->tpl_minifier)
+    if (!SN::$config->tpl_minifier)
     {
       return $html;
     }
@@ -885,14 +885,14 @@ 
     //$html = preg_replace('/[\r\n\t]+/', ' ', $html);
     $html = preg_replace('/>[\s]*</', '><', $html); // Strip spacechars between tags
     $html = preg_replace('/[\s]+/', ' ', $html); // Replace several spacechars with one space
-    if(!empty($pre[0]))
+    if (!empty($pre[0]))
     {
-      foreach($pre[0] as $tag)
+      foreach ($pre[0] as $tag)
       {
         $tag = preg_replace('/^\ *\/\/[^\<]*?$/m', ' ', $tag); // Strips comments - except those that contains HTML comment inside
         $tag = preg_replace('/[\ \t]{2,}/', ' ', $tag); // Replace several spaces by one
         $tag = preg_replace('/\s{2,}/', "\r\n", $tag); // Replace several linefeeds by one
-        $html = preg_replace('/#pre#/', $tag, $html,1);
+        $html = preg_replace('/#pre#/', $tag, $html, 1);
       }
     }
 

classes/Pages/Deprecated/PageAdminMining.php

Spacing +3 added lines, -3 removed lines

@@ -29,19 +29,19 @@
         'ID'        => self::PAGE_SORT_BY_RANK,
         'HTML_ID'   => 'byTotalRank',
         'HTML_NAME' => '{ byTotalRank }',
-        'SQL_SORT'  => ['u.total_rank',],
+        'SQL_SORT'  => ['u.total_rank', ],
       ],
       self::PAGE_SORT_BY_ID => [
         'ID'        => self::PAGE_SORT_BY_ID,
         'HTML_ID'   => 'byId',
         'HTML_NAME' => '{ byId }',
-        'SQL_SORT'  => ['u.id',],
+        'SQL_SORT'  => ['u.id', ],
       ],
       self::PAGE_SORT_BY_NAME => [
         'ID'        => self::PAGE_SORT_BY_NAME,
         'HTML_ID'   => 'byName',
         'HTML_NAME' => '{ byName }',
-        'SQL_SORT'  => ['u.username',],
+        'SQL_SORT'  => ['u.username', ],
       ],
 
       self::PAGE_SORT_BY_POINTS => [

classes/Pages/Deprecated/PageAdminModules.php

Spacing +2 added lines, -2 removed lines

@@ -13,8 +13,8 @@
   const SORT_BY_ACTIVITY = 1;
 
   private static $sorting = [
-    self::SORT_BY_PACKAGE  => ['PACKAGE', 'NAME', '!ACTIVE', '!INSTALLED',],
-    self::SORT_BY_ACTIVITY => ['!ACTIVE', '!INSTALLED', 'PACKAGE', 'NAME',],
+    self::SORT_BY_PACKAGE  => ['PACKAGE', 'NAME', '!ACTIVE', '!INSTALLED', ],
+    self::SORT_BY_ACTIVITY => ['!ACTIVE', '!INSTALLED', 'PACKAGE', 'NAME', ],
   ];
 
   private static $sortFields = [];

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 Strategy 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,
     ));

includes/functions/uni_functions.php

Spacing +1 added lines, -2 removed lines

@@ -96,8 +96,7 @@
 
   $core_info = uni_create_planet_get_density($position_data, $user_row, $planet_sectors);
 
-  $planet_name_unsafe = !empty($options['force_name']) ? $options['force_name'] :
-    ($user_row['username'] . ' ' . (
+  $planet_name_unsafe = !empty($options['force_name']) ? $options['force_name'] : ($user_row['username'] . ' ' . (
       $HomeWorld
         ? SN::$lang['sys_capital']
         : ($planet_name_unsafe ? $planet_name_unsafe : SN::$lang['sys_colo_defaultname'])