supernova-ws / SuperNova

includes/functions/int_banner_create.php

Spacing +14 added lines, -14 removed lines

@@ -24,8 +24,8 @@ 
       $img_name = classSupernova::$config->int_userbar_background;
     break;
   }
-  $size = getimagesize(SN_ROOT_PHYSICAL . $img_name);
-  $im = imagecreatefrompng(SN_ROOT_PHYSICAL . $img_name);
+  $size = getimagesize(SN_ROOT_PHYSICAL.$img_name);
+  $im = imagecreatefrompng(SN_ROOT_PHYSICAL.$img_name);
   $image = imagecreatetruecolor($size[0], $size[1]);
   imagecopy($image, $im, 0, 0, 0, 0, $size[0], $size[1]);
   imagedestroy($im);
@@ -37,10 +37,10 @@ 
   $txt_color2 = imagecolorallocatealpha($image, 255, 255, 255, 40);
 
   $fonts = array(
-    'userbar'  => SN_ROOT_PHYSICAL . "design/fonts/" . classSupernova::$config->int_userbar_font,
-    'universe' => SN_ROOT_PHYSICAL . "design/fonts/" . classSupernova::$config->int_banner_fontUniverse,
-    'raids'    => SN_ROOT_PHYSICAL . "design/fonts/" . classSupernova::$config->int_banner_fontRaids,
-    'info'     => SN_ROOT_PHYSICAL . "design/fonts/" . classSupernova::$config->int_banner_fontInfo,
+    'userbar'  => SN_ROOT_PHYSICAL."design/fonts/".classSupernova::$config->int_userbar_font,
+    'universe' => SN_ROOT_PHYSICAL."design/fonts/".classSupernova::$config->int_banner_fontUniverse,
+    'raids'    => SN_ROOT_PHYSICAL."design/fonts/".classSupernova::$config->int_banner_fontRaids,
+    'info'     => SN_ROOT_PHYSICAL."design/fonts/".classSupernova::$config->int_banner_fontInfo,
   );
 
   if ($id) {
@@ -52,8 +52,8 @@ 
     $b_user = $user['username'];
     $b_ally = $user['ally_name'];
     $b_planet = $planet_row['name'];
-    $b_xyz = "[" . $planet_row['galaxy'] . ":" . $planet_row['system'] . ":" . $planet_row['planet'] . "]";
-    $b_lvl = ($user['total_rank'] ? $user['total_rank'] : classSupernova::$config->users_amount) . "/" . classSupernova::$config->users_amount;
+    $b_xyz = "[".$planet_row['galaxy'].":".$planet_row['system'].":".$planet_row['planet']."]";
+    $b_lvl = ($user['total_rank'] ? $user['total_rank'] : classSupernova::$config->users_amount)."/".classSupernova::$config->users_amount;
   } else {
     $b_user = classLocale::$lang['ov_banner_empty_id'];
     $b_lvl = '';
@@ -88,11 +88,11 @@ 
         imagettftext($image, 9, 0, 410 - $is[2], 35, $txt_color, $fonts['info'], $b_ally);
 
         // Player b_planet
-        imagettftext($image, 6, 0, 8, 10, $txt_shadow2, $fonts['raids'], $b_planet . " " . $b_xyz);
-        imagettftext($image, 6, 0, 6, 9, $txt_color2, $fonts['raids'], $b_planet . " " . $b_xyz);
+        imagettftext($image, 6, 0, 8, 10, $txt_shadow2, $fonts['raids'], $b_planet." ".$b_xyz);
+        imagettftext($image, 6, 0, 6, 9, $txt_color2, $fonts['raids'], $b_planet." ".$b_xyz);
 
         //StatPoint
-        $b_points = classLocale::$lang['ov_points'] . ": " . pretty_number(!empty($user['total_points']) ? $user['total_points'] : 0);
+        $b_points = classLocale::$lang['ov_points'].": ".pretty_number(!empty($user['total_points']) ? $user['total_points'] : 0);
         $is = imagettfbbox(8, 0, $fonts['info'], $b_points);
         imagettftext($image, 8, 0, 412 - $is[2], 11, $txt_shadow, $fonts['info'], $b_points);
         imagettftext($image, 8, 0, 410 - $is[2], 9, $txt_color, $fonts['info'], $b_points);
@@ -100,21 +100,21 @@ 
         //Raids Total
         imagettftext($image, 6, 0, 8, 37, $txt_shadow2, $fonts['raids'], classLocale::$lang['NumberOfRaids']);
         imagettftext($image, 6, 0, 6, 35, $txt_color2, $fonts['raids'], classLocale::$lang['NumberOfRaids']);
-        $b_points = ": " . pretty_number(!empty($user['raids']) ? $user['raids'] : 0);
+        $b_points = ": ".pretty_number(!empty($user['raids']) ? $user['raids'] : 0);
         imagettftext($image, 6, 0, 61, 37, $txt_shadow2, $fonts['raids'], $b_points);
         imagettftext($image, 6, 0, 59, 35, $txt_color2, $fonts['raids'], $b_points);
 
         //Raids Won
         imagettftext($image, 6, 0, 8, 47, $txt_shadow2, $fonts['raids'], classLocale::$lang['RaidsWin']);
         imagettftext($image, 6, 0, 6, 45, $txt_color2, $fonts['raids'], classLocale::$lang['RaidsWin']);
-        $b_points = ": " . pretty_number(!empty($user['raidswin']) ? $user['raidswin'] : 0);
+        $b_points = ": ".pretty_number(!empty($user['raidswin']) ? $user['raidswin'] : 0);
         imagettftext($image, 6, 0, 61, 47, $txt_shadow2, $fonts['raids'], $b_points);
         imagettftext($image, 6, 0, 59, 45, $txt_color2, $fonts['raids'], $b_points);
 
         //Raids Lost
         imagettftext($image, 6, 0, 8, 57, $txt_shadow2, $fonts['raids'], classLocale::$lang['RaidsLoose']);
         imagettftext($image, 6, 0, 6, 55, $txt_color2, $fonts['raids'], classLocale::$lang['RaidsLoose']);
-        $b_points = ": " . pretty_number(!empty($user['raidsloose']) ? $user['raidsloose'] : 0);
+        $b_points = ": ".pretty_number(!empty($user['raidsloose']) ? $user['raidsloose'] : 0);
         imagettftext($image, 6, 0, 61, 57, $txt_shadow2, $fonts['raids'], $b_points);
         imagettftext($image, 6, 0, 59, 55, $txt_color2, $fonts['raids'], $b_points);
       }

includes/includes/eco_bld_structures.php

Spacing +11 added lines, -11 removed lines

@@ -68,11 +68,11 @@ 
     }
     $build_unit_list = sn_get_groups('tech');
     $artifact_id = ART_HEURISTIC_CHIP;
-    $page_header = classLocale::$lang['tech'][UNIT_TECHNOLOGIES] . ($user['user_as_ally'] ? " {$classLocale['sys_of_ally']} {$user['username']}" : '');
+    $page_header = classLocale::$lang['tech'][UNIT_TECHNOLOGIES].($user['user_as_ally'] ? " {$classLocale['sys_of_ally']} {$user['username']}" : '');
   } elseif ($que_type == QUE_MERCENARY) {
     $build_unit_list = sn_get_groups('mercenaries');
     $artifact_id = 0;
-    $page_header = classLocale::$lang['tech'][UNIT_MERCENARIES] . ($user['user_as_ally'] ? " {$classLocale['sys_of_ally']} {$user['username']}" : '');
+    $page_header = classLocale::$lang['tech'][UNIT_MERCENARIES].($user['user_as_ally'] ? " {$classLocale['sys_of_ally']} {$user['username']}" : '');
   } else {
     if (mrc_get_level($user, $planet, STRUC_FACTORY_HANGAR) == 0) {
       message(classLocale::$lang['need_hangar'], classLocale::$lang['tech'][STRUC_FACTORY_HANGAR]);
@@ -245,7 +245,7 @@ 
               * ($resource_id == RES_ENERGY ? $config_resource_multiplier_plain : $config_resource_multiplier)
               * (isset($density_info[$resource_id]) ? $density_info[$resource_id] : 1)))
           ) {
-            $level_production_base['R' . $resource_id] = $resource_income;
+            $level_production_base['R'.$resource_id] = $resource_income;
           }
         }
       }
@@ -272,8 +272,8 @@ 
             * ($resource_id == RES_ENERGY ? $config_resource_multiplier_plain : $config_resource_multiplier)
             * (isset($density_info[$resource_id]) ? $density_info[$resource_id] : 1)))
           ) {
-            $level_production['R' . $resource_id] = $resource_income;
-            $level_production['D' . $resource_id] = $resource_income - $level_production_base[$resource_id];
+            $level_production['R'.$resource_id] = $resource_income;
+            $level_production['D'.$resource_id] = $resource_income - $level_production_base[$resource_id];
           }
         }
         $production['.']['resource'][] = $level_production;
@@ -288,15 +288,15 @@ 
       $level_start = $level_base_and_que > 1 ? $level_effective + $level_in_que - 1 : 1;
       for ($i = 0; $i < 6; $i++) {
         $level_production = array('LEVEL' => $level_start + $i);
-        $level_production['R' . UNIT_PLAYER_EXPEDITIONS_MAX] = get_player_max_expeditons($user, $level_start + $i);
-        $level_production['D' . UNIT_PLAYER_EXPEDITIONS_MAX] = $level_production['R' . UNIT_PLAYER_EXPEDITIONS_MAX] - $level_production_base[UNIT_PLAYER_EXPEDITIONS_MAX];
-        $level_production['R' . UNIT_PLAYER_COLONIES_MAX] = get_player_max_colonies($user, $level_start + $i);
-        $level_production['D' . UNIT_PLAYER_COLONIES_MAX] = $level_production['R' . UNIT_PLAYER_COLONIES_MAX] - $level_production_base[UNIT_PLAYER_COLONIES_MAX];
+        $level_production['R'.UNIT_PLAYER_EXPEDITIONS_MAX] = get_player_max_expeditons($user, $level_start + $i);
+        $level_production['D'.UNIT_PLAYER_EXPEDITIONS_MAX] = $level_production['R'.UNIT_PLAYER_EXPEDITIONS_MAX] - $level_production_base[UNIT_PLAYER_EXPEDITIONS_MAX];
+        $level_production['R'.UNIT_PLAYER_COLONIES_MAX] = get_player_max_colonies($user, $level_start + $i);
+        $level_production['D'.UNIT_PLAYER_COLONIES_MAX] = $level_production['R'.UNIT_PLAYER_COLONIES_MAX] - $level_production_base[UNIT_PLAYER_COLONIES_MAX];
         $production['.']['resource'][] = $level_production;
 
         $level_production_base = array(
-          UNIT_PLAYER_EXPEDITIONS_MAX => $level_production['R' . UNIT_PLAYER_EXPEDITIONS_MAX],
-          UNIT_PLAYER_COLONIES_MAX    => $level_production['R' . UNIT_PLAYER_COLONIES_MAX],
+          UNIT_PLAYER_EXPEDITIONS_MAX => $level_production['R'.UNIT_PLAYER_EXPEDITIONS_MAX],
+          UNIT_PLAYER_COLONIES_MAX    => $level_production['R'.UNIT_PLAYER_COLONIES_MAX],
         );
       }
     }

flotenajax.php

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-include('common.' . substr(strrchr(__FILE__, '.'), 1));
+include('common.'.substr(strrchr(__FILE__, '.'), 1));
 
 $template = gettemplate('viewreport', true);
 $template->assign_var('PAGE_HINT', classLocale::$lang['cr_view_hint']);

includes/classes/auth_local.php

Spacing +62 added lines, -62 removed lines

@@ -93,12 +93,12 @@ 
     $this->prepare();
 
     $this->manifest['active'] = false;
-    if(!empty($this->config) && is_array($this->config['db'])) {
+    if (!empty($this->config) && is_array($this->config['db'])) {
       // БД, отличная от стандартной
       $this->db = new db_mysql();
 
       $this->db->sn_db_connect($this->config['db']);
-      if($this->manifest['active'] = $this->db->connected) {
+      if ($this->manifest['active'] = $this->db->connected) {
         $this->provider_id = ACCOUNT_PROVIDER_CENTRAL;
 
         $this->domain = $this->config['domain'];
@@ -112,7 +112,7 @@ 
     }
 
     // Fallback to local DB
-    if(!$this->manifest['active']) {
+    if (!$this->manifest['active']) {
       $this->db = classSupernova::$db;
 
       $this->provider_id = ACCOUNT_PROVIDER_LOCAL;
@@ -125,7 +125,7 @@ 
       $this->manifest['active'] = true;
     }
 
-    $this->cookie_name_impersonate = $this->cookie_name . AUTH_COOKIE_IMPERSONATE_SUFFIX;
+    $this->cookie_name_impersonate = $this->cookie_name.AUTH_COOKIE_IMPERSONATE_SUFFIX;
 
     $this->account = new Account($this->db);
     $this->confirmation = new Confirmation($this->db);
@@ -166,7 +166,7 @@ 
   // OK v4.5
   public function password_change($old_password_unsafe, $new_password_unsafe, $salt_unsafe = null) {
     $result = parent::password_change($old_password_unsafe, $new_password_unsafe, $salt_unsafe);
-    if($result) {
+    if ($result) {
       $this->cookie_set();
     }
 
@@ -194,12 +194,12 @@ 
    */
   // OK v4.6
   protected function password_reset_send_code() {
-    if(!$this->is_password_reset) {
+    if (!$this->is_password_reset) {
       return $this->account_login_status;
     }
 
     // Проверяем поддержку сброса пароля
-    if(!$this->is_feature_supported(AUTH_FEATURE_PASSWORD_RESET)) {
+    if (!$this->is_feature_supported(AUTH_FEATURE_PASSWORD_RESET)) {
       return $this->account_login_status;
     }
 
@@ -209,7 +209,7 @@ 
       unset($this->account);
       $this->account = new Account($this->db);
 
-      if(!$this->account->db_get_by_email($email_unsafe)) {
+      if (!$this->account->db_get_by_email($email_unsafe)) {
         throw new Exception(PASSWORD_RESTORE_ERROR_EMAIL_NOT_EXISTS, ERR_ERROR);
         // return $this->account_login_status;
       }
@@ -219,14 +219,14 @@ 
 
       // TODO - Проверять уровень доступа аккаунта!
       // Аккаунты с АУТЛЕВЕЛ больше 0 - НЕ СБРАСЫВАЮТ ПАРОЛИ!
-      foreach($user_list as $user_id => $user_data) {
-        if($user_data['authlevel'] > AUTH_LEVEL_REGISTERED) {
+      foreach ($user_list as $user_id => $user_data) {
+        if ($user_data['authlevel'] > AUTH_LEVEL_REGISTERED) {
           throw new Exception(PASSWORD_RESTORE_ERROR_ADMIN_ACCOUNT, ERR_ERROR);
         }
       }
 
       $confirmation = $this->confirmation->db_confirmation_get_latest_by_type_and_email(CONFIRM_PASSWORD_RESET, $email_unsafe); // OK 4.5
-      if(isset($confirmation['create_time']) && SN_TIME_NOW - strtotime($confirmation['create_time']) < PERIOD_MINUTE_10) {
+      if (isset($confirmation['create_time']) && SN_TIME_NOW - strtotime($confirmation['create_time']) < PERIOD_MINUTE_10) {
         throw new Exception(PASSWORD_RESTORE_ERROR_TOO_OFTEN, ERR_ERROR);
       }
 
@@ -239,11 +239,11 @@ 
 
       @$result = mymail($email_unsafe,
         sprintf(classLocale::$lang['log_lost_email_title'], classSupernova::$config->game_name),
-        sprintf(classLocale::$lang['log_lost_email_code'], SN_ROOT_VIRTUAL . 'login.php', $confirm_code_unsafe, date(FMT_DATE_TIME, SN_TIME_NOW + AUTH_PASSWORD_RESET_CONFIRMATION_EXPIRE), classSupernova::$config->game_name)
+        sprintf(classLocale::$lang['log_lost_email_code'], SN_ROOT_VIRTUAL.'login.php', $confirm_code_unsafe, date(FMT_DATE_TIME, SN_TIME_NOW + AUTH_PASSWORD_RESET_CONFIRMATION_EXPIRE), classSupernova::$config->game_name)
       );
 
       $result = $result ? PASSWORD_RESTORE_SUCCESS_CODE_SENT : PASSWORD_RESTORE_ERROR_SENDING;
-    } catch(Exception $e) {
+    } catch (Exception $e) {
       sn_db_transaction_rollback();
       $result = $e->getMessage();
     }
@@ -256,46 +256,46 @@ 
    * @return int|string
    */
   protected function password_reset_confirm() {
-    if(!$this->is_password_reset_confirm) {
+    if (!$this->is_password_reset_confirm) {
       return $this->account_login_status;
     }
 
-    if($this->account_login_status != LOGIN_UNDEFINED) {
+    if ($this->account_login_status != LOGIN_UNDEFINED) {
       return $this->account_login_status;
     }
 
     // Проверяем поддержку сброса пароля
-    if(!$this->is_feature_supported(AUTH_FEATURE_PASSWORD_RESET)) {
+    if (!$this->is_feature_supported(AUTH_FEATURE_PASSWORD_RESET)) {
       return $this->account_login_status;
     }
 
     try {
       $code_unsafe = sys_get_param_str_unsafe('password_reset_code');
-      if(empty($code_unsafe)) {
+      if (empty($code_unsafe)) {
         throw new Exception(PASSWORD_RESTORE_ERROR_CODE_EMPTY, ERR_ERROR);
       }
 
       sn_db_transaction_start();
       $confirmation = $this->confirmation->db_confirmation_get_by_type_and_code(CONFIRM_PASSWORD_RESET, $code_unsafe); // OK 4.5
 
-      if(empty($confirmation)) {
+      if (empty($confirmation)) {
         throw new Exception(PASSWORD_RESTORE_ERROR_CODE_WRONG, ERR_ERROR);
       }
 
-      if(SN_TIME_NOW - strtotime($confirmation['create_time']) > AUTH_PASSWORD_RESET_CONFIRMATION_EXPIRE) {
+      if (SN_TIME_NOW - strtotime($confirmation['create_time']) > AUTH_PASSWORD_RESET_CONFIRMATION_EXPIRE) {
         throw new Exception(PASSWORD_RESTORE_ERROR_CODE_TOO_OLD, ERR_ERROR);
       }
 
       unset($this->account);
       $this->account = new Account($this->db);
 
-      if(!$this->account->db_get_by_email($confirmation['email'])) {
+      if (!$this->account->db_get_by_email($confirmation['email'])) {
         throw new Exception(PASSWORD_RESTORE_ERROR_CODE_OK_BUT_NO_ACCOUNT_FOR_EMAIL, ERR_ERROR);
       }
 
       $new_password_unsafe = $this->make_random_password();
       $salt_unsafe = $this->password_salt_generate();
-      if(!$this->account->db_set_password($new_password_unsafe, $salt_unsafe)) {
+      if (!$this->account->db_set_password($new_password_unsafe, $salt_unsafe)) {
         // Ошибка смены пароля
         throw new Exception(AUTH_ERROR_INTERNAL_PASSWORD_CHANGE_ON_RESTORE, ERR_ERROR);
       }
@@ -305,14 +305,14 @@ 
       $this->cookie_set();
       $this->login_cookie();
 
-      if($this->account_login_status == LOGIN_SUCCESS) {
+      if ($this->account_login_status == LOGIN_SUCCESS) {
         // TODO - НЕ ОБЯЗАТЕЛЬНО ОТПРАВЛЯТЬ ЧЕРЕЗ ЕМЕЙЛ! ЕСЛИ ЭТО ФЕЙСБУЧЕК ИЛИ ВКШЕЧКА - МОЖНО ЧЕРЕЗ ЛС ПИСАТЬ!!
         $message_header = sprintf(classLocale::$lang['log_lost_email_title'], classSupernova::$config->game_name);
         $message = sprintf(classLocale::$lang['log_lost_email_pass'], classSupernova::$config->game_name, $this->account->account_name, $new_password_unsafe);
         @$operation_result = mymail($confirmation['email'], $message_header, htmlspecialchars($message));
 
         $users_translated = PlayerToAccountTranslate::db_translate_get_users_from_account_list($this->provider_id, $this->account->account_id); // OK 4.5
-        if(!empty($users_translated)) {
+        if (!empty($users_translated)) {
           // Отправляем в лички письмо о сбросе пароля
 
           // ПО ОПРЕДЕЛЕНИЮ в $users_translated только
@@ -321,9 +321,9 @@ 
           //    - игроки, привязанные только к этим аккаунтам
           // Значит им всем сразу скопом можно отправлять сообщения
           $message = sprintf(classLocale::$lang['sys_password_reset_message_body'], $new_password_unsafe);
-          $message = sys_bbcodeParse($message) . '<br><br>';
+          $message = sys_bbcodeParse($message).'<br><br>';
 
-          foreach($users_translated as $user_id => $providers_list) {
+          foreach ($users_translated as $user_id => $providers_list) {
             msg_send_simple_message($user_id, 0, SN_TIME_NOW, MSG_TYPE_ADMIN, classLocale::$lang['sys_administration'], classLocale::$lang['sys_login_register_message_title'], $message);
           }
         } else {
@@ -375,10 +375,10 @@ 
   // OK v4.5
   protected function register() {
     // TODO РЕГИСТРАЦИЯ ВСЕГДА ДОЛЖНА ЛОГИНИТЬ ПОЛЬЗОВАТЕЛЯ!
-    $this->flog('Регистрация: начинаем. Провайдер ' . $this->provider_id);
+    $this->flog('Регистрация: начинаем. Провайдер '.$this->provider_id);
 
     try {
-      if(!$this->is_register) {
+      if (!$this->is_register) {
         $this->flog('Регистрация: не выставлен флаг регистрации - пропускаем');
         throw new Exception(LOGIN_UNDEFINED, ERR_ERROR);
       }
@@ -388,8 +388,8 @@ 
       sn_db_transaction_start();
 
       $this->account->db_get_by_name_or_email($this->input_login_unsafe, $this->input_email_unsafe);
-      if($this->account->is_exists) {
-        if($this->account->account_email == $this->input_email_unsafe) {
+      if ($this->account->is_exists) {
+        if ($this->account->account_email == $this->input_email_unsafe) {
           throw new Exception(REGISTER_ERROR_EMAIL_EXISTS, ERR_ERROR);
         } else {
           throw new Exception(REGISTER_ERROR_ACCOUNT_NAME_EXISTS, ERR_ERROR);
@@ -411,7 +411,7 @@ 
       // А вот это пока не нужно. Трансляцией аккаунтов в юзеров и созданием новых юзеров для новозашедших аккаунтов занимается Auth
       // $this->register_account();
       sn_db_transaction_commit();
-    } catch(Exception $e) {
+    } catch (Exception $e) {
       sn_db_transaction_rollback();
       $this->account_login_status == LOGIN_UNDEFINED ? $this->account_login_status = $e->getMessage() : false;
     }
@@ -427,19 +427,19 @@ 
    */
   // OK v4.5
   protected function login_cookie() {
-    if($this->account_login_status != LOGIN_UNDEFINED) {
+    if ($this->account_login_status != LOGIN_UNDEFINED) {
       return $this->account_login_status;
     }
 
     // Пытаемся войти по куке
-    if(!empty($_COOKIE[$this->cookie_name])) {
-      if(count(explode("/%/", $_COOKIE[$this->cookie_name])) < 4) {
+    if (!empty($_COOKIE[$this->cookie_name])) {
+      if (count(explode("/%/", $_COOKIE[$this->cookie_name])) < 4) {
         list($account_id_unsafe, $cookie_password_hash_salted, $user_remember_me) = explode(AUTH_COOKIE_DELIMETER, $_COOKIE[$this->cookie_name]);
       } else {
         list($account_id_unsafe, $user_name, $cookie_password_hash_salted, $user_remember_me) = explode("/%/", $_COOKIE[$this->cookie_name]);
       }
 
-      if(
+      if (
         $this->account->db_get_by_id($account_id_unsafe)
         && ($this->password_encode_for_cookie($this->account->account_password) == $cookie_password_hash_salted)
       ) {
@@ -448,7 +448,7 @@ 
       }
     }
 
-    if($this->account_login_status != LOGIN_SUCCESS) {
+    if ($this->account_login_status != LOGIN_SUCCESS) {
       // Невалидная кука - чистим
       $this->cookie_clear();
     }
@@ -466,29 +466,29 @@ 
   protected function login_username() {
     // TODO - Логин по старым именам
     try {
-      if(!$this->is_login) {
+      if (!$this->is_login) {
         $this->flog('Логин: не выставлен флаг входа в игру - это не логин');
         throw new Exception(LOGIN_UNDEFINED, ERR_ERROR);
       }
 
       // TODO Пустое имя аккаунта
-      if(!$this->input_login_unsafe) {
+      if (!$this->input_login_unsafe) {
         throw new Exception(LOGIN_UNDEFINED, ERR_ERROR);
       }
 
       $this->login_validate_input();
 
-      if(!$this->account->db_get_by_name($this->input_login_unsafe) && !$this->account->db_get_by_email($this->input_login_unsafe)) {
+      if (!$this->account->db_get_by_name($this->input_login_unsafe) && !$this->account->db_get_by_email($this->input_login_unsafe)) {
         throw new Exception(LOGIN_ERROR_USERNAME, ERR_ERROR);
       }
 
-      if(!$this->account->password_check($this->input_login_password_raw)) {
+      if (!$this->account->password_check($this->input_login_password_raw)) {
         throw new Exception(LOGIN_ERROR_PASSWORD, ERR_ERROR);
       }
 
       $this->cookie_set();
       $this->account_login_status = LOGIN_SUCCESS;
-    } catch(Exception $e) {
+    } catch (Exception $e) {
       $this->account_login_status == LOGIN_UNDEFINED ? $this->account_login_status = $e->getMessage() : false;
     }
 
@@ -510,18 +510,18 @@ 
   protected function cookie_set($account_to_impersonate = null) {
     $this_account = is_object($account_to_impersonate) ? $account_to_impersonate : $this->account;
 
-    if(!is_object($this_account) || !$this_account->is_exists) {
+    if (!is_object($this_account) || !$this_account->is_exists) {
       throw new Exception(LOGIN_ERROR_NO_ACCOUNT_FOR_COOKIE_SET, ERR_ERROR);
     }
 
-    if(is_object($account_to_impersonate) && $account_to_impersonate->is_exists) {
+    if (is_object($account_to_impersonate) && $account_to_impersonate->is_exists) {
       sn_setcookie($this->cookie_name_impersonate, $_COOKIE[$this->cookie_name], SN_TIME_NOW + PERIOD_YEAR, $this->sn_root_path, $this->domain);
     }
 
     $expire_time = $this->remember_me ? SN_TIME_NOW + PERIOD_YEAR : 0;
 
     $password_encoded = $this->password_encode_for_cookie($this_account->account_password);
-    $cookie = $this_account->account_id . AUTH_COOKIE_DELIMETER . $password_encoded . AUTH_COOKIE_DELIMETER . $this->remember_me;
+    $cookie = $this_account->account_id.AUTH_COOKIE_DELIMETER.$password_encoded.AUTH_COOKIE_DELIMETER.$this->remember_me;
     $this->flog("cookie_set() - Устанавливаем куку {$cookie}");
     return sn_setcookie($this->cookie_name, $cookie, $expire_time, $this->sn_root_path, $this->domain);
   }
@@ -532,7 +532,7 @@ 
   // OK v4.1
   protected function cookie_clear() {
     // Автоматически вообще-то - если установлена кука имперсонатора - то чистим обычную, а куку имперсонатора - копируем в неё
-    if(!empty($_COOKIE[$this->cookie_name_impersonate])) {
+    if (!empty($_COOKIE[$this->cookie_name_impersonate])) {
       sn_setcookie($this->cookie_name, $_COOKIE[$this->cookie_name_impersonate], SN_TIME_NOW + PERIOD_YEAR, $this->sn_root_path, $this->domain);
       sn_setcookie($this->cookie_name_impersonate, '', SN_TIME_NOW - PERIOD_WEEK, $this->sn_root_path, $this->domain);
     } else {
@@ -551,10 +551,10 @@ 
   protected function login_validate_input() {
     // Проверяем, что бы в начале и конце не было пустых символов
     // TODO - при копировании Эксель -> Опера - в конце образуются пустые места. Это не должно быть проблемой! Вынести проверку пароля в регистрацию!
-    if($this->input_login_password_raw != trim($this->input_login_password_raw)) {
+    if ($this->input_login_password_raw != trim($this->input_login_password_raw)) {
       throw new Exception(LOGIN_ERROR_PASSWORD_TRIMMED, ERR_ERROR);
     }
-    if(!$this->input_login_password_raw) {
+    if (!$this->input_login_password_raw) {
       throw new Exception(LOGIN_ERROR_PASSWORD_EMPTY, ERR_ERROR);
     }
   }
@@ -570,37 +570,37 @@ 
     $this->login_validate_input();
 
     // Если нет имени пользователя - NO GO!
-    if(!$this->input_login_unsafe) {
+    if (!$this->input_login_unsafe) {
       throw new Exception(LOGIN_ERROR_USERNAME_EMPTY, ERR_ERROR);
     }
     // Если логин имеет запрещенные символы - NO GO!
-    if(strpbrk($this->input_login_unsafe, LOGIN_REGISTER_CHARACTERS_PROHIBITED)) {
+    if (strpbrk($this->input_login_unsafe, LOGIN_REGISTER_CHARACTERS_PROHIBITED)) {
       throw new Exception(LOGIN_ERROR_USERNAME_RESTRICTED_CHARACTERS, ERR_ERROR);
     }
     // Если логин меньше минимальной длины - NO GO!
-    if(strlen($this->input_login_unsafe) < LOGIN_LENGTH_MIN) {
+    if (strlen($this->input_login_unsafe) < LOGIN_LENGTH_MIN) {
       throw new Exception(REGISTER_ERROR_USERNAME_SHORT, ERR_ERROR);
     }
     // Если пароль меньше минимальной длины - NO GO!
-    if(strlen($this->input_login_password_raw) < PASSWORD_LENGTH_MIN) {
+    if (strlen($this->input_login_password_raw) < PASSWORD_LENGTH_MIN) {
       throw new Exception(REGISTER_ERROR_PASSWORD_INSECURE, ERR_ERROR);
     }
     // Если пароль имеет пробельные символы в начале или конце - NO GO!
-    if($this->input_login_password_raw != trim($this->input_login_password_raw)) {
+    if ($this->input_login_password_raw != trim($this->input_login_password_raw)) {
       throw new Exception(LOGIN_ERROR_PASSWORD_TRIMMED, ERR_ERROR);
     }
     // Если пароль не совпадает с подтверждением - NO GO! То, что у пароля нет пробельных символов в начале/конце - мы уже проверили выше
     //Если они есть у повтора - значит пароль и повтор не совпадут
-    if($this->input_login_password_raw <> $this->input_login_password_raw_repeat) {
+    if ($this->input_login_password_raw <> $this->input_login_password_raw_repeat) {
       throw new Exception(REGISTER_ERROR_PASSWORD_DIFFERENT, ERR_ERROR);
     }
     // Если нет емейла - NO GO!
     // TODO - регистрация без емейла
-    if(!$this->input_email_unsafe) {
+    if (!$this->input_email_unsafe) {
       throw new Exception(REGISTER_ERROR_EMAIL_EMPTY, ERR_ERROR);
     }
     // Если емейл не является емейлом - NO GO!
-    if(!is_email($this->input_email_unsafe)) {
+    if (!is_email($this->input_email_unsafe)) {
       throw new Exception(REGISTER_ERROR_EMAIL_WRONG, ERR_ERROR);
     }
   }
@@ -609,7 +609,7 @@ 
 
   // OK v4
   protected function password_encode_for_cookie($password) {
-    return md5("{$password}--" . $this->secret_word);
+    return md5("{$password}--".$this->secret_word);
   }
   // OK v4
   protected function password_encode($password, $salt) {
@@ -629,22 +629,22 @@ 
     return core_auth::make_random_password();
   }
   protected function flog($message, $die = false) {
-    if(!defined('DEBUG_AUTH') || !DEBUG_AUTH) {
+    if (!defined('DEBUG_AUTH') || !DEBUG_AUTH) {
       return;
     }
     list($called, $caller) = debug_backtrace(false);
 
     $caller_name =
-      ((get_called_class()) ? get_called_class() : (!empty($caller['class']) ? $caller['class'] : '')) .
-      (!empty($caller['type']) ? $caller['type'] : '') .
-      (!empty($caller['function']) ? $caller['function'] : '') .
-      (!empty($called['line']) ? ':' . $called['line'] : '');
+      ((get_called_class()) ? get_called_class() : (!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;
 
     classSupernova::log_file("$message - $caller_name");
-    if($die) {
-      $die && die("<div class='negative'>СТОП! Функция {$caller_name} при вызове в " . get_called_class() . " (располагается в " . get_class() . "). СООБЩИТЕ АДМИНИСТРАЦИИ!</div>");
+    if ($die) {
+      $die && die("<div class='negative'>СТОП! Функция {$caller_name} при вызове в ".get_called_class()." (располагается в ".get_class()."). СООБЩИТЕ АДМИНИСТРАЦИИ!</div>");
     }
   }
 

Doc Comments +7 added lines, -1 removed lines

@@ -134,7 +134,6 @@ 
   /**
    * Попытка залогиниться с использованием метода $method
    *
-   * @param string $method_name
    */
   public function login() {
     // TODO Проверяем поддерживаемость метода
@@ -162,6 +161,10 @@ 
    * @return array|bool|resource
    */
   // OK v4.5
+
+  /**
+   * @param string $salt_unsafe
+   */
   public function password_change($old_password_unsafe, $new_password_unsafe, $salt_unsafe = null) {
     $result = parent::password_change($old_password_unsafe, $new_password_unsafe, $salt_unsafe);
     if($result) {
@@ -171,6 +174,9 @@ 
     return $result;
   }
 
+  /**
+   * @param Account $account_to_impersonate
+   */
   public function impersonate($account_to_impersonate) {
     $this->cookie_set($account_to_impersonate);
   }

admin/ajax_maintenance.php

Spacing +25 added lines, -25 removed lines

@@ -2,9 +2,9 @@ 
 
 define('IN_ADMIN', true);
 
-require('../includes/init.' . substr(strrchr(__FILE__, '.'), 1));
+require('../includes/init.'.substr(strrchr(__FILE__, '.'), 1));
 
-if($user['authlevel'] < 3)
+if ($user['authlevel'] < 3)
 {
   message(classLocale::$lang['sys_noalloaw'], classLocale::$lang['sys_noaccess']);
   die();
@@ -20,13 +20,13 @@ 
 // [#] info_best_battles 1b0
 $best_reports = array();
 
-if(defined('MODULE_INFO_BEST_BATTLES_QUERY')) {
+if (defined('MODULE_INFO_BEST_BATTLES_QUERY')) {
   $query = db_ube_report_get_best_battles();
-  while($row = db_fetch($query)) {
+  while ($row = db_fetch($query)) {
     $best_reports[] = $row['ube_report_id'];
   }
 }
-$best_reports = !empty($best_reports) ? ' AND ube_report_id NOT IN (' . implode(',', $best_reports) . ')' : '';
+$best_reports = !empty($best_reports) ? ' AND ube_report_id NOT IN ('.implode(',', $best_reports).')' : '';
 
 
 $ques = array(
@@ -90,14 +90,14 @@ 
   // Удаляем юниты без планет
   'DELETE un FROM {{unit}} AS un
     LEFT JOIN {{planets}} AS pl ON pl.id = un.unit_location_id
-  WHERE unit_location_type = ' . LOC_PLANET . ' AND pl.id IS NULL;',
+  WHERE unit_location_type = ' . LOC_PLANET.' AND pl.id IS NULL;',
   // Удаляем пустые юниты с 0 уровнем (кроме Капитана)
-  'DELETE FROM {{unit}} WHERE unit_location_type = ' . LOC_PLANET . ' AND unit_level = 0 AND unit_type <> ' . UNIT_CAPTAIN,
+  'DELETE FROM {{unit}} WHERE unit_location_type = '.LOC_PLANET.' AND unit_level = 0 AND unit_type <> '.UNIT_CAPTAIN,
   // Удаляем очереди на ничьих планетах
   'DELETE q FROM {{que}} AS q
     LEFT JOIN {{planets}} AS p ON p.id = q.que_planet_id
   WHERE
-    que_type IN (' . QUE_STRUCTURES . ', ' . QUE_HANGAR . ', ' . SUBQUE_FLEET . ', ' . SUBQUE_DEFENSE . ')
+    que_type IN (' . QUE_STRUCTURES.', '.QUE_HANGAR.', '.SUBQUE_FLEET.', '.SUBQUE_DEFENSE.')
     AND
     (p.id_owner = 0 OR p.id_owner IS NULL);',
 
@@ -112,12 +112,12 @@ 
   // Удаляются сообщения, старше  4 недель, кроме личных и Альянсовских
   'DELETE FROM {{messages}} WHERE
     UNIX_TIMESTAMP() - message_time > 4*7 * 24 * 60 * 60 AND
-    message_type NOT IN (' . MSG_TYPE_PLAYER . ', ' . MSG_TYPE_ALLIANCE . ');',
+    message_type NOT IN (' . MSG_TYPE_PLAYER.', '.MSG_TYPE_ALLIANCE.');',
   // Удаляются сообщения у пользователей, которые неактивны больше 4 недель - кроме личных и Альянсовских
   'DELETE m FROM `{{users}}` AS u
   JOIN {{messages}} AS m ON m.message_owner = u.id
   WHERE
-    message_type NOT IN (' . MSG_TYPE_PLAYER . ', ' . MSG_TYPE_ALLIANCE . ') AND
+    message_type NOT IN (' . MSG_TYPE_PLAYER.', '.MSG_TYPE_ALLIANCE.') AND
     authlevel = 0 AND  user_as_ally IS NULL AND /* Не админы, Не Альянсы */
     UNIX_TIMESTAMP() - onlinetime > 4*7 *86400;',
 
@@ -137,7 +137,7 @@ 
       (log_dark_matter_timestamp, log_dark_matter_username, log_dark_matter_reason, log_dark_matter_amount,
       log_dark_matter_comment, log_dark_matter_page, log_dark_matter_sender)
     SELECT
-      '{$pack_until}', IF(u.username IS NULL, ldm.log_dark_matter_username, u.username), " . RPG_CUMULATIVE . ", sum(ldm.log_dark_matter_amount),
+      '{$pack_until}', IF(u.username IS NULL, ldm.log_dark_matter_username, u.username), ".RPG_CUMULATIVE.", sum(ldm.log_dark_matter_amount),
       'Баланс на {$pack_until}', 'admin/ajax_maintenance.php', ldm.log_dark_matter_sender
     FROM
       {{log_dark_matter}} AS ldm
@@ -155,22 +155,22 @@ 
     "REPLACE INTO `{{log_users_online}}`
       (online_timestamp, online_count, online_aggregated)
     SELECT
-      FROM_UNIXTIME((UNIX_TIMESTAMP(online_timestamp) DIV " . PERIOD_MINUTE_10 . ") * (" . PERIOD_MINUTE_10 . ")), ceil(avg(online_count)), " . LOG_ONLIINE_AGGREGATE_PERIOD_MINUTE_10 . "
+      FROM_UNIXTIME((UNIX_TIMESTAMP(online_timestamp) DIV " . PERIOD_MINUTE_10.") * (".PERIOD_MINUTE_10.")), ceil(avg(online_count)), ".LOG_ONLIINE_AGGREGATE_PERIOD_MINUTE_10."
     FROM
       `{{log_users_online}}`
     WHERE
-      online_timestamp < '{$pack_until}' AND online_aggregated = " . LOG_ONLIINE_AGGREGATE_NONE . "
+      online_timestamp < '{$pack_until}' AND online_aggregated = ".LOG_ONLIINE_AGGREGATE_NONE."
     GROUP BY
-      (UNIX_TIMESTAMP(online_timestamp) DIV " . PERIOD_MINUTE_10 . ") * (" . PERIOD_MINUTE_10 . ");",
+      (UNIX_TIMESTAMP(online_timestamp) DIV " . PERIOD_MINUTE_10.") * (".PERIOD_MINUTE_10.");",
 
-    "DELETE FROM {{log_users_online}} WHERE online_timestamp < '{$pack_until}' AND online_aggregated = " . LOG_ONLIINE_AGGREGATE_NONE,
+    "DELETE FROM {{log_users_online}} WHERE online_timestamp < '{$pack_until}' AND online_aggregated = ".LOG_ONLIINE_AGGREGATE_NONE,
   ),
 
   // Удаляем старые записи из логов
   "DELETE FROM `{{logs}}` WHERE log_timestamp < '{$pack_until}';",
   // Удаляем записи о маинтенансе, апдейте и пересчете статистики более чем недельной давности - они нам уже не нужны
   'DELETE FROM `{{logs}}` WHERE
-    `log_code` IN (' . LOG_INFO_DB_CHANGE . ', ' . LOG_INFO_MAINTENANCE . ', ' . LOG_INFO_STAT_START . ', ' . LOG_INFO_STAT_PROCESS . ', ' . LOG_INFO_STAT_FINISH . ')
+    `log_code` IN (' . LOG_INFO_DB_CHANGE.', '.LOG_INFO_MAINTENANCE.', '.LOG_INFO_STAT_START.', '.LOG_INFO_STAT_PROCESS.', '.LOG_INFO_STAT_FINISH.')
     AND `log_timestamp` < DATE_SUB(NOW(),INTERVAL 7 DAY);',
 
 
@@ -189,13 +189,13 @@ 
 $old_server_status == GAME_DISABLE_NONE ? classSupernova::$config->db_saveItem('game_disable', GAME_DISABLE_MAINTENANCE) : false;
 sn_db_transaction_commit();
 
-foreach($ques as $que_transaction) {
+foreach ($ques as $que_transaction) {
   sn_db_transaction_start();
 
   !is_array($que_transaction) ? $que_transaction = array($que_transaction) : false;
-  foreach($que_transaction as $que) {
+  foreach ($que_transaction as $que) {
     set_time_limit(120);
-    if(is_callable($que)) {
+    if (is_callable($que)) {
       $QryResult = call_user_func($que);
     } else {
       $QryResult = doquery($que);
@@ -206,12 +206,12 @@ 
     //$que = str_replace('}}', '', $que);
 
     $msg .=
-      '<li>' . htmlspecialchars($que) .
-        ' --- <span style="' . ($QryResult ? 'ok">OK' : 'error">FAILED!') . '</span> ' .
-      classSupernova::$db->db_affected_rows() . ' ' . classLocale::$lang['adm_records'] .
+      '<li>'.htmlspecialchars($que).
+        ' --- <span style="'.($QryResult ? 'ok">OK' : 'error">FAILED!').'</span> '.
+      classSupernova::$db->db_affected_rows().' '.classLocale::$lang['adm_records'].
       "</li>";
 
-    classSupernova::$debug->warning($que . ' --- ' . ($QryResult ? 'OK' : 'FAILED!') . ' ' . classSupernova::$db->db_affected_rows() . ' ' . classLocale::$lang['adm_records'], 'System maintenance', LOG_INFO_MAINTENANCE);
+    classSupernova::$debug->warning($que.' --- '.($QryResult ? 'OK' : 'FAILED!').' '.classSupernova::$db->db_affected_rows().' '.classLocale::$lang['adm_records'], 'System maintenance', LOG_INFO_MAINTENANCE);
   }
 
   sn_db_transaction_commit();
@@ -239,5 +239,5 @@ 
 
 $adm_stat_title = classLocale::$lang['adm_stat_title'];
 $result = $result ? "<li>{$adm_stat_title} - {$result}</li>" : '';
-$result = '<div align="left"><ul>' . $msg . $result . '</ul></div>';
-echo json_encode($result . ' ' . $totaltime);
+$result = '<div align="left"><ul>'.$msg.$result.'</ul></div>';
+echo json_encode($result.' '.$totaltime);

admin/admin_user.php

Spacing +7 added lines, -7 removed lines

@@ -3,22 +3,22 @@ 
 define('INSIDE', true);
 define('INSTALL', false);
 define('IN_ADMIN', true);
-require('../common.' . substr(strrchr(__FILE__, '.'), 1));
+require('../common.'.substr(strrchr(__FILE__, '.'), 1));
 
-if($user['authlevel'] < 3) {
+if ($user['authlevel'] < 3) {
   AdminMessage(classLocale::$lang['adm_err_denied']);
 }
 
 lng_include('admin');
 
 $user_id = sys_get_param_id('uid');
-if(!($user_row = DBStaticUser::db_user_by_id($user_id))) {
+if (!($user_row = DBStaticUser::db_user_by_id($user_id))) {
   AdminMessage(sprintf(classLocale::$lang['adm_dm_user_none'], $user_id));
 }
 
 $template = gettemplate('admin/admin_user', true);
 
-if(!empty($user_row['user_last_browser_id'])) {
+if (!empty($user_row['user_last_browser_id'])) {
   $user_row['browser_user_agent'] = db_browser_agent_get_by_id($user_row['user_last_browser_id']);
 }
 
@@ -54,10 +54,10 @@ 
     'raidsloose',
     'raidswin',
     'total_rank',
-    'total_points',  ),
+    'total_points',),
 );
-foreach($formats as $callable => $field_list) {
-  foreach($field_list as $field_name) {
+foreach ($formats as $callable => $field_list) {
+  foreach ($field_list as $field_name) {
     $user_row[$field_name] = call_user_func($callable, $user_row[$field_name]);
   }
 }

includes/alliance/ali_internal_members.inc

Spacing +30 added lines, -30 removed lines

@@ -2,31 +2,31 @@ 
 
 $classLocale = classLocale::$lang;
 
-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);
 }
 
 // Changing rank for single user
 $id_user = sys_get_param_id('id_user');
-if(isset($_GET['id_rank'])) {
+if (isset($_GET['id_rank'])) {
   $id_rank = sys_get_param_int('id_rank');
 }
-if($id_user && isset($id_rank) && $user_admin) {
+if ($id_user && isset($id_rank) && $user_admin) {
   DBStaticUser::db_user_set_by_id($id_user, "`ally_rank_id` = {$id_rank}");
 }
 
 $id_kick = sys_get_param_id('kick');
 
-if($id_kick && $user_can_kick) {
+if ($id_kick && $user_can_kick) {
   $u = DBStaticUser::db_user_by_id($id_kick, true);
-  if($u['ally_id'] == $ally['id'] && $u['id'] != $ally['ally_owner']) {
+  if ($u['ally_id'] == $ally['id'] && $u['id'] != $ally['ally_owner']) {
     DBStaticUser::db_user_set_by_id($id_kick, '`ally_id`= null, `ally_name` = null, `ally_tag` = null, ally_register_time = 0, ally_rank_id = 0');
     db_ally_update_member_decrease($ally);
   }
 }
 
 $sort2 = sys_get_param_int('sort2');
-if($sort2) {
+if ($sort2) {
   $sort2s = "DESC";
   $sort2 = 0;
 } else {
@@ -35,7 +35,7 @@ 
 }
 
 $sort1 = sys_get_param_int('sort1');
-if($sort1 > 5 || $sort1 < 0) {
+if ($sort1 > 5 || $sort1 < 0) {
   $sort1 = 0;
 }
 $sort1s = array(
@@ -49,28 +49,28 @@ 
 
 $template = gettemplate('ali_members', true);
 
-$userList = DBStaticUser::db_user_list("`ally_id`= {$user['ally_id']} ORDER BY " . sprintf($sort1s[$sort1], $sort2s), false,
+$userList = DBStaticUser::db_user_list("`ally_id`= {$user['ally_id']} ORDER BY ".sprintf($sort1s[$sort1], $sort2s), false,
   'id, username, galaxy, system, planet, onlinetime, ally_rank_id, ally_register_time, total_points');
 
 // while ($userRow = db_fetch($userList))
-foreach($userList as $userRow) {
+foreach ($userList as $userRow) {
   $i++;
-  if(!isset($ranks[$userRow['ally_rank_id']])) {
+  if (!isset($ranks[$userRow['ally_rank_id']])) {
     $userRow['ally_rank_id'] = 0;
   }
 
-  if($ally['ally_owner'] == $userRow['id']) {
+  if ($ally['ally_owner'] == $userRow['id']) {
     $ally_range = ($ally['ally_owner_range']) ? $ally['ally_owner_range'] : classLocale::$lang['Founder'];
   } else {
-    if($user_admin) {
-      $ally_range = '<select onchange="window.location=\'alliance.php?mode=admin&edit=members&id_user=' . $userRow['id'] . '&id_rank=\' + this.value">';
+    if ($user_admin) {
+      $ally_range = '<select onchange="window.location=\'alliance.php?mode=admin&edit=members&id_user='.$userRow['id'].'&id_rank=\' + this.value">';
 
-      foreach($ranks as $rankID => $rankArray) {
-        $ally_range .= '<option value="' . $rankID . '"';
-        if($rankID == $userRow['ally_rank_id']) {
+      foreach ($ranks as $rankID => $rankArray) {
+        $ally_range .= '<option value="'.$rankID.'"';
+        if ($rankID == $userRow['ally_rank_id']) {
           $ally_range .= " selected";
         }
-        $ally_range .= '>' . $rankArray['name'];
+        $ally_range .= '>'.$rankArray['name'];
         $ally_range .= '</option>';
       }
       $ally_range .= '</select>';
@@ -80,20 +80,20 @@ 
   }
 
   $last_active = time() - $userRow["onlinetime"];
-  if($user_admin) {
-    if($last_active < 60) {
+  if ($user_admin) {
+    if ($last_active < 60) {
       $tmp = "lime>{$classLocale['On']}";
-    } elseif($last_active < 60 * 60) {
+    } elseif ($last_active < 60 * 60) {
       $last_active = round($last_active / 60);
       $tmp = "lime>{$last_active} {$classLocale['sys_min_short']}";
-    } elseif($last_active < 60 * 60 * 24) {
+    } elseif ($last_active < 60 * 60 * 24) {
       $last_active = round($last_active / (60 * 60));
       $tmp = "green>{$last_active} {$classLocale['sys_hrs_short']}";
     } else {
       $last_active = round($last_active / (60 * 60 * 24));
-      if($last_active < 7) {
+      if ($last_active < 7) {
         $tmp = "yellow";
-      } elseif($last_active < 30) {
+      } elseif ($last_active < 30) {
         $tmp = "orange";
       } else {
         $tmp = "red";
@@ -101,10 +101,10 @@ 
       $tmp .= ">{$last_active} {$classLocale['sys_day_short']}";
     }
   } else {
-    if($user_onlinestatus) {
-      if($last_active < 60 * 5) {
+    if ($user_onlinestatus) {
+      if ($last_active < 60 * 5) {
         $tmp = "lime>{$classLocale['On']}";
-      } elseif($last_active < 60 * 15) {
+      } elseif ($last_active < 60 * 15) {
         $tmp = "yellow>{$classLocale['ali_lessThen15min']}";
       } else {
         $tmp = "red>{$classLocale['Off']}";
@@ -124,21 +124,21 @@ 
     'SYSTEM'        => $userRow['system'],
     'PLANET'        => $userRow['planet'],
     'POINTS'        => pretty_number($userRow['total_points']),
-    'ONLINE'        => '<font color=' . $tmp . '</font>',
+    'ONLINE'        => '<font color='.$tmp.'</font>',
     'RANK'          => $ally_range,
     'REGISTER_TIME' => date(FMT_DATE_TIME, $userRow['ally_register_time']),
     'SHOW_KICK'     => $user['id'] != $userRow['id'] && $ally['ally_owner'] != $userRow['id'],
   ));
 }
 
-if($i != $ally['ally_members']) {
+if ($i != $ally['ally_members']) {
   db_ally_update_member_set($i, $ally);
 }
 
 $template->assign_vars(array(
-  'mode'          => $mode . ($edit ? "&edit=" . $edit : ''),
+  'mode'          => $mode.($edit ? "&edit=".$edit : ''),
   'ADMIN_MODE'    => $user_can_kick,
-  'dpath'         => SN_ROOT_VIRTUAL . $dpath,
+  'dpath'         => SN_ROOT_VIRTUAL.$dpath,
   'onlineMessage' => $user_admin ? classLocale::$lang['ali_sys_lastActive'] : classLocale::$lang['Online'],
   'memberCount'   => count($userList),
   'memberslist'   => $page_list,

includes/includes/art_artifact.php

Spacing +2 added lines, -2 removed lines

@@ -13,7 +13,7 @@ 
   $unit_level = $artifact_level_old = mrc_get_level($user, null, $unit_id, true);
   if ($unit_level > 0) {
     $db_changeset = array();
-    switch($unit_id) {
+    switch ($unit_id) {
       case ART_LHC:
       case ART_HOOK_SMALL:
       case ART_HOOK_MEDIUM:
@@ -133,6 +133,6 @@ 
 
   sn_db_transaction_commit();
   message($message, "{$classLocale['tech'][UNIT_ARTIFACTS]} - {$classLocale['tech'][$unit_id]}",
-    ($request_uri = sys_get_param_str_unsafe('REQUEST_URI')) ? $request_uri : ('artifacts' . DOT_PHP_EX . '#' . $unit_id),
+    ($request_uri = sys_get_param_str_unsafe('REQUEST_URI')) ? $request_uri : ('artifacts'.DOT_PHP_EX.'#'.$unit_id),
     5);
 }

includes/classes/DbSqlAware.php

Spacing +2 added lines, -2 removed lines

@@ -45,8 +45,8 @@
    */
   protected function quoteStringAsFieldByRef(&$string) {
     $string = $this->stringEscape($string);
-    if ((string)$string && '*' != $string) {
-      $string = '`' . $string . '`';
+    if ((string) $string && '*' != $string) {
+      $string = '`'.$string.'`';
     }
   }