supernova-ws / SuperNova

includes/functions/_deprecated.php

Spacing +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
  * @return mixed
  * @deprecated
  */
-function RestoreFleetToPlanet(&$fleet_row, $start = true, $only_resources = false, $safe_fleet = false){return sn_function_call('RestoreFleetToPlanet', array(&$fleet_row, $start, $only_resources, $safe_fleet, &$result));}
+function RestoreFleetToPlanet(&$fleet_row, $start = true, $only_resources = false, $safe_fleet = false) {return sn_function_call('RestoreFleetToPlanet', array(&$fleet_row, $start, $only_resources, $safe_fleet, &$result)); }
 /**
  * @param array $fleet_row
  * @param bool  $start

includes/pages/chat.php

Braces +7 added lines, -14 removed lines

@@ -4,8 +4,7 @@ 
  *
  */
 
-function sn_chat_model()
-{
+function sn_chat_model() {
   global $config, $user, $template_result, $lang;
 
   $config->array_set('users', $user['id'], 'chat_last_activity', SN_TIME_MICRO);
@@ -44,15 +43,13 @@ 
 
   $template_result['PAGE_HEADER'] = $page_title;
 }
-function sn_chat_view($template = null)
-{
+function sn_chat_view($template = null) {
   $template = gettemplate('chat_body', $template);
 
   return $template;
 }
 
-function sn_chat_add_model()
-{
+function sn_chat_add_model() {
   global $config, $user;
 
   define('IN_AJAX', true);
@@ -76,8 +73,7 @@ 
 
   die();
 }
-function sn_chat_msg_view($template = null)
-{
+function sn_chat_msg_view($template = null) {
   global $config, $user, $lang;
 
   define('IN_AJAX', true);
@@ -99,8 +95,7 @@ 
       'TIME' => date(FMT_DATE_TIME, htmlentities(SN_CLIENT_TIME_LOCAL, ENT_QUOTES, 'utf-8')),
       'DISABLE' => true,
     );
-  }
-  else
+  } else
   {
     $alliance = sys_get_param_str('ally') && $user['ally_id'] ? $user['ally_id'] : 0;
 
@@ -121,8 +116,7 @@ 
       }
 
       $page = min($page_count, max(0, sys_get_param_int('sheet')));
-    }
-    else
+    } else
     {
       $last_message = sys_get_param_id('last_message');
       $where_add = $last_message ? "AND `messageid` > {$last_message}" : '';
@@ -171,8 +165,7 @@ 
   {
     $pageTitle = "{$lang['chat_history']} - {$lang[$alliance ? 'chat_ally' : 'chat_common']}";
     display($template, $pageTitle);
-  }
-  else
+  } else
   {
     $result['last_message'] = $last_message;
     $result['html'] = templateRenderToHtml($template);

Spacing +12 added lines, -12 removed lines

@@ -14,7 +14,7 @@ 
   $user_auth_level = isset($user['authlevel']) ? $user['authlevel'] : AUTH_LEVEL_ANONYMOUS;
 
   $mode = sys_get_param_int('mode');
-  switch($mode)
+  switch ($mode)
   {
     case CHAT_MODE_ALLY:
       $template_result['ALLY'] = intval($user['ally_id']);
@@ -28,12 +28,12 @@ 
   }
 
   $template_result['.']['smiles'] = array();
-  foreach(SN::$gc->design->getSmilesList() as $auth_level => $replaces) {
-    if($auth_level > $user_auth_level) {
+  foreach (SN::$gc->design->getSmilesList() as $auth_level => $replaces) {
+    if ($auth_level > $user_auth_level) {
       continue;
     }
 
-    foreach($replaces as $bbcode => $filename)
+    foreach ($replaces as $bbcode => $filename)
     {
       $template_result['.']['smiles'][] = array(
         'BBCODE' => $bbcode,
@@ -57,12 +57,12 @@ 
 
   define('IN_AJAX', true);
 
-  if($config->getMode() != classCache::CACHER_NO_CACHE && $config->chat_timeout && SN_TIME_MICRO - $config->array_get('users', $user['id'], 'chat_last_activity') > $config->chat_timeout)
+  if ($config->getMode() != classCache::CACHER_NO_CACHE && $config->chat_timeout && SN_TIME_MICRO - $config->array_get('users', $user['id'], 'chat_last_activity') > $config->chat_timeout)
   {
     die();
   }
 
-  if(($message = sys_get_param_str('message')) && $user['username'])
+  if (($message = sys_get_param_str('message')) && $user['username'])
   {
     $ally_id = sys_get_param('ally') && $user['ally_id'] ? $user['ally_id'] : 0;
     $nick = db_escape(player_nick_compact(player_nick_render_current_to_array($user, array('color' => true, 'icons' => true, 'ally' => !$ally_id))));
@@ -87,7 +87,7 @@ 
   define('IN_AJAX', true);
 
   $history = sys_get_param_str('history');
-  if(!$history)
+  if (!$history)
   {
     $config->array_set('users', $user['id'], 'chat_last_refresh', SN_TIME_MICRO);
   }
@@ -96,7 +96,7 @@ 
   $last_message = '';
   $alliance = 0;
   $template_result['.']['chat'] = array();
-  if(!$history && $config->getMode() != classCache::CACHER_NO_CACHE && $config->chat_timeout && SN_TIME_MICRO - $config->array_get('users', $user['id'], 'chat_last_activity') > $config->chat_timeout)
+  if (!$history && $config->getMode() != classCache::CACHER_NO_CACHE && $config->chat_timeout && SN_TIME_MICRO - $config->array_get('users', $user['id'], 'chat_last_activity') > $config->chat_timeout)
   {
     $result['disable'] = true;
     $template_result['.']['chat'][] = array(
@@ -112,12 +112,12 @@ 
 
     $where_add = '';
     $last_message = 0;
-    if($history)
+    if ($history)
     {
       $rows = doquery("SELECT count(1) AS CNT FROM {{chat}} WHERE ally_id = '{$alliance}';", true);
       $page_count = ceil($rows['CNT'] / $page_limit);
 
-      for($i = 0; $i < $page_count; $i++)
+      for ($i = 0; $i < $page_count; $i++)
       {
         $template_result['.']['page'][] = array(
           'NUMBER' => $i
@@ -139,7 +139,7 @@ 
         {{chat}} AS c
         LEFT JOIN {{users}} AS u ON u.id = c.chat_message_sender_id
       WHERE c.chat_message_recipient_id IS NULL AND c.ally_id = '{$alliance}' {$where_add} ORDER BY messageid DESC LIMIT {$start_row}, {$page_limit};");
-    while($chat_row = db_fetch($query))
+    while ($chat_row = db_fetch($query))
     {
       // Little magik here - to retain HTML codes from DB and stripping HTML codes from nick
       $chat_row['user'] = player_nick_render_to_html($chat_row['user']);
@@ -168,7 +168,7 @@ 
   $template = gettemplate('chat_messages', $template);
   $template->assign_recursive($template_result);
 
-  if($history)
+  if ($history)
   {
     $pageTitle = "{$lang['chat_history']} - {$lang[$alliance ? 'chat_ally' : 'chat_common']}";
     display($template, $pageTitle);

classes/HelperArray.php

Spacing +6 added lines, -6 removed lines

@@ -240,7 +240,7 @@ 
    * @return array
    */
   public static function parseParamStrings($array, $delimiter = '=') {
-    !is_array($array) ? $array = array((string)$array) : false;
+    !is_array($array) ? $array = array((string) $array) : false;
 
     $result = array();
     foreach ($array as $param) {
@@ -262,8 +262,8 @@ 
    * @return float|null
    */
   public static function maxValueByField(&$array, $fieldName) {
-    return array_reduce($array, function ($carry, $item) use ($fieldName) {
-      if(is_array($item) && isset($item[$fieldName]) && (!isset($carry) || $carry < $item[$fieldName])) {
+    return array_reduce($array, function($carry, $item) use ($fieldName) {
+      if (is_array($item) && isset($item[$fieldName]) && (!isset($carry) || $carry < $item[$fieldName])) {
         $carry = $item[$fieldName];
       }
 
@@ -280,8 +280,8 @@ 
 
     return
       array_reduce($array,
-        function ($carry, $item) use (&$fieldName, $maxValue) {
-          if(is_array($item) && isset($item[$fieldName]) && $item[$fieldName] == $maxValue) {
+        function($carry, $item) use (&$fieldName, $maxValue) {
+          if (is_array($item) && isset($item[$fieldName]) && $item[$fieldName] == $maxValue) {
             $carry[] = $item;
           }
 
@@ -292,7 +292,7 @@ 
   }
 
   public static function intersectByKeys(array &$array1, array &$array2) {
-    return array_uintersect_assoc($array1, $array2, function ($a, $b) {return 0;});
+    return array_uintersect_assoc($array1, $array2, function($a, $b) {return 0; });
   }
 
 }

classes/DBAL/Schema.php

Spacing +6 added lines, -6 removed lines

@@ -52,11 +52,11 @@ 
 
     $prefix_length = strlen($this->db->db_prefix);
 
-    while($row = $this->db->db_fetch($query)) {
-      foreach($row as $table_name) {
+    while ($row = $this->db->db_fetch($query)) {
+      foreach ($row as $table_name) {
         $this->tablesAll[$table_name] = $table_name;
 
-        if(strpos($table_name, $this->db->db_prefix) === 0) {
+        if (strpos($table_name, $this->db->db_prefix) === 0) {
           $table_name_sn = substr($table_name, $prefix_length);
           $this->tablesSn[$table_name_sn] = $table_name_sn;
         }
@@ -70,7 +70,7 @@ 
    * @return \string[]
    */
   public function getAllTables() {
-    if(!isset($this->tablesAll)) {
+    if (!isset($this->tablesAll)) {
       $this->loadTableNamesFromDb();
     }
 
@@ -83,7 +83,7 @@ 
    * @return string[]
    */
   public function getSnTables() {
-    if(!isset($this->tablesSn)) {
+    if (!isset($this->tablesSn)) {
       $this->loadTableNamesFromDb();
     }
 
@@ -107,7 +107,7 @@ 
    * @return TableSchema
    */
   public function getTableSchema($tableName) {
-    if(empty($this->tableSchemas[$tableName])) {
+    if (empty($this->tableSchemas[$tableName])) {
       $this->tableSchemas[$tableName] = new TableSchema($tableName, $this);
     }
 

classes/Core/Repository.php

Indentation +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
    */
   protected $_repository;
 
- /**
+  /**
    * @var ContainerPlus $_oldRepo
    */
   protected $_oldRepo;

Spacing +1 added lines, -1 removed lines

@@ -86,7 +86,7 @@
 
   public function get($entityClass, $id) {
     $entityIndex = get_class($entityClass) . '\\' . $id;
-    if(!isset($this->_repository[$entityIndex])) {
+    if (!isset($this->_repository[$entityIndex])) {
 
     }
 

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

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

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 = '';
   }