supernova-ws / SuperNova

classes/DBStaticPlanet.php

Spacing +12 added lines, -13 removed lines

@@ -39,8 +39,7 @@ 
     $galaxy = isset($vector[$prefix . 'galaxy']) ? intval($vector[$prefix . 'galaxy']) : 0;
     $system = isset($vector[$prefix . 'system']) ? intval($vector[$prefix . 'system']) : 0;
     $planet = isset($vector[$prefix . 'planet']) ? intval($vector[$prefix . 'planet']) : 0;
-    $planet_type = isset($vector[$prefix . 'planet_type']) ? intval($vector[$prefix . 'planet_type']) :
-      (isset($vector[$prefix . 'type']) ? intval($vector[$prefix . 'type']) : 0);
+    $planet_type = isset($vector[$prefix . 'planet_type']) ? intval($vector[$prefix . 'planet_type']) : (isset($vector[$prefix . 'type']) ? intval($vector[$prefix . 'type']) : 0);
     $planet_type = $planet_type == PT_DEBRIS ? PT_PLANET : $planet_type;
 
     return DBStaticPlanet::db_planet_by_gspt_safe($galaxy, $system, $planet, $planet_type, $for_update, $fields);
@@ -61,7 +60,7 @@ 
 //  }
 
   public static function db_planet_by_parent($parent_id, $for_update = false, $fields = '*') {
-    if(!($parent_id = idval($parent_id))) {
+    if (!($parent_id = idval($parent_id))) {
       return false;
     }
 
@@ -70,7 +69,7 @@ 
   }
 
   public static function db_planet_by_id_and_owner($planet_id, $owner_id, $for_update = false, $fields = '*') {
-    if(!($planet_id = idval($planet_id)) || !($owner_id = idval($owner_id))) {
+    if (!($planet_id = idval($planet_id)) || !($owner_id = idval($owner_id))) {
       return false;
     }
     return classSupernova::db_get_record_list(LOC_PLANET,
@@ -79,7 +78,7 @@ 
 
 
   public static function db_planet_list_moon_other($user_id, $this_moon_id) {
-    if(!($user_id = idval($user_id)) || !($this_moon_id = idval($this_moon_id))) {
+    if (!($user_id = idval($user_id)) || !($this_moon_id = idval($this_moon_id))) {
       return false;
     }
     return classSupernova::db_get_record_list(LOC_PLANET,
@@ -94,7 +93,7 @@ 
   }
 
   public static function db_planet_list_sorted($user_row, $skip_planet_id = false, $field_list = '', $conditions = '') {
-    if(!is_array($user_row)) {
+    if (!is_array($user_row)) {
       return false;
     }
     $conditions .= $skip_planet_id ? " AND `id` <> {$skip_planet_id} " : '';
@@ -115,7 +114,7 @@ 
   }
 
   public static function db_planet_list_by_user_or_planet($user_id, $planet_id) {
-    if(!($user_id = idval($user_id)) && !($planet_id = idval($planet_id))) {
+    if (!($user_id = idval($user_id)) && !($planet_id = idval($planet_id))) {
       return false;
     }
 
@@ -124,14 +123,14 @@ 
   }
 
   public static function db_planet_set_by_id($planet_id, $set) {
-    if(!($planet_id = idval($planet_id))) {
+    if (!($planet_id = idval($planet_id))) {
       return false;
     }
     return classSupernova::db_upd_record_by_id(LOC_PLANET, $planet_id, $set);
   }
 
   public static function db_planet_set_by_gspt($ui_galaxy, $ui_system, $ui_planet, $ui_planet_type = PT_ALL, $set) {
-    if(!($set = trim($set))) {
+    if (!($set = trim($set))) {
       return false;
     }
 
@@ -144,14 +143,14 @@ 
   }
 
   public static function db_planet_set_by_parent($ui_parent_id, $ss_set) {
-    if(!($si_parent_id = idval($ui_parent_id)) || !($ss_set = trim($ss_set))) {
+    if (!($si_parent_id = idval($ui_parent_id)) || !($ss_set = trim($ss_set))) {
       return false;
     }
     return classSupernova::db_upd_record_list(LOC_PLANET, "`parent_planet` = {$si_parent_id}", $ss_set);
   }
 
   public static function db_planet_set_by_owner($ui_owner_id, $ss_set) {
-    if(!($si_owner_id = idval($ui_owner_id)) || !($ss_set = trim($ss_set))) {
+    if (!($si_owner_id = idval($ui_owner_id)) || !($ss_set = trim($ss_set))) {
       return false;
     }
     return classSupernova::db_upd_record_list(LOC_PLANET, "`id_owner` = {$si_owner_id}", $ss_set);
@@ -159,7 +158,7 @@ 
 
 
   public static function db_planet_delete_by_id($planet_id) {
-    if(!($planet_id = idval($planet_id))) {
+    if (!($planet_id = idval($planet_id))) {
       return false;
     }
     classSupernova::db_del_record_by_id(LOC_PLANET, $planet_id);
@@ -169,7 +168,7 @@ 
   }
 
   public static function db_planet_list_delete_by_owner($ui_owner_id) {
-    if(!($si_owner_id = idval($ui_owner_id))) {
+    if (!($si_owner_id = idval($ui_owner_id))) {
       return false;
     }
     classSupernova::db_del_record_list(LOC_PLANET, "`id_owner` = {$si_owner_id}");

classes/classLocale.php

Spacing +43 added lines, -43 removed lines

@@ -28,13 +28,13 @@ 
 
     $this->container = array();
 
-    if(classSupernova::$cache->getMode() != classCache::CACHER_NO_CACHE && !classSupernova::$config->locale_cache_disable) {
+    if (classSupernova::$cache->getMode() != classCache::CACHER_NO_CACHE && !classSupernova::$config->locale_cache_disable) {
       $this->cache = classSupernova::$cache;
       classSupernova::log_file('locale.__constructor: Cache is present');
 //$this->cache->unset_by_prefix($this->cache_prefix); // TODO - remove? 'cause debug!
     }
 
-    if($enable_stat_usage && empty($this->stat_usage)) {
+    if ($enable_stat_usage && empty($this->stat_usage)) {
       $this->enable_stat_usage = $enable_stat_usage;
       $this->usage_stat_load();
       // TODO shutdown function
@@ -60,9 +60,9 @@ 
     unset($fallback[$this->active]);
 
     // Проходим по оставшимся локалям
-    foreach($fallback as $try_language) {
+    foreach ($fallback as $try_language) {
       // Если нет такой строки - пытаемся вытащить из кэша
-      if(!isset($this->container[$try_language][$offset]) && $this->cache) {
+      if (!isset($this->container[$try_language][$offset]) && $this->cache) {
         $this->container[$try_language][$offset] = $this->cache->__get($this->cache_prefix . $try_language . '_' . $offset);
 // Записываем результат работы кэша
 $locale_cache_statistic['queries']++;
@@ -71,7 +71,7 @@ 
       }
 
       // Если мы как-то где-то нашли строку...
-      if(isset($this->container[$try_language][$offset])) {
+      if (isset($this->container[$try_language][$offset])) {
         // ...значит она получена в результате фоллбэка и записываем её в кэш и контейнер
         $this[$offset] = $this->container[$try_language][$offset];
         $locale_cache_statistic['fallbacks']++;
@@ -85,15 +85,15 @@ 
       $this->container[$this->active][] = $value;
     } else {
       $this->container[$this->active][$offset] = $value;
-      if($this->cache) {
+      if ($this->cache) {
         $this->cache->__set($this->cache_prefix_lang . $offset, $value);
       }
     }
   }
   public function offsetExists($offset) {
     // Шорткат если у нас уже есть строка в памяти PHP
-    if(!isset($this->container[$this->active][$offset])) {
-      if(!$this->cache || !($this->container[$this->active][$offset] = $this->cache->__get($this->cache_prefix_lang . $offset))) {
+    if (!isset($this->container[$this->active][$offset])) {
+      if (!$this->cache || !($this->container[$this->active][$offset] = $this->cache->__get($this->cache_prefix_lang . $offset))) {
         // Если нету такой строки - делаем фоллбэк
         $this->locale_string_fallback($offset);
       }
@@ -107,7 +107,7 @@ 
   }
   public function offsetGet($offset) {
     $value = $this->offsetExists($offset) ? $this->container[$this->active][$offset] : null;
-    if($this->enable_stat_usage) {
+    if ($this->enable_stat_usage) {
       $this->usage_stat_log($offset, $value);
     }
     return $value;
@@ -124,24 +124,24 @@ 
   public function usage_stat_load() {
     global $sn_cache;
 
-    $this->stat_usage = $sn_cache->lng_stat_usage  = array(); // TODO for debug
-    if(empty($this->stat_usage)) {
+    $this->stat_usage = $sn_cache->lng_stat_usage = array(); // TODO for debug
+    if (empty($this->stat_usage)) {
       $query = doquery("SELECT * FROM {{lng_usage_stat}}");
-      while($row = db_fetch($query)) {
+      while ($row = db_fetch($query)) {
         $this->stat_usage[$row['lang_code'] . ':' . $row['string_id'] . ':' . $row['file'] . ':' . $row['line']] = $row['is_empty'];
       }
     }
   }
   public function usage_stat_save() {
-    if(!empty($this->stat_usage_new)) {
+    if (!empty($this->stat_usage_new)) {
       global $sn_cache;
       $sn_cache->lng_stat_usage = $this->stat_usage;
       doquery("SELECT 1 FROM {{lng_usage_stat}} LIMIT 1");
-      foreach($this->stat_usage_new as &$value) {
-        foreach($value as &$value2) {
+      foreach ($this->stat_usage_new as &$value) {
+        foreach ($value as &$value2) {
           $value2 = '"' . db_escape($value2) . '"';
         }
-        $value = '(' . implode(',', $value) .')';
+        $value = '(' . implode(',', $value) . ')';
       }
       doquery("REPLACE INTO {{lng_usage_stat}} (lang_code,string_id,`file`,line,is_empty,locale) VALUES " . implode(',', $this->stat_usage_new));
     }
@@ -154,7 +154,7 @@ 
     $file = str_replace('\\', '/', substr($trace[1]['file'], strlen(SN_ROOT_PHYSICAL) - 1));
 
     $string_id = $this->active . ':' . $offset . ':' . $file . ':' . $trace[1]['line'];
-    if(!isset($this->stat_usage[$string_id]) || $this->stat_usage[$string_id] != $empty) {
+    if (!isset($this->stat_usage[$string_id]) || $this->stat_usage[$string_id] != $empty) {
       $this->stat_usage[$string_id] = empty($value);
       $this->stat_usage_new[] = array(
         'lang_code' => $this->active,
@@ -194,11 +194,11 @@ 
     $cache_file_key = $this->cache_prefix_lang . '__' . $filename;
 
     // Подключен ли внешний кэш?
-    if($this->cache) {
+    if ($this->cache) {
       // Загружен ли уже данный файл?
       $cache_file_status = $this->cache->__get($cache_file_key);
       classSupernova::log_file("locale.include: Cache - '{$filename}' has key '{$cache_file_key}' and is " . ($cache_file_status ? 'already loaded - EXIT' : 'EMPTY'), $cache_file_status ? -1 : 0);
-      if($cache_file_status) {
+      if ($cache_file_status) {
         // Если да - повторять загрузку нет смысла
         return null;
       }
@@ -212,35 +212,35 @@ 
     $this->make_fallback($language);
 
     $file_path = '';
-    foreach($this->fallback as $lang_try) {
-      if(!$lang_try /* || isset($language_tried[$lang_try]) */) {
+    foreach ($this->fallback as $lang_try) {
+      if (!$lang_try /* || isset($language_tried[$lang_try]) */) {
         continue;
       }
 
-      if($file_path = $this->lng_try_filepath($path, "language/{$lang_try}/{$filename_ext}")) {
+      if ($file_path = $this->lng_try_filepath($path, "language/{$lang_try}/{$filename_ext}")) {
         break;
       }
 
-      if($file_path = $this->lng_try_filepath($path, "language/{$filename}_{$lang_try}{$ext}")) {
+      if ($file_path = $this->lng_try_filepath($path, "language/{$filename}_{$lang_try}{$ext}")) {
         break;
       }
 
       $file_path = '';
     }
 
-    if($file_path) {
+    if ($file_path) {
       include($file_path);
 
-      if(!empty($a_lang_array)) {
+      if (!empty($a_lang_array)) {
         $this->merge($a_lang_array);
 
         // Загрузка данных из файла в кэш
-        if($this->cache) {
+        if ($this->cache) {
           classSupernova::log_file("Locale: loading '{$filename}' into cache");
-          foreach($a_lang_array as $key => $value) {
+          foreach ($a_lang_array as $key => $value) {
             $value_cache_key = $this->cache_prefix_lang . $key;
-            if($this->cache->__isset($value_cache_key)) {
-              if(is_array($value)) {
+            if ($this->cache->__isset($value_cache_key)) {
+              if (is_array($value)) {
                 $alt_value = $this->cache->__get($value_cache_key);
                 $value = array_replace_recursive($alt_value, $value);
               }
@@ -250,7 +250,7 @@ 
         }
       }
 
-      if($this->cache) {
+      if ($this->cache) {
         $this->cache->__set($cache_file_key, true);
       }
 
@@ -263,14 +263,14 @@ 
   }
 
   public function lng_load_i18n($i18n) {
-    if(!isset($i18n)) {
+    if (!isset($i18n)) {
       return;
     }
 
-    foreach($i18n as $i18n_data) {
-      if(is_string($i18n_data)) {
+    foreach ($i18n as $i18n_data) {
+      if (is_string($i18n_data)) {
         $this->lng_include($i18n_data);
-      } elseif(is_array($i18n_data)) {
+      } elseif (is_array($i18n_data)) {
         $this->lng_include($i18n_data['file'], $i18n_data['path']);
       }
     }
@@ -288,7 +288,7 @@ 
 
     classSupernova::log_file("locale.switch: Trying to switch language to '{$language_new}'");
 
-    if($language_new == $this->active) {
+    if ($language_new == $this->active) {
       classSupernova::log_file("locale.switch: New language '{$language_new}' is equal to current language '{$this->active}' - EXIT", -1);
       return false;
     }
@@ -299,10 +299,10 @@ 
     $this['LANG_INFO'] = $this->lng_get_info($this->active);
     $this->make_fallback($this->active);
 
-    if($this->cache) {
+    if ($this->cache) {
       $cache_lang_init_status = $this->cache->__get($this->cache_prefix_lang . '__INIT');
       classSupernova::log_file("locale.switch: Cache for '{$this->active}' prefixed '{$this->cache_prefix_lang}' is " . ($cache_lang_init_status ? 'already loaded. Doing nothing - EXIT' : 'EMPTY'), $cache_lang_init_status ? -1 : 0);
-      if($cache_lang_init_status) {
+      if ($cache_lang_init_status) {
         return false;
       }
 
@@ -318,7 +318,7 @@ 
     // Loading global language files
     $this->lng_load_i18n($sn_mvc['i18n']['']);
 
-    if($this->cache) {
+    if ($this->cache) {
       classSupernova::log_file("locale.switch: Cache - setting flag " . $this->cache_prefix_lang . '__INIT');
       $this->cache->__set($this->cache_prefix_lang . '__INIT', true);
     }
@@ -332,7 +332,7 @@ 
   public function lng_get_info($entry) {
     $file_name = SN_ROOT_PHYSICAL . 'language/' . $entry . '/language.mo.php';
     $lang_info = array();
-    if(file_exists($file_name)) {
+    if (file_exists($file_name)) {
       include($file_name);
     }
 
@@ -340,15 +340,15 @@ 
   }
 
   public function lng_get_list() {
-    if(empty($this->lang_list)) {
+    if (empty($this->lang_list)) {
       $this->lang_list = array();
 
       $path = SN_ROOT_PHYSICAL . 'language/';
       $dir = dir($path);
-      while(false !== ($entry = $dir->read())) {
-        if(is_dir($path . $entry) && $entry[0] != '.') {
+      while (false !== ($entry = $dir->read())) {
+        if (is_dir($path . $entry) && $entry[0] != '.') {
           $lang_info = $this->lng_get_info($entry);
-          if($lang_info['LANG_NAME_ISO2'] == $entry) {
+          if ($lang_info['LANG_NAME_ISO2'] == $entry) {
             $this->lang_list[$lang_info['LANG_NAME_ISO2']] = $lang_info;
           }
         }

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/Core/Autoloader.php

Spacing +6 added lines, -6 removed lines

@@ -20,11 +20,11 @@ 
    */
   public static function autoloader($class) {
     $classFile = str_replace('\\', '/', $class);
-    foreach(static::$folders as $folder) {
+    foreach (static::$folders as $folder) {
       $classFullFileName = str_replace('\\', '/', $folder . $classFile) . DOT_PHP_EX;
-      if(file_exists($classFullFileName) && is_file($classFullFileName)) {
+      if (file_exists($classFullFileName) && is_file($classFullFileName)) {
         require_once($classFullFileName);
-        if(method_exists($class, '_constructorStatic')) {
+        if (method_exists($class, '_constructorStatic')) {
           $class::_constructorStatic();
         }
       }
@@ -35,20 +35,20 @@ 
    * @param string $absoluteClassRoot - absolute path to root class folder
    */
   public static function register($absoluteClassRoot) {
-    if(!static::$autoloaderRegistered) {
+    if (!static::$autoloaderRegistered) {
       spl_autoload_register(array(__CLASS__, 'autoloader'));
       static::$autoloaderRegistered = true;
     }
 
     $absoluteClassRoot = str_replace('\\', '/', $absoluteClassRoot);
 
-    if(!($absoluteClassRoot = realpath($absoluteClassRoot))) {
+    if (!($absoluteClassRoot = realpath($absoluteClassRoot))) {
       return;
     }
 
     $absoluteClassRoot = str_replace('\\', '/', $absoluteClassRoot) . '/';
 
-    if(!isset(static::$folders[$absoluteClassRoot])) {
+    if (!isset(static::$folders[$absoluteClassRoot])) {
       static::$folders[$absoluteClassRoot] = $absoluteClassRoot;
     }
   }

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/functions/sys_user.php

Spacing +22 added lines, -22 removed lines

@@ -9,7 +9,7 @@ 
 function sys_user_vacation($user) {
   global $config;
 
-  if(sys_get_param_str('vacation') == 'leave') {
+  if (sys_get_param_str('vacation') == 'leave') {
     if ($user['vacation'] < SN_TIME_NOW) {
       $user['vacation'] = 0;
       $user['vacation_next'] = SN_TIME_NOW + $config->player_vacation_timeout;
@@ -17,7 +17,7 @@ 
     }
   }
 
-  if($user['vacation']) {
+  if ($user['vacation']) {
     // sn_sys_logout(false, true);
     // core_auth::logout(false, true);
 
@@ -52,33 +52,33 @@ 
   // TODO: Full rewrite
   sn_db_transaction_start();
   $TheUser = db_user_by_id($UserID);
-  if ( $TheUser['ally_id'] != 0 ) {
-    $TheAlly = doquery ( "SELECT * FROM `{{alliance}}` WHERE `id` = '" . $TheUser['ally_id'] . "';", '', true );
+  if ($TheUser['ally_id'] != 0) {
+    $TheAlly = doquery("SELECT * FROM `{{alliance}}` WHERE `id` = '" . $TheUser['ally_id'] . "';", '', true);
     $TheAlly['ally_members'] -= 1;
-    if ( $TheAlly['ally_members'] > 0 ) {
-      doquery ( "UPDATE `{{alliance}}` SET `ally_members` = '" . $TheAlly['ally_members'] . "' WHERE `id` = '" . $TheAlly['id'] . "';");
+    if ($TheAlly['ally_members'] > 0) {
+      doquery("UPDATE `{{alliance}}` SET `ally_members` = '" . $TheAlly['ally_members'] . "' WHERE `id` = '" . $TheAlly['id'] . "';");
     } else {
-      doquery ( "DELETE FROM `{{alliance}}` WHERE `id` = '" . $TheAlly['id'] . "';");
-      doquery ( "DELETE FROM `{{statpoints}}` WHERE `stat_type` = '2' AND `id_owner` = '" . $TheAlly['id'] . "';");
+      doquery("DELETE FROM `{{alliance}}` WHERE `id` = '" . $TheAlly['id'] . "';");
+      doquery("DELETE FROM `{{statpoints}}` WHERE `stat_type` = '2' AND `id_owner` = '" . $TheAlly['id'] . "';");
     }
   }
-  doquery ( "DELETE FROM `{{statpoints}}` WHERE `stat_type` = '1' AND `id_owner` = '" . $UserID . "';");
+  doquery("DELETE FROM `{{statpoints}}` WHERE `stat_type` = '1' AND `id_owner` = '" . $UserID . "';");
 
   DBStaticPlanet::db_planet_list_delete_by_owner($UserID);
 
-  doquery ( "DELETE FROM `{{messages}}` WHERE `message_sender` = '" . $UserID . "';");
-  doquery ( "DELETE FROM `{{messages}}` WHERE `message_owner` = '" . $UserID . "';");
-  doquery ( "DELETE FROM `{{notes}}` WHERE `owner` = '" . $UserID . "';");
+  doquery("DELETE FROM `{{messages}}` WHERE `message_sender` = '" . $UserID . "';");
+  doquery("DELETE FROM `{{messages}}` WHERE `message_owner` = '" . $UserID . "';");
+  doquery("DELETE FROM `{{notes}}` WHERE `owner` = '" . $UserID . "';");
   db_fleet_list_delete_by_owner($UserID);
 //  doquery ( "DELETE FROM `{{rw}}` WHERE `id_owner1` = '" . $UserID . "';");
 //  doquery ( "DELETE FROM `{{rw}}` WHERE `id_owner2` = '" . $UserID . "';");
-  doquery ( "DELETE FROM `{{buddy}}` WHERE `BUDDY_SENDER_ID` = '" . $UserID . "';");
-  doquery ( "DELETE FROM `{{buddy}}` WHERE `BUDDY_OWNER_ID` = '" . $UserID . "';");
-  doquery ( "DELETE FROM `{{annonce}}` WHERE `user` = '" . $UserID . "';");
+  doquery("DELETE FROM `{{buddy}}` WHERE `BUDDY_SENDER_ID` = '" . $UserID . "';");
+  doquery("DELETE FROM `{{buddy}}` WHERE `BUDDY_OWNER_ID` = '" . $UserID . "';");
+  doquery("DELETE FROM `{{annonce}}` WHERE `user` = '" . $UserID . "';");
 
 
   classSupernova::db_del_record_by_id(LOC_USER, $UserID);
-  doquery ( "DELETE FROM `{{referrals}}` WHERE (`id` = '{$UserID}') OR (`id_partner` = '{$UserID}');");
+  doquery("DELETE FROM `{{referrals}}` WHERE (`id` = '{$UserID}') OR (`id_partner` = '{$UserID}');");
   global $config;
   $config->db_saveItem('users_amount', $config->db_loadItem('users_amount') - 1);
   sn_db_transaction_commit();
@@ -180,7 +180,7 @@ 
   \DBAL\DbQuery::build()->setTable('users')->setValues($field_set)->doInsert();
   $user_new = db_user_by_id(db_insert_id());
 
-  if(!($options['galaxy'] && $options['system'] && $options['planet'])) {
+  if (!($options['galaxy'] && $options['system'] && $options['planet'])) {
     $options['galaxy'] = $config->LastSettedGalaxyPos;
     $options['system'] = $config->LastSettedSystemPos;
     $segment_size = floor($config->game_maxPlanet / 3);
@@ -188,19 +188,19 @@ 
     $segment++;
     $options['planet'] = mt_rand(1 + $segment * $segment_size, ($segment + 1) * $segment_size);
 
-    while(true) {
-      if($options['planet'] > $config->game_maxPlanet) {
+    while (true) {
+      if ($options['planet'] > $config->game_maxPlanet) {
         $options['planet'] = mt_rand(0, $segment_size - 1) + 1;
         $options['system']++;
       }
-      if($options['system'] > $config->game_maxSystem) {
+      if ($options['system'] > $config->game_maxSystem) {
         $options['system'] = 1;
         $options['galaxy']++;
       }
       $options['galaxy'] > $config->game_maxGalaxy ? $options['galaxy'] = 1 : false;
 
       $galaxy_row = DBStaticPlanet::db_planet_by_gspt($options['galaxy'], $options['system'], $options['planet'], PT_PLANET, true, 'id');
-      if(!$galaxy_row['id']) {
+      if (!$galaxy_row['id']) {
         $config->db_saveItem(array(
           'LastSettedGalaxyPos' => $options['galaxy'],
           'LastSettedSystemPos' => $options['system'],
@@ -223,7 +223,7 @@ 
   $username_safe = db_escape($username_unsafe);
   doquery("REPLACE INTO {{player_name_history}} SET `player_id` = {$user_new['id']}, `player_name` = '{$username_safe}'");
 
-  if(!empty($options['partner_id']) && ($referral_row = db_user_by_id($options['partner_id'], true))) {
+  if (!empty($options['partner_id']) && ($referral_row = db_user_by_id($options['partner_id'], true))) {
     doquery("INSERT INTO {{referrals}} SET `id` = {$user_new['id']}, `id_partner` = {$options['partner_id']}");
   }
 

includes/pages/chat.php

Spacing +13 added lines, -13 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(classSupernova::$gc->design->getSmilesList() as $auth_level => $replaces) {
-    if($auth_level > $user_auth_level) {
+  foreach (classSupernova::$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))));
@@ -83,7 +83,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);
   }
@@ -92,7 +92,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(
@@ -108,12 +108,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
@@ -135,13 +135,13 @@ 
         {{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']);
       $nick_stripped = htmlentities(strip_tags($chat_row['user']), ENT_QUOTES, 'utf-8');
       $nick = str_replace(strip_tags($chat_row['user']), $nick_stripped, $chat_row['user']);
-      if(!$history)
+      if (!$history)
       {
         $nick = "<span style=\"cursor: pointer;\" onclick=\"addSmiley('({$nick_stripped})');\">{$nick}</span>";
       }
@@ -167,7 +167,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; });
   }
 
 }