supernova-ws / SuperNova

jumpgate.php

Spacing +20 added lines, -20 removed lines

@@ -10,34 +10,34 @@ 
  * @copyright 2008 By Chlorel for XNova
  */
 
-include('common.' . substr(strrchr(__FILE__, '.'), 1));
+include('common.'.substr(strrchr(__FILE__, '.'), 1));
 
 lng_include('fleet');
 
-if($TargetPlanet = sys_get_param_id('jmpto'))
+if ($TargetPlanet = sys_get_param_id('jmpto'))
 {
   sn_db_transaction_start();
   DBStaticUser::db_user_by_id($user['id'], true, 'id');
   $planetrow = DBStaticPlanet::db_planet_by_id($planetrow['id'], true);
-  if(!($NextJumpTime = uni_get_time_to_jump($planetrow)))
+  if (!($NextJumpTime = uni_get_time_to_jump($planetrow)))
   {
     $TargetGate = DBStaticPlanet::db_planet_by_id($TargetPlanet, true, '`id`, `last_jump_time`');
-    if(mrc_get_level($user, $TargetGate, STRUC_MOON_GATE) > 0)
+    if (mrc_get_level($user, $TargetGate, STRUC_MOON_GATE) > 0)
     {
-      $NextDestTime = uni_get_time_to_jump ( $TargetGate );
-      if(!$NextDestTime)
+      $NextDestTime = uni_get_time_to_jump($TargetGate);
+      if (!$NextDestTime)
       {
         $ship_list = sys_get_param('ships');
         $jumpMade = false;
-        foreach($ship_list as $ship_id => $ship_count)
+        foreach ($ship_list as $ship_id => $ship_count)
         {
-          if(!in_array($ship_id, Fleet::$snGroupFleet))
+          if (!in_array($ship_id, Fleet::$snGroupFleet))
           {
             continue;
           }
 
           $ship_count = max(0, min(floor($ship_count), mrc_get_level($user, $planetrow, $ship_id)));
-          if($ship_count)
+          if ($ship_count)
           {
             $jumpMade = true;
             DBStaticUnit::dbUpdateOrInsertUnit($ship_id, -$ship_count, $user, $planetrow['id']);
@@ -45,39 +45,39 @@ 
           }
         }
         // Dit monsieur, y avait quelque chose a envoyer ???
-        if($jumpMade)
+        if ($jumpMade)
         {
-          DBStaticPlanet::db_planet_update_set_by_id_DEPRECATED($TargetGate['id'], "`last_jump_time` = " . SN_TIME_NOW . "");
-          DBStaticPlanet::db_planet_update_set_by_id_DEPRECATED($planetrow['id'], "`last_jump_time` = " . SN_TIME_NOW . "");
+          DBStaticPlanet::db_planet_update_set_by_id_DEPRECATED($TargetGate['id'], "`last_jump_time` = ".SN_TIME_NOW."");
+          DBStaticPlanet::db_planet_update_set_by_id_DEPRECATED($planetrow['id'], "`last_jump_time` = ".SN_TIME_NOW."");
 
           DBStaticUser::db_user_set_by_id_DEPRECATED($user['id'], "`current_planet` = '{$TargetGate['id']}'");
 
           $planetrow['last_jump_time'] = SN_TIME_NOW;
-          $RetMessage = classLocale::$lang['gate_jump_done'] ." - ". pretty_time(uni_get_time_to_jump($planetrow));
+          $RetMessage = classLocale::$lang['gate_jump_done']." - ".pretty_time(uni_get_time_to_jump($planetrow));
         } else {
           $RetMessage = classLocale::$lang['gate_wait_data'];
         }
       } else {
-        $RetMessage = classLocale::$lang['gate_wait_dest'] ." - ". pretty_time($NextDestTime);
+        $RetMessage = classLocale::$lang['gate_wait_dest']." - ".pretty_time($NextDestTime);
       }
     } else {
       $RetMessage = classLocale::$lang['gate_no_dest_g'];
     }
   } else {
-    $RetMessage = classLocale::$lang['gate_wait_star'] ." - ". pretty_time($NextJumpTime);
+    $RetMessage = classLocale::$lang['gate_wait_star']." - ".pretty_time($NextJumpTime);
   }
   sn_db_transaction_commit();
   message($RetMessage, classLocale::$lang['tech'][STRUC_MOON_GATE], "jumpgate.php", 10);
 } else {
   $template = gettemplate('jumpgate', true);
-  if(mrc_get_level($user, $planetrow, STRUC_MOON_GATE) > 0)
+  if (mrc_get_level($user, $planetrow, STRUC_MOON_GATE) > 0)
   {
     $Combo = '';
     $MoonList = DBStaticPlanet::db_planet_list_moon_other($user['id'], $planetrow['id']);
     // while($CurMoon = db_fetch($MoonList))
-    foreach($MoonList as $CurMoon)
+    foreach ($MoonList as $CurMoon)
     {
-      if(mrc_get_level($user, $CurMoon, STRUC_MOON_GATE) >= 1)
+      if (mrc_get_level($user, $CurMoon, STRUC_MOON_GATE) >= 1)
       {
         $NextJumpTime = uni_get_time_to_jump($CurMoon);
         $template->assign_block_vars('moon', array(
@@ -91,9 +91,9 @@ 
       }
     }
 
-    foreach(Fleet::$snGroupFleet as $Ship)
+    foreach (Fleet::$snGroupFleet as $Ship)
     {
-      if(($ship_count = mrc_get_level($user, $planetrow, $Ship)) <= 0)
+      if (($ship_count = mrc_get_level($user, $planetrow, $Ship)) <= 0)
       {
         continue;
       }

includes/classes/DBStaticUnit.php

Spacing +15 added lines, -15 removed lines

@@ -24,7 +24,7 @@ 
     }
 
     if (classSupernova::$gc->snCache->isUnitLocatorNotSet($location_type, $location_id)) {
-      $got_data = classSupernova::$gc->cacheOperator->db_get_record_list(LOC_UNIT, "unit_location_type = {$location_type} AND unit_location_id = {$location_id} AND " . DBStaticUnit::db_unit_time_restrictions());
+      $got_data = classSupernova::$gc->cacheOperator->db_get_record_list(LOC_UNIT, "unit_location_type = {$location_type} AND unit_location_id = {$location_id} AND ".DBStaticUnit::db_unit_time_restrictions());
       if (!empty($got_data) && is_array($got_data)) {
         foreach ($got_data as $unit_id => $unit_data) {
           classSupernova::$gc->snCache->setUnitLocatorByLocationAndIDs($location_type, $location_id, $unit_data);
@@ -59,9 +59,9 @@ 
 
   public static function db_unit_count_by_user_and_type_and_snid($user_id, $unit_type = 0, $unit_snid = 0) {
     $query = classSupernova::$db->doSelect(
-      "SELECT unit_snid, sum(unit_level) as `qty`  FROM {{unit}} WHERE `unit_player_id` = {$user_id} " .
-      ($unit_type ? "AND `unit_type` = {$unit_type} " : '') .
-      ($unit_snid ? "AND `unit_snid` = {$unit_snid} " : '') .
+      "SELECT unit_snid, sum(unit_level) as `qty`  FROM {{unit}} WHERE `unit_player_id` = {$user_id} ".
+      ($unit_type ? "AND `unit_type` = {$unit_type} " : '').
+      ($unit_snid ? "AND `unit_snid` = {$unit_snid} " : '').
       'GROUP BY `unit_snid`'
     );
     $result = array();
@@ -81,8 +81,8 @@ 
     WHERE
       f.fleet_owner = {$user_id} AND
       (f.fleet_start_planet_id = {$location_id} OR f.fleet_end_planet_id = {$location_id})
-      AND u.unit_snid = {$unit_snid} AND u.`unit_location_type` = " . LOC_FLEET . " AND " . self::db_unit_time_restrictions() .
-      " LIMIT 1" .
+      AND u.unit_snid = {$unit_snid} AND u.`unit_location_type` = ".LOC_FLEET." AND ".self::db_unit_time_restrictions().
+      " LIMIT 1".
       ($for_update ? ' FOR UPDATE' : ''));
   }
 
@@ -90,7 +90,7 @@ 
   public static function db_unit_list_laboratories($user_id) {
     return classSupernova::$db->doSelect("SELECT DISTINCT unit_location_id AS `id`
     FROM {{unit}}
-    WHERE unit_player_id = {$user_id} AND unit_location_type = " . LOC_PLANET . " AND unit_level > 0 AND unit_snid IN (" . STRUC_LABORATORY . ", " . STRUC_LABORATORY_NANO . ");");
+    WHERE unit_player_id = {$user_id} AND unit_location_type = ".LOC_PLANET." AND unit_level > 0 AND unit_snid IN (".STRUC_LABORATORY.", ".STRUC_LABORATORY_NANO.");");
   }
 
   /**
@@ -136,7 +136,7 @@ 
     return classSupernova::$db->doSelect(
       "SELECT unit_player_id, unit_type, unit_snid, unit_level, count(*) AS unit_amount
     FROM `{{unit}}`
-    WHERE unit_level > 0 AND " . self::db_unit_time_restrictions() .
+    WHERE unit_level > 0 AND " . self::db_unit_time_restrictions().
       " GROUP BY unit_player_id, unit_type, unit_snid, unit_level"
     );
   }
@@ -159,7 +159,7 @@ 
   public static function db_unit_list_admin_delete_mercenaries_finished() {
     return classSupernova::$db->doDeleteDeprecated(TABLE_UNIT, array(
       'unit_time_finish IS NOT NULL',
-      "unit_time_finish < FROM_UNIXTIME(" . SN_TIME_NOW . ")",
+      "unit_time_finish < FROM_UNIXTIME(".SN_TIME_NOW.")",
       'unit_type' => UNIT_MERCENARIES,
     ));
   }
@@ -198,7 +198,7 @@ 
 
     $temp = DBStaticUnit::db_get_unit_by_location($user['id'], $unit_location, $location_id, $unit_id, true, 'unit_id');
     if (!empty($temp['unit_id'])) {
-      $result = (bool)classSupernova::$gc->cacheOperator->db_upd_record_list_NEW(
+      $result = (bool) classSupernova::$gc->cacheOperator->db_upd_record_list_NEW(
         LOC_UNIT,
         array(),
         array(
@@ -211,13 +211,13 @@ 
     } else {
       $locationIdRendered = $unit_location == LOC_USER ? $user['id'] : $planet_id;
       $unitType = get_unit_param($unit_id, P_UNIT_TYPE);
-      $result = (bool)classSupernova::$gc->cacheOperator->db_ins_record(LOC_UNIT, array(
+      $result = (bool) classSupernova::$gc->cacheOperator->db_ins_record(LOC_UNIT, array(
         'unit_player_id'     => $user['id'],
-        'unit_location_type' => (int)$unit_location,
+        'unit_location_type' => (int) $unit_location,
         'unit_location_id'   => $locationIdRendered,
-        'unit_type'          => (int)$unitType,
-        'unit_snid'          => (int)$unit_id,
-        'unit_level'         => (float)$unit_value,
+        'unit_type'          => (int) $unitType,
+        'unit_snid'          => (int) $unit_id,
+        'unit_level'         => (float) $unit_value,
       ));
     }
 

includes/classes/core_auth.php

Spacing +17 added lines, -17 removed lines

@@ -222,7 +222,7 @@ 
       // Проверить наличие такого имени в истории имён
       do {
         sn_db_transaction_rollback();
-        $this->player_suggested_name = 'Emperor ' . mt_rand($max_user_id + 1, $max_user_id + 1000);
+        $this->player_suggested_name = 'Emperor '.mt_rand($max_user_id + 1, $max_user_id + 1000);
         sn_db_transaction_start();
       } while (db_player_name_exists($this->player_suggested_name));
 
@@ -231,7 +231,7 @@ 
     if ($player_name_submitted) {
       $this->register_player_db_create($this->player_suggested_name); // OK 4.5
       if ($this->register_status == LOGIN_SUCCESS) {
-        sys_redirect(SN_ROOT_VIRTUAL . 'overview.php');
+        sys_redirect(SN_ROOT_VIRTUAL.'overview.php');
       } elseif ($this->register_status == REGISTER_ERROR_PLAYER_NAME_EXISTS && $original_suggest == $this->player_suggested_name) {
         // self::$player_suggested_name .= ' ' . $this->account->account_id;
       }
@@ -257,8 +257,8 @@ 
       );
 
     if ($this->register_status == LOGIN_ERROR_USERNAME_RESTRICTED_CHARACTERS) {
-      $prohibited_characters = array_map(function ($value) {
-        return "'" . htmlentities($value, ENT_QUOTES, 'UTF-8') . "'";
+      $prohibited_characters = array_map(function($value) {
+        return "'".htmlentities($value, ENT_QUOTES, 'UTF-8')."'";
       }, str_split(LOGIN_REGISTER_CHARACTERS_PROHIBITED));
       $template_result[F_PLAYER_REGISTER_MESSAGE] .= implode(', ', $prohibited_characters);
     }
@@ -305,7 +305,7 @@ 
 
     foreach ($this->providers as $provider_id => $provider) {
       $login_status = $provider->login(); // OK v4.5
-      self::flog(($provider->manifest['name'] . '->' . 'login_try - ') . (empty($provider->account->account_id) ? classLocale::$lang['sys_login_messages'][$provider->account_login_status] : dump($provider)));
+      self::flog(($provider->manifest['name'].'->'.'login_try - ').(empty($provider->account->account_id) ? classLocale::$lang['sys_login_messages'][$provider->account_login_status] : dump($provider)));
       if ($login_status == LOGIN_SUCCESS && is_object($provider->account) && $provider->account instanceof Account && $provider->account->account_id) {
         $this->providers_authorised[$provider_id] = &$this->providers[$provider_id];
 
@@ -345,7 +345,7 @@ 
         if (!$this->is_player_register) {
           // Нет - отправляем на процесс регистрации
           $partner_id = sys_get_param_int('id_ref', sys_get_param_int('partner_id'));
-          sys_redirect(SN_ROOT_VIRTUAL . 'index.php?page=player_register&player_register=1' . ($partner_id ? '&id_ref=' . $partner_id : ''));
+          sys_redirect(SN_ROOT_VIRTUAL.'index.php?page=player_register&player_register=1'.($partner_id ? '&id_ref='.$partner_id : ''));
         }
       } else {
         // Да, есть доступные игроки, которые так же прописаны в базе
@@ -405,7 +405,7 @@ 
     }
 
     if ($redirect === true) {
-      sys_redirect(SN_ROOT_RELATIVE . (empty($_COOKIE[SN_COOKIE_U]) ? 'login.php' : 'admin/overview.php'));
+      sys_redirect(SN_ROOT_RELATIVE.(empty($_COOKIE[SN_COOKIE_U]) ? 'login.php' : 'admin/overview.php'));
     } elseif ($redirect !== false) {
       sys_redirect($redirect);
     }
@@ -693,7 +693,7 @@ 
         $user['vacation'] = SN_TIME_NOW;
       }
 
-      $user['user_lastip'] = self::$device->ip_v4_string;// $ip['ip'];
+      $user['user_lastip'] = self::$device->ip_v4_string; // $ip['ip'];
       $user['user_proxy'] = self::$device->ip_v4_proxy_chain; //$ip['proxy_chain'];
 
       $result[F_BANNED_STATUS] = $user['banaday'];
@@ -701,9 +701,9 @@ 
 
       $proxy_safe = static::$db->db_escape(self::$device->ip_v4_proxy_chain);
 
-      DBStaticUser::db_user_set_by_id_DEPRECATED($user['id'], "`onlinetime` = " . SN_TIME_NOW . ",
-      `banaday` = " . static::$db->db_escape($user['banaday']) . ", `vacation` = " . static::$db->db_escape($user['vacation']) . ",
-      `user_lastip` = '" . static::$db->db_escape($user['user_lastip']) . "', `user_last_proxy` = '{$proxy_safe}', `user_last_browser_id` = " . self::$device->browser_id
+      DBStaticUser::db_user_set_by_id_DEPRECATED($user['id'], "`onlinetime` = ".SN_TIME_NOW.",
+      `banaday` = " . static::$db->db_escape($user['banaday']).", `vacation` = ".static::$db->db_escape($user['vacation']).",
+      `user_lastip` = '" . static::$db->db_escape($user['user_lastip'])."', `user_last_proxy` = '{$proxy_safe}', `user_last_browser_id` = ".self::$device->browser_id
       );
     }
 
@@ -796,7 +796,7 @@ 
    */
   // OK v4
   public static function password_encode($password, $salt) {
-    return md5($password . $salt);
+    return md5($password.$salt);
   }
   /**
    * Генерирует соль
@@ -822,10 +822,10 @@ 
     }
     list($called, $caller) = debug_backtrace(false);
     $caller_name =
-      (!empty($caller['class']) ? $caller['class'] : '') .
-      (!empty($caller['type']) ? $caller['type'] : '') .
-      (!empty($caller['function']) ? $caller['function'] : '') .
-      (!empty($called['line']) ? ':' . $called['line'] : '');
+      (!empty($caller['class']) ? $caller['class'] : '').
+      (!empty($caller['type']) ? $caller['type'] : '').
+      (!empty($caller['function']) ? $caller['function'] : '').
+      (!empty($called['line']) ? ':'.$called['line'] : '');
 
     $_SERVER['SERVER_NAME'] == 'localhost' ? print("<div class='debug'>$message - $caller_name\r\n</div>") : false;
 
@@ -833,7 +833,7 @@ 
     if ($die) {
       // pdump($caller);
       // pdump(debug_backtrace(false));
-      $die && die("<div class='negative'>СТОП! Функция {$caller_name} при вызове в " . get_called_class() . " (располагается в " . get_class() . "). СООБЩИТЕ АДМИНИСТРАЦИИ!</div>");
+      $die && die("<div class='negative'>СТОП! Функция {$caller_name} при вызове в ".get_called_class()." (располагается в ".get_class()."). СООБЩИТЕ АДМИНИСТРАЦИИ!</div>");
     }
   }
 

includes/classes/DBStaticAlly.php

Spacing +5 added lines, -5 removed lines

@@ -72,12 +72,12 @@
    */
   public static function db_ally_insert($ally_name_unsafe, $ally_tag_unsafe, $userId) {
     $ally = classSupernova::$db->doInsertSet(TABLE_ALLIANCE, array(
-      'ally_name'          => (string)$ally_name_unsafe,
-      'ally_tag'           => (string)$ally_tag_unsafe,
+      'ally_name'          => (string) $ally_name_unsafe,
+      'ally_tag'           => (string) $ally_tag_unsafe,
       'ally_owner'         => $userId,
-      'ally_owner_range'   => (string)classLocale::$lang['ali_leaderRank'],
-      'ally_members'       => (int)1,
-      'ranklist'           => (string)(classLocale::$lang['ali_defaultRankName'] . ",0,0,0,0,0"),
+      'ally_owner_range'   => (string) classLocale::$lang['ali_leaderRank'],
+      'ally_members'       => (int) 1,
+      'ranklist'           => (string) (classLocale::$lang['ali_defaultRankName'].",0,0,0,0,0"),
       'ally_register_time' => SN_TIME_NOW,
     ));
 

includes/classes/DBStaticUser.php

Spacing +11 added lines, -11 removed lines

@@ -23,7 +23,7 @@ 
         ->where('`user_as_ally` IS NULL')
         ->orderBy(array('`id` DESC'));
 
-    return (string)$query->selectValue();
+    return (string) $query->selectValue();
   }
 
   /**
@@ -48,15 +48,15 @@ 
       static::buildDBQ()
         ->field('id')
         ->where("`user_as_ally` IS NULL")
-        ->where("`user_bot` = " . USER_BOT_PLAYER)
+        ->where("`user_bot` = ".USER_BOT_PLAYER)
         ->setForUpdate();
 
     return $query->selectIterator();
   }
 
   public static function db_user_lock_with_target_owner_and_acs($user, $planet = array()) {
-    $query = "SELECT 1 FROM `{{users}}` WHERE `id` = " . idval($user['id']) .
-      (!empty($planet['id_owner']) ? ' OR `id` = ' . idval($planet['id_owner']) : '')
+    $query = "SELECT 1 FROM `{{users}}` WHERE `id` = ".idval($user['id']).
+      (!empty($planet['id_owner']) ? ' OR `id` = '.idval($planet['id_owner']) : '')
       . " FOR UPDATE";
 
     static::getDb()->doSelect($query);
@@ -73,7 +73,7 @@ 
       FROM `{{users}}` 
       WHERE 
         `user_as_ally` IS NULL" .
-        ($online ? ' AND `onlinetime` > ' . (SN_TIME_NOW - classSupernova::$config->game_users_online_timeout) : '')
+        ($online ? ' AND `onlinetime` > '.(SN_TIME_NOW - classSupernova::$config->game_users_online_timeout) : '')
     ));
   }
 
@@ -95,7 +95,7 @@ 
       ->fieldCount('r.id', 'referral_count')
       ->fieldSingleFunction('sum', 'r.dark_matter', 'referral_dm')
       ->join('LEFT JOIN {{referrals}} as r on r.id_partner = u.id')
-      ->where($online ? "`onlinetime` >= " . intval(SN_TIME_NOW - classSupernova::$config->game_users_online_timeout) : 'user_as_ally IS NULL')
+      ->where($online ? "`onlinetime` >= ".intval(SN_TIME_NOW - classSupernova::$config->game_users_online_timeout) : 'user_as_ally IS NULL')
       ->groupBy('u.id')
       ->orderBy("user_as_ally, {$sort} ASC");
 
@@ -113,7 +113,7 @@ 
       ->where('(`user_birthday_celebrated` IS NULL OR DATE_ADD(`user_birthday_celebrated`, INTERVAL 1 YEAR) < CURRENT_DATE)')
       ->where('`user_as_ally` IS NULL')
       ->having('`days_after_birthday` >= 0')
-      ->having('`days_after_birthday` < ' . intval($config_user_birthday_range))
+      ->having('`days_after_birthday` < '.intval($config_user_birthday_range))
       ->setForUpdate();
 
     $result = $query->selectIterator();
@@ -217,7 +217,7 @@ 
       $username_safe = db_escape($like ? strtolower($username_unsafe) : $username_unsafe); // тут на самом деле strtolower() лишняя, но пусть будет
 
       $user = classSupernova::$db->doSelectFetch(
-        "SELECT * FROM {{users}} WHERE `username` " . ($like ? 'LIKE' : '=') . " '{$username_safe}'"
+        "SELECT * FROM {{users}} WHERE `username` ".($like ? 'LIKE' : '=')." '{$username_safe}'"
         . " FOR UPDATE"
       );
       classSupernova::$gc->snCache->cache_set(LOC_USER, $user); // В кэш-юзер так же заполнять индексы
@@ -277,7 +277,7 @@ 
     return classSupernova::$gc->cacheOperator->db_upd_record_list(
       LOC_USER,
       $set,
-      !empty($owners_list) ? '`id` IN (' . implode(',', $owners_list) . ');' : ''
+      !empty($owners_list) ? '`id` IN ('.implode(',', $owners_list).');' : ''
     );
   }
 
@@ -315,7 +315,7 @@ 
    * @param array $playerArray
    */
   public static function renderNameAndCoordinates($playerArray) {
-    return "{$playerArray['username']} " . uni_render_coordinates($playerArray);
+    return "{$playerArray['username']} ".uni_render_coordinates($playerArray);
   }
 
   /**
@@ -349,7 +349,7 @@ 
     foreach ($playerRowFieldChanges as $resourceId => $value) {
       $fields[pname_resource_name($resourceId)] = $value;
     }
-    if(!empty($fields)) {
+    if (!empty($fields)) {
       classSupernova::$gc->db->doUpdateRowAdjust(
         TABLE_USERS,
         array(),

includes/classes/DBStaticPlanet.php

Spacing +8 added lines, -9 removed lines

@@ -55,11 +55,10 @@ 
   }
 
   public static function db_planet_by_vector($vector, $prefix = '', $for_update = false, $fields = '*') {
-    $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);
+    $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 = $planet_type == PT_DEBRIS ? PT_PLANET : $planet_type;
 
     return DBStaticPlanet::db_planet_by_gspt_safe($galaxy, $system, $planet, $planet_type, $for_update, $fields);
@@ -85,7 +84,7 @@ 
     }
 
     return classSupernova::$gc->cacheOperator->db_get_record_list(LOC_PLANET,
-      "`parent_planet` = {$parent_id} AND `planet_type` = " . PT_MOON, true);
+      "`parent_planet` = {$parent_id} AND `planet_type` = ".PT_MOON, true);
   }
 
   public static function db_planet_by_id_and_owner($planet_id, $owner_id, $for_update = false, $fields = '*') {
@@ -106,7 +105,7 @@ 
     }
 
     return classSupernova::$gc->cacheOperator->db_get_record_list(LOC_PLANET,
-      "`planet_type` = " . PT_MOON . " AND `id_owner` = {$user_id} AND `id` != {$this_moon_id}");
+      "`planet_type` = ".PT_MOON." AND `id_owner` = {$user_id} AND `id` != {$this_moon_id}");
   }
 
   public static function db_planet_list_in_system($galaxy, $system) {
@@ -132,7 +131,7 @@ 
     );
     $order_by = classSupernova::$user_options[PLAYER_OPTION_PLANET_SORT];
     empty($sort_orders[$order_by]) ? $order_by = SORT_ID : false;
-    $order_by = $sort_orders[$order_by] . ' ' . (classSupernova::$user_options[PLAYER_OPTION_PLANET_SORT_INVERSE] == SORT_ASCENDING ? 'ASC' : 'DESC');
+    $order_by = $sort_orders[$order_by].' '.(classSupernova::$user_options[PLAYER_OPTION_PLANET_SORT_INVERSE] == SORT_ASCENDING ? 'ASC' : 'DESC');
 
     // Compilating query
     return classSupernova::$gc->cacheOperator->db_get_record_list(LOC_PLANET,
@@ -160,7 +159,7 @@ 
     foreach ($planetRowFieldChanges as $resourceId => $value) {
       $fields[pname_resource_name($resourceId)] = $value;
     }
-    if(!empty($fields)) {
+    if (!empty($fields)) {
       classSupernova::$gc->db->doUpdateRowAdjust(
         TABLE_PLANETS,
         array(),

includes/functions/_news.php

Spacing +15 added lines, -16 removed lines

@@ -11,15 +11,15 @@ 
   $announce_list = DBStaticNews::db_news_list_get_by_query($template, $query_where, $query_limit);
 
   $users = array();
-  while($announce = db_fetch($announce_list)) {
-    if($announce['user_id'] && !isset($users[$announce['user_id']])) {
+  while ($announce = db_fetch($announce_list)) {
+    if ($announce['user_id'] && !isset($users[$announce['user_id']])) {
       $users[$announce['user_id']] = DBStaticUser::db_user_by_id($announce['user_id']);
     }
 
     $survey_vote = array('survey_vote_id' => 1);
     $survey_complete = strtotime($announce['survey_until']) < SN_TIME_NOW;
 
-    if($announce['survey_id'] && !empty($user['id'])) {
+    if ($announce['survey_id'] && !empty($user['id'])) {
       $survey_vote = !$survey_complete ? DBStaticSurveyVote::db_survey_get_vote($announce, $user) : array();
     }
 
@@ -31,8 +31,7 @@ 
       'ANNOUNCE'        => cht_message_parse($announce['strAnnounce'], false, intval($announce['authlevel'])),
       'DETAIL_URL'      => $announce['detail_url'],
       'USER_NAME'       =>
-        isset($users[$announce['user_id']]) && $users[$announce['user_id']] ? player_nick_render_to_html($users[$announce['user_id']], array('color' => true)) :
-          js_safe_string($announce['user_name']),
+        isset($users[$announce['user_id']]) && $users[$announce['user_id']] ? player_nick_render_to_html($users[$announce['user_id']], array('color' => true)) : js_safe_string($announce['user_name']),
       'NEW'             => $announce['unix_time'] + classSupernova::$config->game_news_actual >= SN_TIME_NOW,
       'FUTURE'          => $announce['unix_time'] > SN_TIME_NOW,
       'SURVEY_ID'       => $announce['survey_id'],
@@ -42,25 +41,25 @@ 
       'SURVEY_UNTIL'    => $announce['survey_until'],
     ));
 
-    foreach($announce_exploded as $announce_paragraph) {
+    foreach ($announce_exploded as $announce_paragraph) {
       $template->assign_block_vars('announces.paragraph', array(
         'TEXT' => $announce_paragraph,
       ));
     }
 
-    if($announce['survey_id']) {
+    if ($announce['survey_id']) {
       $survey_query = DBStaticSurveyAnswer::db_survey_get_answer_texts($announce);
       $survey_vote_result = array();
       $total_votes = 0;
-      while($row = db_fetch($survey_query)) {
+      while ($row = db_fetch($survey_query)) {
         $survey_vote_result[] = $row;
         $total_votes += $row['VOTES'];
       }
 
-      if(empty($survey_vote) && !$survey_complete) {
+      if (empty($survey_vote) && !$survey_complete) {
         // Can vote
         $survey_query = DBStaticSurveyAnswer::db_survey_answers_get_list_by_parent($announce);
-        while($row = db_fetch($survey_query)) {
+        while ($row = db_fetch($survey_query)) {
           $template->assign_block_vars('announces.survey_answers', array(
             'ID'   => $row['survey_answer_id'],
             'TEXT' => $row['survey_answer_text'],
@@ -68,7 +67,7 @@ 
         }
       } else {
         // Show result
-        foreach($survey_vote_result as &$vote_result) {
+        foreach ($survey_vote_result as &$vote_result) {
           $vote_percent = $total_votes ? $vote_result['VOTES'] / $total_votes * 100 : 0;
           $vote_result['PERCENT'] = $vote_percent;
           $vote_result['PERCENT_TEXT'] = round($vote_percent, 1);
@@ -85,8 +84,8 @@ 
 }
 
 function nws_mark_read(&$user) {
-  if(isset($user['id'])) {
-    DBStaticUser::db_user_set_by_id_DEPRECATED($user['id'], '`news_lastread` = ' . SN_TIME_NOW);
+  if (isset($user['id'])) {
+    DBStaticUser::db_user_set_by_id_DEPRECATED($user['id'], '`news_lastread` = '.SN_TIME_NOW);
     $user['news_lastread'] = SN_TIME_NOW;
   }
 
@@ -94,17 +93,17 @@ 
 }
 
 function survey_vote(&$user) {
-  if(empty($user['id'])) {
+  if (empty($user['id'])) {
     return true;
   }
 
   sn_db_transaction_start();
   $survey_id = sys_get_param_id('survey_id');
   $is_voted = DBStaticSurveyVote::db_survey_vote_get($user, $survey_id);
-  if(empty($is_voted)) {
+  if (empty($is_voted)) {
     $survey_vote_id = sys_get_param_id('survey_vote');
     $is_answer_exists = DBStaticSurveyAnswer::db_survey_answer_get($survey_id, $survey_vote_id);
-    if(!empty($is_answer_exists)) {
+    if (!empty($is_answer_exists)) {
       DBStaticSurveyVote::db_survey_vote_insert($survey_id, $survey_vote_id, $user['id'], $user['username']);
     }
   }

includes/functions/sys_user.php

Spacing +19 added lines, -19 removed lines

@@ -7,7 +7,7 @@ 
 use Vector\Vector;
 
 function sys_user_vacation($user) {
-  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 + classSupernova::$config->player_vacation_timeout;
@@ -15,7 +15,7 @@ 
     }
   }
 
-  if($user['vacation']) {
+  if ($user['vacation']) {
     // sn_sys_logout(false, true);
     // core_auth::logout(false, true);
 
@@ -45,10 +45,10 @@ 
   // TODO: Full rewrite
   sn_db_transaction_start();
   $TheUser = DBStaticUser::db_user_by_id($UserID);
-  if ( $TheUser['ally_id'] != 0 ) {
-    $TheAlly = classSupernova::$db->doSelectFetch("SELECT * FROM `{{alliance}}` WHERE `id` = '" . $TheUser['ally_id'] . "';");
+  if ($TheUser['ally_id'] != 0) {
+    $TheAlly = classSupernova::$db->doSelectFetch("SELECT * FROM `{{alliance}}` WHERE `id` = '".$TheUser['ally_id']."';");
     $TheAlly['ally_members'] -= 1;
-    if ( $TheAlly['ally_members'] > 0 ) {
+    if ($TheAlly['ally_members'] > 0) {
       classSupernova::$db->doUpdateRowSet(
         TABLE_ALLIANCE,
         array(
@@ -69,10 +69,10 @@ 
 
   classSupernova::$gc->db->doDeleteWhere(TABLE_MESSAGES, array('message_owner' => $UserID,));
   classSupernova::$gc->db->doDeleteWhere(TABLE_MESSAGES, array('message_sender' => $UserID,));
-  classSupernova::$gc->db->doDeleteWhere(TABLE_NOTES, array('owner' => $UserID ,));
+  classSupernova::$gc->db->doDeleteWhere(TABLE_NOTES, array('owner' => $UserID,));
   FleetList::db_fleet_list_delete_by_owner($UserID);
-  classSupernova::$gc->db->doDeleteWhere(TABLE_BUDDY, array('BUDDY_SENDER_ID' => $UserID ,));
-  classSupernova::$gc->db->doDeleteWhere(TABLE_BUDDY, array('BUDDY_OWNER_ID' => $UserID ,));
+  classSupernova::$gc->db->doDeleteWhere(TABLE_BUDDY, array('BUDDY_SENDER_ID' => $UserID,));
+  classSupernova::$gc->db->doDeleteWhere(TABLE_BUDDY, array('BUDDY_OWNER_ID' => $UserID,));
 
 
   classSupernova::$gc->cacheOperator->db_del_record_by_id(LOC_USER, $UserID);
@@ -93,7 +93,7 @@ 
   $ban_current = DBStaticUser::db_user_by_id($banned['id'], false, 'banaday');
   $ban_until = ($ban_current['banaday'] ? $ban_current['banaday'] : SN_TIME_NOW) + $term;
 
-  DBStaticUser::db_user_set_by_id_DEPRECATED($banned['id'], "`banaday` = {$ban_until} " . ($is_vacation ? ", `vacation` = '{$ban_until}' " : ''));
+  DBStaticUser::db_user_set_by_id_DEPRECATED($banned['id'], "`banaday` = {$ban_until} ".($is_vacation ? ", `vacation` = '{$ban_until}' " : ''));
 
   classSupernova::$db->doInsertSet(TABLE_BANNED, array(
     'ban_user_id'      => $banned['id'],
@@ -118,7 +118,7 @@ 
  * @param string $reasonUnsafe
  */
 function sys_admin_player_ban_unset($banner, $banned, $reasonUnsafe = '') {
-  DBStaticUser::db_user_set_by_id_DEPRECATED($banned['id'], "`banaday` = 0, `vacation` = " . SN_TIME_NOW . "");
+  DBStaticUser::db_user_set_by_id_DEPRECATED($banned['id'], "`banaday` = 0, `vacation` = ".SN_TIME_NOW."");
 
   return classSupernova::$db->doInsertSet(TABLE_BANNED, array(
     'ban_user_id'      => $banned['id'],
@@ -153,7 +153,7 @@ 
 
     'total_points' => $options['total_points'] = empty($options['total_points']) ? 0 : $options['total_points'],
 
-    'options' => (empty($options['options']) ? $player_options_string : $options['options']) . (empty($options['options_extra']) ? '' : $options['options_extra']),
+    'options' => (empty($options['options']) ? $player_options_string : $options['options']).(empty($options['options_extra']) ? '' : $options['options_extra']),
 
     'galaxy' => $options['galaxy'] = intval($options['galaxy'] ? $options['galaxy'] : 0),
     'system' => $options['system'] = intval($options['system'] ? $options['system'] : 0),
@@ -164,28 +164,28 @@ 
   !empty($options['password_encoded_unsafe']) ? $field_set['password'] = $options['password_encoded_unsafe'] : false;
 
   $user_new = classSupernova::$gc->cacheOperator->db_ins_field_set(LOC_USER, $field_set);
-  if(!($options['galaxy'] && $options['system'] && $options['planet'])) {
+  if (!($options['galaxy'] && $options['system'] && $options['planet'])) {
     $options['galaxy'] = classSupernova::$config->LastSettedGalaxyPos;
     $options['system'] = classSupernova::$config->LastSettedSystemPos;
-    $segment_size = floor(Vector::$knownPlanets/ 3);
+    $segment_size = floor(Vector::$knownPlanets / 3);
     $segment = floor(classSupernova::$config->LastSettedPlanetPos / $segment_size);
     $segment++;
     $options['planet'] = mt_rand(1 + $segment * $segment_size, ($segment + 1) * $segment_size);
 
     // $new_planet_id = 0;
-    while(true) {
-      if($options['planet'] > Vector::$knownPlanets) {
+    while (true) {
+      if ($options['planet'] > Vector::$knownPlanets) {
         $options['planet'] = mt_rand(0, $segment_size - 1) + 1;
         $options['system']++;
       }
-      if($options['system'] > Vector::$knownSystems) {
+      if ($options['system'] > Vector::$knownSystems) {
         $options['system'] = 1;
         $options['galaxy']++;
       }
-      $options['galaxy'] > Vector::$knownGalaxies? $options['galaxy'] = 1 : false;
+      $options['galaxy'] > Vector::$knownGalaxies ? $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']) {
         classSupernova::$config->db_saveItem(array(
           'LastSettedGalaxyPos' => $options['galaxy'],
           'LastSettedSystemPos' => $options['system'],
@@ -207,7 +207,7 @@ 
 
   db_player_name_history_replace($user_new['id'], $username_unsafe);
 
-  if(!empty($options['partner_id']) && ($referral_row = DBStaticUser::db_user_by_id($options['partner_id'], true))) {
+  if (!empty($options['partner_id']) && ($referral_row = DBStaticUser::db_user_by_id($options['partner_id'], true))) {
     db_referral_insert($options['partner_id'], $user_new['id']);
   }
 

includes/alliance/ali_external_create_ally.inc

Spacing +6 added lines, -6 removed lines

@@ -2,7 +2,7 @@ 
 // Pretty Safe
 // TODO: Add ally_tag to usertable
 
-if(!defined('SN_IN_ALLY') || SN_IN_ALLY !== true) {
+if (!defined('SN_IN_ALLY') || SN_IN_ALLY !== true) {
   classSupernova::$debug->error("Attempt to call ALLIANCE page mode {$mode} directly - not from alliance.php", 'Forbidden', 403);
 }
 
@@ -11,22 +11,22 @@ 
 $ally_name_unsafe = sys_get_param_str_unsafe('name');
 $ally_name = db_escape($ally_name_unsafe);
 
-if($ally_tag) {
-  if(!$ally_name_unsafe || !$ally_tag_unsafe) {
+if ($ally_tag) {
+  if (!$ally_name_unsafe || !$ally_tag_unsafe) {
     message(classLocale::$lang['have_not_name'], classLocale::$lang['make_alliance']);
   }
 
   $query = DBStaticAlly::db_ally_get_by_name_or_tag($ally_tag, $ally_name);
-  if($query) {
+  if ($query) {
     message(str_replace('%s', $query['ally_tag'] == $ally_tag_unsafe ? $ally_tag_unsafe : $ally_name_unsafe, classLocale::$lang['always_exist']), classLocale::$lang['make_alliance']);
   }
 
   DBStaticAlly::db_ally_insert($ally_name_unsafe, $ally_tag_unsafe, $user['id']);
   $ally_id = classSupernova::$db->db_insert_id();
-  DBStaticUser::db_user_set_by_id_DEPRECATED($user['id'], "`ally_tag` = '{$ally_tag}', `ally_id`= {$ally_id}, `ally_name`='{$ally_name}', `ally_register_time`= " . SN_TIME_NOW . "");
+  DBStaticUser::db_user_set_by_id_DEPRECATED($user['id'], "`ally_tag` = '{$ally_tag}', `ally_id`= {$ally_id}, `ally_name`='{$ally_name}', `ally_register_time`= ".SN_TIME_NOW."");
 
   $ally_user = classSupernova::$gc->cacheOperator->db_ins_record(LOC_USER, array(
-    'username'      => "[" . $ally_tag_unsafe . "]",
+    'username'      => "[".$ally_tag_unsafe."]",
     'register_time' => SN_TIME_NOW,
     'user_as_ally'  => $ally_id,
   ));