supernova-ws / SuperNova

admin/adm_planet_list.php

Spacing +4 added lines, -5 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
-define('INSIDE'  , true);
-define('INSTALL' , false);
+define('INSIDE', true);
+define('INSTALL', false);
 define('IN_ADMIN', true);
 
 require('../common.' . substr(strrchr(__FILE__, '.'), 1));
@@ -11,7 +11,7 @@ 
 messageBoxAdminAccessDenied(AUTH_LEVEL_ADMINISTRATOR);
 
 $planet_active = sys_get_param_int('planet_active');
-if(!$planet_active) {
+if (!$planet_active) {
   $planet_type = sys_get_param_int('planet_type', 1);
   $planet_type = $planet_type == 3 ? 3 : 1;
 } else {
@@ -40,8 +40,7 @@ 
 
 $page_title = 
   $lang['adm_planet_list_title'] . ': ' . 
-  ($planet_active ? $lang['adm_planet_active'] :
-    ($planet_type ? ($planet_type == 3 ? $lang['sys_moons'] : $lang['sys_planets']) : '')
+  ($planet_active ? $lang['adm_planet_active'] : ($planet_type ? ($planet_type == 3 ? $lang['sys_moons'] : $lang['sys_planets']) : '')
   );
 $template->assign_vars(array(
   'PAGE_TITLE' => $page_title,

admin/statbuilder.php

Braces +1 added lines, -2 removed lines

@@ -37,8 +37,7 @@
   </script>';
 
   messageBoxAdmin("{$script}<img src=\"design/images/progressbar.gif\"><br>{$lang['sys_wait']}", $lang['adm_stat_title'], '', 0);
-}
-else
+} else
 {
   messageBoxAdmin($lang['adm_stat_already_started'], $lang['adm_stat_title'], 'admin/overview.php');
 }

Spacing +3 added lines, -3 removed lines

@@ -9,8 +9,8 @@ 
  * @copyright 2008 by Chlorel for XNova
  */
 
-define('INSIDE'  , true);
-define('INSTALL' , false);
+define('INSIDE', true);
+define('INSTALL', false);
 define('IN_ADMIN', true);
 require_once('../common.' . substr(strrchr(__FILE__, '.'), 1));
 
@@ -18,7 +18,7 @@ 
 
 messageBoxAdminAccessDenied(AUTH_LEVEL_ADMINISTRATOR);
 
-if(SN_TIME_NOW >= SN::$config->pass()->var_stat_update_admin_forced && SN_TIME_NOW >= SN::$config->pass()->var_stat_update_end)
+if (SN_TIME_NOW >= SN::$config->pass()->var_stat_update_admin_forced && SN_TIME_NOW >= SN::$config->pass()->var_stat_update_end)
 {
   SN::$config->pass()->var_stat_update_admin_forced = SN_TIME_NOW + 120;
 

classes/Core/Watchdog.php

Spacing +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
     $configValue = $forceLoad ? $this->config->db_loadItem($configName) : $this->config[$configName];
     $configType == WATCHDOG_TIME_SQL ? $configValue = strtotime($configValue, SN_TIME_NOW) : false;
 
-    if(SN_TIME_NOW - $configValue > $timeDiff) {
+    if (SN_TIME_NOW - $configValue > $timeDiff) {
       $callable();
     }
 

classes/classPersistent.php

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

@@ -91,7 +91,7 @@ 
     $this->db_saveItem(array_combine(array_keys($this->defaults), array_fill(0, count($this->defaults), null)));
   }
 
-  public function db_saveItem($item_list, $value = NULL) {
+  public function db_saveItem($item_list, $value = null) {
     if(empty($item_list)) {
       return;
     }
@@ -102,7 +102,7 @@ 
     $qry = array();
     foreach($item_list as $item_name => $item_value) {
       if($item_name) {
-        $item_value = db_escape($item_value === NULL ? $this->$item_name : $item_value);
+        $item_value = db_escape($item_value === null ? $this->$item_name : $item_value);
         $item_name = db_escape($item_name);
         $qry[] = "('{$item_name}', '{$item_value}')";
       }

Spacing +12 added lines, -12 removed lines

@@ -33,7 +33,7 @@ 
     $this->sql_index_field = "{$table_name}_name";
     $this->sql_value_field = "{$table_name}_value";
 
-    if(!$this->_DB_LOADED) {
+    if (!$this->_DB_LOADED) {
       $this->db_loadAll();
     }
   }
@@ -53,10 +53,10 @@ 
    */
   public function db_loadItem($index) {
     $result = null;
-    if($index) {
+    if ($index) {
       $index_safe = db_escape($index);
       $queryResult = doquery("SELECT `{$this->sql_value_field}` FROM `{{{$this->table_name}}}` WHERE `{$this->sql_index_field}` = '{$index_safe}' FOR UPDATE", true);
-      if(is_array($queryResult) && !empty($queryResult)) {
+      if (is_array($queryResult) && !empty($queryResult)) {
         $this->$index = $result = $queryResult[$this->sql_value_field];
       }
     }
@@ -68,7 +68,7 @@ 
     $this->loadDefaults();
 
     $query = doquery("SELECT * FROM {{{$this->table_name}}} FOR UPDATE;");
-    while($row = db_fetch($query)) {
+    while ($row = db_fetch($query)) {
       $this->$row[$this->sql_index_field] = $row[$this->sql_value_field];
     }
 
@@ -76,7 +76,7 @@ 
   }
 
   public function loadDefaults() {
-    foreach($this->defaults as $defName => $defValue) {
+    foreach ($this->defaults as $defName => $defValue) {
       $this->$defName = $defValue;
     }
   }
@@ -92,7 +92,7 @@ 
   }
 
   public function db_saveItem($item_list, $value = NULL) {
-    if(empty($item_list)) {
+    if (empty($item_list)) {
       return;
     }
 
@@ -100,8 +100,8 @@ 
 
     // Сначала записываем данные в базу - что бы поймать все блокировки
     $qry = array();
-    foreach($item_list as $item_name => $item_value) {
-      if($item_name) {
+    foreach ($item_list as $item_name => $item_value) {
+      if ($item_name) {
         $item_value = db_escape($item_value === NULL ? $this->$item_name : $item_value);
         $item_name = db_escape($item_name);
         $qry[] = "('{$item_name}', '{$item_value}')";
@@ -110,8 +110,8 @@ 
     doquery("REPLACE INTO `{{" . $this->table_name . "}}` (`{$this->sql_index_field}`, `{$this->sql_value_field}`) VALUES " . implode(',', $qry) . ";");
 
     // И только после взятия блокировок - меняем значения в кэше
-    foreach($item_list as $item_name => $item_value) {
-      if($item_name && $item_value !== null) {
+    foreach ($item_list as $item_name => $item_value) {
+      if ($item_name && $item_value !== null) {
         $this->__set($item_name, $item_value);
       }
     }
@@ -126,7 +126,7 @@ 
   }
 
   public function __get($name) {
-    if($this->force) {
+    if ($this->force) {
       $this->force = false;
       $this->db_loadItem($name);
     }
@@ -135,7 +135,7 @@ 
   }
 
   public function __set($name, $value) {
-    if($this->force) {
+    if ($this->force) {
       $this->force = false;
       $this->db_saveItem($name, $value);
     }

includes/alliance/ali_internal_admin_rights.inc

Spacing +8 added lines, -8 removed lines

@@ -2,7 +2,7 @@ 
 
 global $lang, $debug;
 
-if(!defined('SN_IN_ALLY') || SN_IN_ALLY !== true)
+if (!defined('SN_IN_ALLY') || SN_IN_ALLY !== true)
 {
   $debug->error("Attempt to call ALLIANCE page mode {$mode} directly - not from alliance.php", 'Forbidden', 403);
 }
@@ -15,7 +15,7 @@ 
 
 if ($new_rank_name = sys_get_param_str('newRankName'))
 {
-  foreach($ally_rights as $fieldName)
+  foreach ($ally_rights as $fieldName)
   {
     $newRank[$fieldName] = 0;
   }
@@ -28,9 +28,9 @@ 
 {
   unset($ranks);
 
-  foreach($rankListInput as $rankID => $rank)
+  foreach ($rankListInput as $rankID => $rank)
   {
-    foreach($ally_rights as $rightName)
+    foreach ($ally_rights as $rightName)
     {
       $ranks[$rankID][$rightName] = $rank[$rightName] ? 1 : 0;
     }
@@ -41,7 +41,7 @@ 
 $d = sys_get_param_int('d');
 if ($d && isset($ranks[$d]))
 {
-  if(count($ranks) == 1)
+  if (count($ranks) == 1)
   {
     messageBox($lang['ali_adm_lastRank'], $lang['ali_adm_rights_title']);
   }
@@ -53,16 +53,16 @@ 
 
 if (count($ranks))
 {
-  foreach($ranks as $rankID => $rank)
+  foreach ($ranks as $rankID => $rank)
   {
     $rank_data = array(
       'ID'   => $rankID,
       'NAME' => $rank['name'],
     );
 
-    for($i = 1; $i < count($rank); $i++)
+    for ($i = 1; $i < count($rank); $i++)
     {
-      $rank_data['R' . $i] = (($rank[$ally_rights[$i]] == 1) ? ' checked' : '') ;
+      $rank_data['R' . $i] = (($rank[$ally_rights[$i]] == 1) ? ' checked' : '');
       $rank_data['N' . $i] = $ally_rights[$i];
     }
 

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