supernova-ws / SuperNova

includes/classes/Account.php

Doc Comments +20 added lines

@@ -169,6 +169,10 @@ 
    * @return bool
    */
   // OK v4.5
+
+  /**
+   * @param string $account_name_unsafe
+   */
   public function db_get_by_name($account_name_unsafe) {
     $this->reset();
 
@@ -203,6 +207,11 @@ 
    *
    */
   // OK v4.5
+
+  /**
+   * @param string $account_name_unsafe
+   * @param string $email_unsafe
+   */
   public function db_get_by_name_or_email($account_name_unsafe, $email_unsafe) {
     $this->reset();
 
@@ -218,6 +227,13 @@ 
    * @throws Exception
    */
   // OK v4.5
+
+  /**
+   * @param string $account_name_unsafe
+   * @param string $password_raw
+   * @param string $email_unsafe
+   * @param string $language_unsafe
+   */
   public function db_create($account_name_unsafe, $password_raw, $email_unsafe, $language_unsafe = null, $salt_unsafe = null) {
     $this->reset();
 
@@ -312,6 +328,10 @@ 
    * @return int|string
    */
   // OK 4.8
+
+  /**
+   * @param double $metamatter
+   */
   protected function db_mm_log_insert($comment, $change_type, $metamatter, $user_id_unsafe) {
     $provider_id_safe = intval(core_auth::$main_provider->provider_id);
     //$account_id_safe = $this->db->db_escape($this->account_id);

Spacing +17 added lines, -17 removed lines

@@ -78,8 +78,8 @@ 
     $this->reset();
     $this->db = is_object($db) ? $db : classSupernova::$db;
 
-    foreach($this->table_check as $table_name) {
-      if(empty($this->db->table_list[$table_name])) {
+    foreach ($this->table_check as $table_name) {
+      if (empty($this->db->table_list[$table_name])) {
         die('Если вы видите это сообщение первый раз после обновления релиза - просто перегрузите страницу.<br />
               В противном случае - сообщите Администрации сервера об ошибке.<br/>
               Не хватает таблицы для работы системы авторизации: ' . $table_name);
@@ -103,7 +103,7 @@ 
    */
   // OK v4.6
   public function password_change($old_password_unsafe, $new_password_unsafe, $salt_unsafe = null) {
-    if(!$this->password_check($old_password_unsafe)) {
+    if (!$this->password_check($old_password_unsafe)) {
       return false;
     }
 
@@ -124,7 +124,7 @@ 
   // OK v4.5
   public function assign_from_db_row($row) {
     $this->reset();
-    if(empty($row) || !is_array($row)) {
+    if (empty($row) || !is_array($row)) {
       return false;
     }
     $this->account_id = $row['account_id'];
@@ -237,11 +237,11 @@ 
         `account_email` = LOWER('{$email_safe}'),
         `account_language` = '{$language_safe}'"
     );
-    if(!$result) {
+    if (!$result) {
       throw new Exception(REGISTER_ERROR_ACCOUNT_CREATE, ERR_ERROR);
     }
 
-    if(!($account_id = $this->db->db_insert_id())) {
+    if (!($account_id = $this->db->db_insert_id())) {
       throw new Exception(REGISTER_ERROR_ACCOUNT_CREATE, ERR_ERROR);
     }
 
@@ -271,7 +271,7 @@ 
       WHERE `account_id` = '{$account_id_safe}'"
     ) ? true : false;
 
-    if($result) {
+    if ($result) {
       $result = $this->db_get_by_id($this->account_id);
     }
 
@@ -351,7 +351,7 @@ 
   public function metamatter_change($change_type, $metamatter, $comment = false, $already_changed = false) {
     global $debug, $mm_change_legit, $config;
 
-    if(!$this->is_exists || !($metamatter = round(floatval($metamatter)))) {
+    if (!$this->is_exists || !($metamatter = round(floatval($metamatter)))) {
       $debug->error('Ошибка при попытке манипуляции с ММ');
       return false;
     }
@@ -360,7 +360,7 @@ 
 
     $mm_change_legit = true;
     // $sn_data_metamatter_db_name = pname_resource_name(RES_METAMATTER);
-    if($already_changed) {
+    if ($already_changed) {
       $metamatter_total_delta = 0;
       $result = -1;
     } else {
@@ -373,13 +373,13 @@ 
           ($metamatter_total_delta ? ", `account_immortal` = IF(`account_metamatter_total` + '{$metamatter_total_delta}' >= {$config->player_metamatter_immortal}, NOW(), `account_immortal`), `account_metamatter_total` = `account_metamatter_total` + '{$metamatter_total_delta}'" : '') .
         " WHERE `account_id` = {$account_id_safe}"
       );
-      if(!$result) {
+      if (!$result) {
         $debug->error("Error adjusting Metamatter for player ID {$this->account_id} (Player Not Found?) with {$metamatter}. Reason: {$comment}", 'Metamatter Change', 402);
       }
       $result = classSupernova::$db->db_affected_rows();
     }
 
-    if(empty(core_auth::$user['id'])) {
+    if (empty(core_auth::$user['id'])) {
       $user_list = PlayerToAccountTranslate::db_translate_get_users_from_account_list(core_auth::$main_provider->provider_id, $this->account_id);
       reset($user_list);
       $user_id_unsafe = key($user_list);
@@ -388,30 +388,30 @@ 
     }
     $user_id_safe = $this->db->db_escape($user_id_unsafe);
 
-    if(!$result) {
+    if (!$result) {
       $debug->error("Error adjusting Metamatter for player ID {$this->account_id} (Player Not Found?) with {$metamatter}. Reason: {$comment}", 'Metamatter Change', 402);
     }
 
-    if(!$already_changed) {
+    if (!$already_changed) {
       $this->account_metamatter += $metamatter;
       $this->account_metamatter_total += $metamatter_total_delta;
     }
 
-    if(is_array($comment)) {
+    if (is_array($comment)) {
       $comment = call_user_func_array('sprintf', $comment);
     }
 
     $result = $this->db_mm_log_insert($comment, $change_type, $metamatter, $user_id_unsafe);
 
-    if($metamatter > 0 && !empty($user_id_safe)) {
+    if ($metamatter > 0 && !empty($user_id_safe)) {
       $old_referral = doquery("SELECT * FROM {{referrals}} WHERE `id` = {$user_id_safe} LIMIT 1 FOR UPDATE;", '', true);
-      if($old_referral['id']) {
+      if ($old_referral['id']) {
         $dark_matter_from_metamatter = $metamatter * AFFILIATE_MM_TO_REFERRAL_DM;
         doquery("UPDATE {{referrals}} SET dark_matter = dark_matter + '{$dark_matter_from_metamatter}' WHERE `id` = {$user_id_safe} LIMIT 1;");
         $new_referral = doquery("SELECT * FROM {{referrals}} WHERE `id` = {$user_id_safe} LIMIT 1;", '', true);
 
         $partner_bonus = floor($new_referral['dark_matter'] / $config->rpg_bonus_divisor) - ($old_referral['dark_matter'] >= $config->rpg_bonus_minimum ? floor($old_referral['dark_matter'] / $config->rpg_bonus_divisor) : 0);
-        if($partner_bonus > 0 && $new_referral['dark_matter'] >= $config->rpg_bonus_minimum) {
+        if ($partner_bonus > 0 && $new_referral['dark_matter'] >= $config->rpg_bonus_minimum) {
           rpg_points_change($new_referral['id_partner'], RPG_REFERRAL_BOUGHT_MM, $partner_bonus, "Incoming MM From Referral ID {$user_id_safe}");
         }
       }

includes/classes/auth_local.php

Doc Comments +7 added lines

@@ -209,6 +209,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) {
@@ -218,6 +222,9 @@ 
     return $result;
   }
 
+  /**
+   * @param Account $account_to_impersonate
+   */
   public function impersonate($account_to_impersonate) {
     $this->cookie_set($account_to_impersonate);
   }

Spacing +51 added lines, -51 removed lines

@@ -136,12 +136,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'];
@@ -155,7 +155,7 @@ 
     }
 
     // Fallback to local DB
-    if(!$this->manifest['active']) {
+    if (!$this->manifest['active']) {
       $this->db = classSupernova::$db;
 
       $this->provider_id = ACCOUNT_PROVIDER_LOCAL;
@@ -211,7 +211,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();
     }
 
@@ -241,12 +241,12 @@ 
   protected function password_reset_send_code() {
     global $lang, $config;
 
-    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;
     }
 
@@ -256,7 +256,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;
       }
@@ -266,14 +266,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);
       }
 
@@ -290,7 +290,7 @@ 
       );
 
       $result = $result ? PASSWORD_RESTORE_SUCCESS_CODE_SENT : PASSWORD_RESTORE_ERROR_SENDING;
-    } catch(Exception $e) {
+    } catch (Exception $e) {
       sn_db_transaction_rollback();
       $result = $e->getMessage();
     }
@@ -306,46 +306,46 @@ 
   protected function password_reset_confirm() {
     global $lang, $config;
 
-    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);
       }
@@ -355,7 +355,7 @@ 
       $this->cookie_set();
       $this->login_cookie();
 
-      if($this->account_login_status == LOGIN_SUCCESS) {
+      if ($this->account_login_status == LOGIN_SUCCESS) {
         // TODO - НЕ ОБЯЗАТЕЛЬНО ОТПРАВЛЯТЬ ЧЕРЕЗ ЕМЕЙЛ! ЕСЛИ ЭТО ФЕЙСБУЧЕК ИЛИ ВКШЕЧКА - МОЖНО ЧЕРЕЗ ЛС ПИСАТЬ!!
         $message_header = sprintf($lang['log_lost_email_title'], $config->game_name);
         $message = sprintf($lang['log_lost_email_pass'], $config->game_name, $this->account->account_name, $new_password_unsafe);
@@ -363,7 +363,7 @@ 
 
         // $users_translated = classSupernova::$auth->db_translate_get_users_from_account_list($this->provider_id, $this->account->account_id); // OK 4.5
         $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 только
@@ -375,7 +375,7 @@ 
           $message = sys_bbcodeParse($message) . '<br><br>';
           // msg_send_simple_message($found_provider->data[F_USER_ID], 0, SN_TIME_NOW, MSG_TYPE_ADMIN, $lang['sys_administration'], $lang['sys_login_register_message_title'], $message);
 
-          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, $lang['sys_administration'], $lang['sys_login_register_message_title'], $message);
           }
         } else {
@@ -430,7 +430,7 @@ 
     $this->flog('Регистрация: начинаем. Провайдер ' . $this->provider_id);
 
     try {
-      if(!$this->is_register) {
+      if (!$this->is_register) {
         $this->flog('Регистрация: не выставлен флаг регистрации - пропускаем');
         throw new Exception(LOGIN_UNDEFINED, ERR_ERROR);
       }
@@ -442,8 +442,8 @@ 
       // $this->account_check_duplicate_name_or_email($this->input_login_unsafe, $this->input_email_unsafe);
 
       $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);
@@ -482,7 +482,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;
     }
@@ -498,15 +498,15 @@ 
    */
   // 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 (!empty($_COOKIE[$this->cookie_name])) {
 // Кто хотел - уже сконвертировал старые куки в новые
 // Update оказывается - не все...
-      if(count(explode("/%/", $_COOKIE[$this->cookie_name])) < 4) {
+      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]);
@@ -514,7 +514,7 @@ 
 
       // $account = $this->db_account_get_by_id($account_id_unsafe);
 
-      if(
+      if (
         $this->account->db_get_by_id($account_id_unsafe)
         && ($this->password_encode_for_cookie($this->account->account_password) == $cookie_password_hash_salted)
       ) {
@@ -524,7 +524,7 @@ 
       }
     }
 
-    if($this->account_login_status != LOGIN_SUCCESS) {
+    if ($this->account_login_status != LOGIN_SUCCESS) {
       // Невалидная кука - чистим
       $this->cookie_clear();
     }
@@ -542,13 +542,13 @@ 
   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);
       }
 
@@ -558,11 +558,11 @@ 
 //      if(empty($account)) {
 //        throw new Exception(LOGIN_ERROR_USERNAME, ERR_ERROR);
 //      }
-      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);
       }
 
@@ -570,7 +570,7 @@ 
 
       $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;
     }
 
@@ -592,11 +592,11 @@ 
   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);
     }
 
@@ -614,7 +614,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 {
@@ -633,10 +633,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);
     }
   }
@@ -652,37 +652,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);
     }
   }
@@ -715,7 +715,7 @@ 
     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);
@@ -731,7 +731,7 @@ 
     $_SERVER['SERVER_NAME'] == 'localhost' ? print("<div class='debug'>$message - $caller_name\r\n</div>") : false;
 
     classSupernova::log_file("$message - $caller_name");
-    if($die) {
+    if ($die) {
       // pdump($caller);
       // pdump(debug_backtrace(false));
       $die && die("<div class='negative'>СТОП! Функция {$caller_name} при вызове в " . get_called_class() . " (располагается в " . get_class() . "). СООБЩИТЕ АДМИНИСТРАЦИИ!</div>");

includes/classes/cache.php

Doc Comments +13 added lines

@@ -81,6 +81,10 @@ 
   // -------------------------------------------------------------------------
   // Here comes low-level functions - those that directly works with cacher engines
   // -------------------------------------------------------------------------
+
+  /**
+   * @param string $name
+   */
   public function __set($name, $value) {
     switch ($name) {
       case '_MODE':
@@ -132,6 +136,9 @@ 
     return null;
   }
 
+  /**
+   * @param string $name
+   */
   public function __isset($name) {
     switch (self::$mode) {
       case CACHER_NO_CACHE:
@@ -332,6 +339,9 @@ 
     return self::$cacheObject;
   }
 
+  /**
+   * @param string $index
+   */
   public function db_loadItem($index) {
     $result = null;
     if($index) {
@@ -371,6 +381,9 @@ 
     $this->db_saveItem(array_combine(array_keys($this->defaults), array_fill(0, count($this->defaults), null)));
   }
 
+  /**
+   * @param integer $value
+   */
   public function db_saveItem($item_list, $value = NULL) {
     if(empty($item_list)) {
       return;

Indentation +1 added lines, -1 removed lines

@@ -59,7 +59,7 @@
       if(self::$mode === CACHER_NOT_INIT) {
         self::$mode = CACHER_NO_CACHE;
         if(!self::$data) {
-         self::$data = array();
+          self::$data = array();
         }
       }
     }

Spacing +56 added lines, -56 removed lines

@@ -13,8 +13,8 @@ 
 * Defining some constants
 */
 define('CACHER_NOT_INIT', -1);
-define('CACHER_NO_CACHE',  0);
-define('CACHER_XCACHE'  ,  1);
+define('CACHER_NO_CACHE', 0);
+define('CACHER_XCACHE', 1);
 
 define('CACHER_LOCK_WAIT', 5); // maximum cacher wait for table unlock in seconds. Can be float
 
@@ -46,19 +46,19 @@ 
   protected static $cacheObject;
 
   public function __construct($prefIn = 'CACHE_', $init_mode = false) {
-    if( !($init_mode === false || $init_mode === CACHER_NO_CACHE || ($init_mode === CACHER_XCACHE && extension_loaded('xcache')) )) {
+    if (!($init_mode === false || $init_mode === CACHER_NO_CACHE || ($init_mode === CACHER_XCACHE && extension_loaded('xcache')))) {
       throw new UnexpectedValueException('Wrong work mode or current mode does not supported on your server');
     }
 
     $this->prefix = $prefIn;
-    if(extension_loaded('xcache') && ($init_mode === CACHER_XCACHE || $init_mode === false)) {
-      if(self::$mode === CACHER_NOT_INIT) {
+    if (extension_loaded('xcache') && ($init_mode === CACHER_XCACHE || $init_mode === false)) {
+      if (self::$mode === CACHER_NOT_INIT) {
         self::$mode = CACHER_XCACHE;
       }
     } else {
-      if(self::$mode === CACHER_NOT_INIT) {
+      if (self::$mode === CACHER_NOT_INIT) {
         self::$mode = CACHER_NO_CACHE;
-        if(!self::$data) {
+        if (!self::$data) {
          self::$data = array();
         }
       }
@@ -94,11 +94,11 @@ 
       default:
         switch (self::$mode) {
           case CACHER_NO_CACHE:
-            self::$data[$this->prefix.$name] = $value;
+            self::$data[$this->prefix . $name] = $value;
           break;
 
           case CACHER_XCACHE:
-            xcache_set($this->prefix.$name, $value);
+            xcache_set($this->prefix . $name, $value);
           break;
         }
       break;
@@ -118,11 +118,11 @@ 
       default:
         switch (self::$mode) {
           case CACHER_NO_CACHE:
-            return self::$data[$this->prefix.$name];
+            return self::$data[$this->prefix . $name];
           break;
 
           case CACHER_XCACHE:
-            return xcache_get($this->prefix.$name);
+            return xcache_get($this->prefix . $name);
           break;
 
         }
@@ -135,11 +135,11 @@ 
   public function __isset($name) {
     switch (self::$mode) {
       case CACHER_NO_CACHE:
-        return isset(self::$data[$this->prefix.$name]);
+        return isset(self::$data[$this->prefix . $name]);
       break;
 
       case CACHER_XCACHE:
-        return xcache_isset($this->prefix.$name) && ($this->__get($name) !== null);
+        return xcache_isset($this->prefix . $name) && ($this->__get($name) !== null);
       break;
     }
 
@@ -160,7 +160,7 @@ 
 
   public function unset_by_prefix($prefix_unset = '') {
     static $array_clear;
-    !$array_clear ? $array_clear = function(&$v,$k,$p) {
+    !$array_clear ? $array_clear = function(&$v, $k, $p) {
       strpos($k, $p) === 0 ? $v = NULL : false;
     } : false;
 
@@ -172,7 +172,7 @@ 
       break;
 
       case CACHER_XCACHE:
-        if(!function_exists('xcache_unset_by_prefix')) {
+        if (!function_exists('xcache_unset_by_prefix')) {
           return false;
         }
         return xcache_unset_by_prefix($this->prefix . $prefix_unset);
@@ -188,13 +188,13 @@ 
   protected function make_element_name($args, $diff = 0) {
     $num_args = count($args);
 
-    if($num_args < 1) {
+    if ($num_args < 1) {
       return false;
     }
 
     $name = '';
     $aName = array();
-    for($i = 0; $i <= $num_args - 1 - $diff; $i++) {
+    for ($i = 0; $i <= $num_args - 1 - $diff; $i++) {
       $name .= "[{$args[$i]}]";
       array_unshift($aName, $name);
     }
@@ -206,15 +206,15 @@ 
     $args = func_get_args();
     $name = $this->make_element_name($args, 1);
 
-    if(!$name) {
+    if (!$name) {
       return NULL;
     }
 
-    if($this->$name[0] === NULL) {
-      for($i = count($name) - 1; $i > 0; $i--) {
+    if ($this->$name[0] === NULL) {
+      for ($i = count($name) - 1; $i > 0; $i--) {
         $cName = "{$name[$i]}_COUNT";
-        $cName1 = "{$name[$i-1]}_COUNT";
-        if($this->$cName1 == NULL || $i == 1) {
+        $cName1 = "{$name[$i - 1]}_COUNT";
+        if ($this->$cName1 == NULL || $i == 1) {
           $this->$cName++;
         }
       }
@@ -226,7 +226,7 @@ 
 
   public function array_get() {
     $name = $this->make_element_name(func_get_args());
-    if(!$name) {
+    if (!$name) {
       return NULL;
     }
     return $this->$name[0];
@@ -234,12 +234,12 @@ 
 
   public function array_count() {
     $name = $this->make_element_name(func_get_args());
-    if(!$name) {
+    if (!$name) {
       return 0;
     }
     $cName = "{$name[0]}_COUNT";
     $retVal = $this->$cName;
-    if(!$retVal) {
+    if (!$retVal) {
       $retVal = NULL;
     }
     return $retVal;
@@ -248,18 +248,18 @@ 
   public function array_unset() {
     $name = $this->make_element_name(func_get_args());
 
-    if(!$name) {
+    if (!$name) {
       return false;
     }
     $this->unset_by_prefix($name[0]);
 
-    for($i = 1; $i < count($name); $i++) {
+    for ($i = 1; $i < count($name); $i++) {
       $cName = "{$name[$i]}_COUNT";
-      $cName1 = "{$name[$i-1]}_COUNT";
+      $cName1 = "{$name[$i - 1]}_COUNT";
 
-      if($i == 1 || $this->$cName1 === NULL) {
+      if ($i == 1 || $this->$cName1 === NULL) {
         $this->$cName--;
-        if($this->$cName <= 0) {
+        if ($this->$cName <= 0) {
           unset($this->$cName);
         }
       }
@@ -319,7 +319,7 @@ 
     $this->sql_index_field = "{$table_name}_name";
     $this->sql_value_field = "{$table_name}_value";
 
-    if(!$this->_DB_LOADED) {
+    if (!$this->_DB_LOADED) {
       $this->db_loadAll();
     }
   }
@@ -334,7 +334,7 @@ 
 
   public function db_loadItem($index) {
     $result = null;
-    if($index) {
+    if ($index) {
       $index_safe = db_escape($index);
       $result = doquery("SELECT `{$this->sql_value_field}` FROM `{{{$this->table_name}}}` WHERE `{$this->sql_index_field}` = '{$index_safe}' FOR UPDATE", true);
       // В две строки - что бы быть уверенным в порядке выполнения
@@ -348,7 +348,7 @@ 
     $this->loadDefaults();
 
     $query = doquery("SELECT * FROM {{{$this->table_name}}} FOR UPDATE;");
-    while($row = db_fetch($query)) {
+    while ($row = db_fetch($query)) {
       $this->$row[$this->sql_index_field] = $row[$this->sql_value_field];
     }
 
@@ -356,7 +356,7 @@ 
   }
 
   public function loadDefaults() {
-    foreach($this->defaults as $defName => $defValue) {
+    foreach ($this->defaults as $defName => $defValue) {
       $this->$defName = $defValue;
     }
   }
@@ -372,7 +372,7 @@ 
   }
 
   public function db_saveItem($item_list, $value = NULL) {
-    if(empty($item_list)) {
+    if (empty($item_list)) {
       return;
     }
 
@@ -380,8 +380,8 @@ 
 
     // Сначала записываем данные в базу - что бы поймать все блокировки
     $qry = array();
-    foreach($item_list as $item_name => $item_value) {
-      if($item_name) {
+    foreach ($item_list as $item_name => $item_value) {
+      if ($item_name) {
         $item_value = db_escape($item_value === NULL ? $this->$item_name : $item_value);
         $item_name = db_escape($item_name);
         $qry[] = "('{$item_name}', '{$item_value}')";
@@ -390,8 +390,8 @@ 
     doquery("REPLACE INTO `{{" . $this->table_name . "}}` (`{$this->sql_index_field}`, `{$this->sql_value_field}`) VALUES " . implode(',', $qry) . ";");
 
     // И только после взятия блокировок - меняем значения в кэше
-    foreach($item_list as $item_name => $item_value) {
-      if($item_name && $item_value !== NULL) {
+    foreach ($item_list as $item_name => $item_value) {
+      if ($item_name && $item_value !== NULL) {
         $this->$item_name = $item_value;
       }
     }
@@ -419,9 +419,9 @@ 
     'advGoogleLeftMenuCode'        => '(Place here code for banner)',
 
     // Alliance bonus calculations
-    'ali_bonus_algorithm'          => 0,  // Bonus calculation algorithm
+    'ali_bonus_algorithm'          => 0, // Bonus calculation algorithm
     'ali_bonus_brackets'           => 10, // Brackets count for ALI_BONUS_BY_RANK
-    'ali_bonus_brackets_divisor'   => 10,// Bonus divisor for ALI_BONUS_BY_RANK
+    'ali_bonus_brackets_divisor'   => 10, // Bonus divisor for ALI_BONUS_BY_RANK
     'ali_bonus_divisor'            => 10000000, // Rank divisor for ALI_BONUS_BY_POINTS
     'ali_bonus_members'            => 10, // Minumum alliace size to start using bonus
 
@@ -452,25 +452,25 @@ 
     'deuterium_basic_income'       => 0,
     'eco_scale_storage'            => 1,
     'eco_stockman_fleet'           => '', // Black Market - Starting amount of s/h ship merchant to sell
-    'eco_stockman_fleet_populate'  => 1,  // Populate empty Stockman fleet with ships or not
+    'eco_stockman_fleet_populate'  => 1, // Populate empty Stockman fleet with ships or not
     'empire_mercenary_base_period' => PERIOD_MONTH, // Base
     'empire_mercenary_temporary'   => 0, // Temporary empire-wide mercenaries
     'energy_basic_income'          => 0,
 
     // Bashing protection settings
-    'fleet_bashing_attacks'        => 3,      // Max amount of attack per wave - 3 by default
-    'fleet_bashing_interval'       => 1800,   // Maximum interval between attacks when they still count as one wave - 30m by default
-    'fleet_bashing_scope'          => 86400,  // Interval on which bashing waves counts - 24h by default
-    'fleet_bashing_war_delay'      => 43200,  // Delay before start bashing after declaring war to alliance - 12h by default
-    'fleet_bashing_waves'          => 3,      // Max amount of waves per day - 3 by default
+    'fleet_bashing_attacks'        => 3, // Max amount of attack per wave - 3 by default
+    'fleet_bashing_interval'       => 1800, // Maximum interval between attacks when they still count as one wave - 30m by default
+    'fleet_bashing_scope'          => 86400, // Interval on which bashing waves counts - 24h by default
+    'fleet_bashing_war_delay'      => 43200, // Delay before start bashing after declaring war to alliance - 12h by default
+    'fleet_bashing_waves'          => 3, // Max amount of waves per day - 3 by default
 
     'Fleet_Cdr'                    => 30,
     'fleet_speed'                  => 1,
 
     'fleet_update_interval'        => 4,
 
-    'game_adminEmail'              => 'root@localhost',    // Admin's email to show to users
-    'game_counter'                 => 0,  // Does built-in page hit counter is on?
+    'game_adminEmail'              => 'root@localhost', // Admin's email to show to users
+    'game_counter'                 => 0, // Does built-in page hit counter is on?
     // Defaults
     'game_default_language'        => 'ru',
     'game_default_skin'            => 'skins/EpicBlue/',
@@ -484,13 +484,13 @@ 
     'game_maxSystem'               => 199,
     'game_maxPlanet'               => 15,
     // Game global settings
-    'game_mode'                    => 0,           // 0 - SuperNova, 1 - oGame
+    'game_mode'                    => 0, // 0 - SuperNova, 1 - oGame
     'game_name'                    => 'SuperNova', // Server name (would be on banners and on top of left menu)
 
     'game_news_actual'             => 259200, // How long announcement would be marked as "New". In seconds. Default - 3 days
-    'game_news_overview'           => 3,    // How much last news to show in Overview page
+    'game_news_overview'           => 3, // How much last news to show in Overview page
     // Noob protection
-    'game_noob_factor'             => 5,    // Multiplier to divide "stronger" and "weaker" users
+    'game_noob_factor'             => 5, // Multiplier to divide "stronger" and "weaker" users
     'game_noob_points'             => 5000, // Below this point user threated as noob. 0 to disable
 
     'game_multiaccount_enabled'    => 0, // 1 - allow interactions for players with same IP (multiaccounts)
@@ -539,8 +539,8 @@ 
     'payment_currency_exchange_wmu' => 30,
     'payment_currency_exchange_wmz' => 1,
 
-    'payment_lot_price'             => 1,     // Lot price in default currency
-    'payment_lot_size'              => 2500,  // Lot size. Also service as minimum amount of DM that could be bought with one transaction
+    'payment_lot_price'             => 1, // Lot price in default currency
+    'payment_lot_size'              => 2500, // Lot size. Also service as minimum amount of DM that could be bought with one transaction
 
     'planet_teleport_cost'         => 50000, // 
     'planet_teleport_timeout'      => 86400, // 
@@ -558,7 +558,7 @@ 
     'resource_multiplier'          => 1,
 
     //Roleplay system
-    'rpg_bonus_divisor'            => 10,    // Amount of DM referral shoud get for partner have 1 DM bonus
+    'rpg_bonus_divisor'            => 10, // Amount of DM referral shoud get for partner have 1 DM bonus
     'rpg_bonus_minimum'            => 10000, // Minimum DM ammount for starting paying bonuses to affiliate
 
     // Black Market - General
@@ -644,7 +644,7 @@ 
   }
 
   public static function getInstance($gamePrefix = 'sn_', $table_name = 'config') {
-    if(!isset(self::$cacheObject)) {
+    if (!isset(self::$cacheObject)) {
       $className = get_class();
       self::$cacheObject = new $className($gamePrefix, $table_name);
     }

includes/classes/Confirmation.php

Doc Comments +19 added lines

@@ -18,6 +18,11 @@ 
 
   // TODO - НЕ ОБЯЗАТЕЛЬНО ОТПРАВЛЯТЬ ЧЕРЕЗ ЕМЕЙЛ! ЕСЛИ ЭТО ФЕЙСБУЧЕК ИЛИ ВКШЕЧКА - МОЖНО ЧЕРЕЗ ЛС ПИСАТЬ!!
   // TODO - OK 4.6
+
+  /**
+   * @param integer $confirmation_type_safe
+   * @param string $email_unsafe
+   */
   public function db_confirmation_get_latest_by_type_and_email($confirmation_type_safe, $email_unsafe) {
     $email_safe = $this->db->db_escape($email_unsafe);
 
@@ -26,12 +31,21 @@ 
           `type` = {$confirmation_type_safe} AND `email` = '{$email_safe}' ORDER BY create_time DESC LIMIT 1;", true);
   }
   // TODO - OK 4.6
+
+  /**
+   * @param integer $confirmation_type_safe
+   */
   public function db_confirmation_delete_by_type_and_email($confirmation_type_safe, $email_unsafe) {
     $email_safe = $this->db->db_escape($email_unsafe);
 
     return $this->db->doquery("DELETE FROM {{confirmations}} WHERE `type` = {$confirmation_type_safe} AND `email` = '{$email_safe}'");
   }
   // TODO - OK 4.6
+
+  /**
+   * @param integer $confirmation_type_safe
+   * @param string $email_unsafe
+   */
   public function db_confirmation_get_unique_code_by_type_and_email($confirmation_type_safe, $email_unsafe) {
     $email_safe = $this->db->db_escape($email_unsafe);
 
@@ -50,6 +64,11 @@ 
     return $confirm_code_unsafe;
   }
   // TODO - OK 4.6
+
+  /**
+   * @param integer $confirmation_type_safe
+   * @param string $confirmation_code_unsafe
+   */
   public function db_confirmation_get_by_type_and_code($confirmation_type_safe, $confirmation_code_unsafe) {
     $confirmation_code_safe = $this->db->db_escape($confirmation_code_unsafe);
 

Spacing +1 added lines, -1 removed lines

@@ -41,7 +41,7 @@
       // $query = static::$db->doquery("SELECT `id` FROM {{confirmations}} WHERE `code` = '{$confirm_code_safe}' AND `type` = {$confirmation_type_safe} FOR UPDATE", true);
       // Тип не нужен для проверки - код подтверждения должен быть уникален от слова "совсем"
       $query = $this->db->doquery("SELECT `id` FROM {{confirmations}} WHERE `code` = '{$confirm_code_safe}' FOR UPDATE", true);
-    } while($query);
+    } while ($query);
 
     $this->db->doquery(
       "REPLACE INTO {{confirmations}}

includes/classes/core_auth.php

Doc Comments +7 added lines

@@ -829,10 +829,17 @@
 
   // OK v4.5
   // TODO - REMEMBER_ME
+
+  /**
+   * @param integer $period
+   */
   protected static function cookie_set($value, $impersonate = false, $period = null) {
     sn_setcookie($impersonate ? SN_COOKIE_U_I : SN_COOKIE_U, $value, $period === null ? SN_TIME_NOW + PERIOD_YEAR : $period, SN_ROOT_RELATIVE);
   }
 
+  /**
+   * @param string $message
+   */
   protected static function flog($message, $die = false) {
     if(!defined('DEBUG_AUTH') || !DEBUG_AUTH) {
       return;

Spacing +62 added lines, -62 removed lines

@@ -199,18 +199,18 @@ 
     // TODO Хотя тут может получится вечный цикл - ПОДУМАТЬ
     // TODO Тут же можно пробовать провести попытку слияния аккаунтов - хотя это и очень небезопасно
 
-    if(sys_get_param('login_player_register_logout')) {
+    if (sys_get_param('login_player_register_logout')) {
       $this->logout();
     }
 
     $original_suggest = '';
     // Смотрим - есть ли у нас данные от пользователя
-    if(($player_name_submitted = sys_get_param('submit_player_name'))) {
+    if (($player_name_submitted = sys_get_param('submit_player_name'))) {
       // Попытка регистрации нового игрока из данных, введенных пользователем
       $this->player_suggested_name = sys_get_param_str_unsafe('player_suggested_name');
     } else {
-      foreach($this->providers_authorised as $provider) {
-        if($this->player_suggested_name = $provider->player_name_suggest()) { // OK 4.5
+      foreach ($this->providers_authorised as $provider) {
+        if ($this->player_suggested_name = $provider->player_name_suggest()) { // OK 4.5
           $original_suggest = $provider->player_name_suggest();
           break;
         }
@@ -218,7 +218,7 @@ 
     }
 
     // Если у нас провайдеры не дают имени и пользователь не дал свой вариант - это у нас первый логин в игру
-    if(!$this->player_suggested_name) {
+    if (!$this->player_suggested_name) {
       $max_user_id = db_player_get_max_id(); // 4.5
       // TODO - предлагать имя игрока по локали
 
@@ -227,15 +227,15 @@ 
         sn_db_transaction_rollback();
         $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));
+      } while (db_player_name_exists($this->player_suggested_name));
 
     }
 
-    if($player_name_submitted) {
+    if ($player_name_submitted) {
       $this->register_player_db_create($this->player_suggested_name); // OK 4.5
-      if($this->register_status == LOGIN_SUCCESS) {
+      if ($this->register_status == LOGIN_SUCCESS) {
         sys_redirect(SN_ROOT_VIRTUAL . 'overview.php');
-      } elseif($this->register_status == REGISTER_ERROR_PLAYER_NAME_EXISTS && $original_suggest == $this->player_suggested_name) {
+      } elseif ($this->register_status == REGISTER_ERROR_PLAYER_NAME_EXISTS && $original_suggest == $this->player_suggested_name) {
         // self::$player_suggested_name .= ' ' . $this->account->account_id;
       }
 //      if(self::$login_status != LOGIN_SUCCESS) {
@@ -259,7 +259,7 @@ 
         : false
       );
 
-    if($this->register_status == LOGIN_ERROR_USERNAME_RESTRICTED_CHARACTERS) {
+    if ($this->register_status == LOGIN_ERROR_USERNAME_RESTRICTED_CHARACTERS) {
       $prohibited_characters = array_map(function($value) {
         return "'" . htmlentities($value, ENT_QUOTES, 'UTF-8') . "'";
       }, str_split(LOGIN_REGISTER_CHARACTERS_PROHIBITED));
@@ -293,27 +293,27 @@ 
     global $sn_module_list, $lang;
 
     // !self::$is_init ? self::init() : false;
-    if(empty($sn_module_list['auth'])) {
+    if (empty($sn_module_list['auth'])) {
       die('{Не обнаружено ни одного провайдера авторизации в core_auth::login()!}');
     }
 
     !empty($_POST) ? self::flog(dump($_POST, '$_POST')) : false;
     !empty($_GET) ? self::flog(dump($_GET, '$_GET')) : false;
-    !empty($_COOKIE) ? self::flog(dump($_COOKIE,'$_COOKIE')) : false;
+    !empty($_COOKIE) ? self::flog(dump($_COOKIE, '$_COOKIE')) : false;
 
     $this->auth_reset(); // OK v4.5
 
     $this->providers = array();
-    foreach($sn_module_list['auth'] as $module_name => $module) {
+    foreach ($sn_module_list['auth'] as $module_name => $module) {
       $this->providers[$module->provider_id] = $module;
     }
 
     // $this->providers = array_reverse($this->providers, true); // НИНАДА! СН-аккаунт должен всегда авторизироваться первым!
 
-    foreach($this->providers as $provider_id => $provider) {
+    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) ? $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) {
+      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];
 
         $this->user_id_to_provider = array_replace_recursive(
@@ -321,15 +321,15 @@ 
           // static::db_translate_get_users_from_account_list($provider_id, $provider->account->account_id) // OK 4.5
           PlayerToAccountTranslate::db_translate_get_users_from_account_list($provider_id, $provider->account->account_id) // OK 4.5
         );
-      } elseif($login_status != LOGIN_UNDEFINED) {
+      } elseif ($login_status != LOGIN_UNDEFINED) {
         $this->provider_error_list[$provider_id] = $login_status;
       }
     }
 
-    if(empty($this->providers_authorised)) {
+    if (empty($this->providers_authorised)) {
       // Ни один аккаунт не авторизирован
       // Проверяем - есть ли у нас ошибки в аккаунтах?
-      if(!empty($this->provider_error_list)) {
+      if (!empty($this->provider_error_list)) {
         // Если есть - выводим их
         self::$login_status = reset($this->provider_error_list);
       }
@@ -344,12 +344,12 @@ 
       // В self::$accessible_user_row_list - список доступных игроков для данных аккаунтов с соответствующими записями из таблицы `users`
 
       // Остались ли у нас в списке доступные игроки?
-      if(empty($this->accessible_user_row_list)) {
+      if (empty($this->accessible_user_row_list)) {
         // Нет ни одного игрока ни на одном авторизированном аккаунте
         // Надо регать нового игрока
 
         // Сейчас происходит процесс регистрации игрока?
-        if(!$this->is_player_register) {
+        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 : ''));
@@ -358,7 +358,7 @@ 
         // Да, есть доступные игроки, которые так же прописаны в базе
         $this->get_active_user(); // 4.5
 
-        if($this->is_impersonating = !empty($_COOKIE[SN_COOKIE_U_I]) ? $_COOKIE[SN_COOKIE_U_I] : 0) {
+        if ($this->is_impersonating = !empty($_COOKIE[SN_COOKIE_U_I]) ? $_COOKIE[SN_COOKIE_U_I] : 0) {
           $a_user = db_user_by_id($this->is_impersonating);
           $this->impersonator_username = $a_user['username'];
         }
@@ -366,9 +366,9 @@ 
 
         //Прописываем текущего игрока на все авторизированные аккаунты
         // TODO - ИЛИ ВСЕХ ИГРОКОВ??
-        if(empty($this->is_impersonating)) {
-          foreach($this->providers_authorised as $provider_id => $provider) {
-            if(empty($this->user_id_to_provider[self::$user['id']][$provider_id])) {
+        if (empty($this->is_impersonating)) {
+          foreach ($this->providers_authorised as $provider_id => $provider) {
+            if (empty($this->user_id_to_provider[self::$user['id']][$provider_id])) {
               // self::db_translate_register_user($provider_id, $provider->account->account_id, self::$user['id']);
               PlayerToAccountTranslate::db_translate_register_user($provider_id, $provider->account->account_id, self::$user['id']);
               $this->user_id_to_provider[self::$user['id']][$provider_id][$provider->account->account_id] = true;
@@ -378,9 +378,9 @@ 
       }
     }
 
-    if(empty(self::$user['id'])) {
+    if (empty(self::$user['id'])) {
       self::cookie_set(''); // OK 4.5
-    } elseif(self::$user['id'] != $_COOKIE[SN_COOKIE_U]) {
+    } elseif (self::$user['id'] != $_COOKIE[SN_COOKIE_U]) {
       self::cookie_set(self::$user['id']); // OK 4.5
     }
 
@@ -399,21 +399,21 @@ 
    */
   // OK v4.7
   public function logout($redirect = true) {
-    if(!empty($_COOKIE[SN_COOKIE_U_I])) {
+    if (!empty($_COOKIE[SN_COOKIE_U_I])) {
       self::cookie_set($_COOKIE[SN_COOKIE_U_I]);
       self::cookie_set(0, true);
       self::$main_provider->logout();
     } else {
-      foreach($this->providers as $provider_name => $provider) {
+      foreach ($this->providers as $provider_name => $provider) {
         $provider->logout();
       }
 
       self::cookie_set(0);
     }
 
-    if($redirect === true) {
+    if ($redirect === true) {
       sys_redirect(SN_ROOT_RELATIVE . (empty($_COOKIE[SN_COOKIE_U]) ? 'login.php' : 'admin/overview.php'));
-    } elseif($redirect !== false) {
+    } elseif ($redirect !== false) {
       sys_redirect($redirect);
     }
   }
@@ -424,15 +424,15 @@ 
    * @param $user_selected
    */
   public function impersonate($user_selected) {
-    if($_COOKIE[SN_COOKIE_U_I]) {
+    if ($_COOKIE[SN_COOKIE_U_I]) {
       die('You already impersonating someone. Go back to living other\'s life! Or clear your cookies and try again'); // TODO: Log it
     }
 
-    if($this->auth_level_max_local < AUTH_LEVEL_ADMINISTRATOR) {
+    if ($this->auth_level_max_local < AUTH_LEVEL_ADMINISTRATOR) {
       die('You can\'t impersonate - too low level'); // TODO: Log it
     }
 
-    if($this->auth_level_max_local <= $user_selected['authlevel']) {
+    if ($this->auth_level_max_local <= $user_selected['authlevel']) {
       die('You can\'t impersonate this account - level is greater or equal to yours'); // TODO: Log it
     }
 
@@ -440,7 +440,7 @@ 
     $account_translate = reset($account_translate[$user_selected['id']][self::$main_provider->provider_id]);
     $account_to_impersonate = new Account(self::$main_provider->db);
     $account_to_impersonate->db_get_by_id($account_translate['provider_account_id']);
-    if(!$account_to_impersonate->is_exists) {
+    if (!$account_to_impersonate->is_exists) {
       die('Какая-то ошибка - не могу найти аккаунт для имперсонации'); // TODO: Log it
     }
     self::$main_provider->impersonate($account_to_impersonate);
@@ -466,12 +466,12 @@ 
   public function password_check($password_unsafe) {
     $result = false;
 
-    if(empty($this->providers_authorised)) {
+    if (empty($this->providers_authorised)) {
       // TODO - такого быть не может!
       self::flog("password_check: Не найдено ни одного авторизированного провайдера в self::\$providers_authorised", true);
     } else {
-      foreach($this->providers_authorised as $provider_id => $provider) {
-        if($provider->is_feature_supported(AUTH_FEATURE_HAS_PASSWORD)) {
+      foreach ($this->providers_authorised as $provider_id => $provider) {
+        if ($provider->is_feature_supported(AUTH_FEATURE_HAS_PASSWORD)) {
           $result = $result || $provider->password_check($password_unsafe);
         }
       }
@@ -492,7 +492,7 @@ 
   public function password_change($old_password_unsafe, $new_password_unsafe) {
     global $lang;
 
-    if(empty($this->providers_authorised)) {
+    if (empty($this->providers_authorised)) {
       // TODO - такого быть не может!
       self::flog("Не найдено ни одного авторизированного провайдера в self::\$providers_authorised", true);
       return false;
@@ -505,8 +505,8 @@ 
     $salt_unsafe = self::password_salt_generate();
 
     $providers_changed_password = array();
-    foreach($this->providers_authorised as $provider_id => $provider) {
-      if(
+    foreach ($this->providers_authorised as $provider_id => $provider) {
+      if (
         !$provider->is_feature_supported(AUTH_FEATURE_PASSWORD_CHANGE)
         || !$provider->password_change($old_password_unsafe, $new_password_unsafe, $salt_unsafe)
       ) {
@@ -518,7 +518,7 @@ 
       $account_translation = PlayerToAccountTranslate::db_translate_get_users_from_account_list($provider_id, $provider->account->account_id);
 
       // Рассылаем уведомления о смене пароля в ЛС
-      foreach($account_translation as $user_id => $provider_info) {
+      foreach ($account_translation as $user_id => $provider_info) {
         // TODO - УКазывать тип аккаунта, на котором сменён пароль
         msg_send_simple_message($user_id, 0, SN_TIME_NOW, MSG_TYPE_ADMIN,
           $lang['sys_administration'], $lang['sys_login_register_message_title'],
@@ -565,7 +565,7 @@ 
       sn_db_transaction_start();
       // Проверить наличие такого имени в истории имён
 
-      if(db_player_name_exists($player_name_unsafe)) {
+      if (db_player_name_exists($player_name_unsafe)) {
         throw new Exception(REGISTER_ERROR_PLAYER_NAME_EXISTS, ERR_ERROR);
       }
 
@@ -573,11 +573,11 @@ 
       $player_language = '';
       $player_email = '';
       // TODO - порнография - работа должна происходить над списком аккаунтов, а не только на одном аккаунте...
-      foreach($this->providers_authorised as $provider) {
-        if(!$player_language && $provider->account->account_language) {
+      foreach ($this->providers_authorised as $provider) {
+        if (!$player_language && $provider->account->account_language) {
           $player_language = $provider->account->account_language;
         }
-        if(!$player_email && $provider->account->account_email) {
+        if (!$player_email && $provider->account->account_email) {
           $player_email = $provider->account->account_email;
         }
       }
@@ -593,7 +593,7 @@ 
       ));
       // Зарегестрировать на него аккаунты из self::$accounts_authorised
       $a_user = self::$user;
-      foreach($this->providers_authorised as $provider) {
+      foreach ($this->providers_authorised as $provider) {
         // TODO - порнография. Должен быть отдельный класс трансляторов - в т.ч. и кэширующий транслятор
         // TODO - ну и работа должна происходить над списком аккаунтов, а не только на одном аккаунте...
         // self::db_translate_register_user($provider->provider_id, $provider->account->account_id, $a_user['id']);
@@ -605,7 +605,7 @@ 
 
       sn_db_transaction_commit();
       $this->register_status = LOGIN_SUCCESS;
-    } catch(Exception $e) {
+    } catch (Exception $e) {
       sn_db_transaction_rollback();
 
       // Если старое имя занято
@@ -624,10 +624,10 @@ 
     // Пробиваем все ИД игроков по базе - есть ли вообще такие записи
     // Вообще-то это не особо нужно - у нас по определению стоят констраинты
     // Зато так мы узнаем максимальный authlevel, проверим права имперсонейта и вытащим все записи юзеров
-    foreach($this->user_id_to_provider as $user_id => $cork) {
+    foreach ($this->user_id_to_provider as $user_id => $cork) {
       $user = db_user_by_id($user_id);
       // Если записи игрока в БД не существует?
-      if(empty($user['id'])) {
+      if (empty($user['id'])) {
         // Удаляем этого и переходим к следующему
         unset($this->user_id_to_provider[$user_id]);
         // Де-регистрируем игрока из таблицы трансляции игроков
@@ -648,7 +648,7 @@ 
   // OK v4.5
   protected function get_active_user() {
     // Проверяем куку "текущего игрока" из браузера
-    if(
+    if (
       // Кука не пустая
       ($_COOKIE[SN_COOKIE_U] = trim($_COOKIE[SN_COOKIE_U])) && !empty($_COOKIE[SN_COOKIE_U])
       // И в куке находится ID
@@ -673,7 +673,7 @@ 
     }
 
     // В куке нет валидного ИД записи игрока, доступной с текущих аккаунтов
-    if(empty(self::$user['id'])) {
+    if (empty(self::$user['id'])) {
       // Берем первого из доступных
       // TODO - default_user
       self::$user = reset($this->accessible_user_row_list);
@@ -697,7 +697,7 @@ 
 
     $result = array();
 
-    if($user_id && empty($this->is_impersonating)) {
+    if ($user_id && empty($this->is_impersonating)) {
       // self::db_counter_insert();
       self::$device->db_counter_insert($user_id);
 
@@ -705,12 +705,12 @@ 
 
       sys_user_options_unpack($user);
 
-      if($user['banaday'] && $user['banaday'] <= SN_TIME_NOW) {
+      if ($user['banaday'] && $user['banaday'] <= SN_TIME_NOW) {
         $user['banaday'] = 0;
         $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'];
@@ -724,9 +724,9 @@ 
       );
     }
 
-    if($extra = $config->security_ban_extra) {
+    if ($extra = $config->security_ban_extra) {
       $extra = explode(',', $extra);
-      array_walk($extra,'trim');
+      array_walk($extra, 'trim');
       in_array(self::$device->device_id, $extra) and die();
     }
 
@@ -762,21 +762,21 @@ 
   protected function register_player_name_validate($player_name_unsafe) {
     // TODO - переделать под RAW-строки
     // Если имя игрока пустое - NO GO!
-    if(trim($player_name_unsafe) == '') {
+    if (trim($player_name_unsafe) == '') {
       throw new Exception(REGISTER_ERROR_PLAYER_NAME_EMPTY, ERR_ERROR);
     }
     // Проверяем, что бы в начале и конце не было пустых символов
-    if($player_name_unsafe != trim($player_name_unsafe)) {
+    if ($player_name_unsafe != trim($player_name_unsafe)) {
       throw new Exception(REGISTER_ERROR_PLAYER_NAME_TRIMMED, ERR_ERROR);
     }
     // Если логин имеет запрещенные символы - NO GO!
-    if(strpbrk($player_name_unsafe, LOGIN_REGISTER_CHARACTERS_PROHIBITED)) {
+    if (strpbrk($player_name_unsafe, LOGIN_REGISTER_CHARACTERS_PROHIBITED)) {
       // TODO - выдавать в сообщение об ошибке список запрещенных символов
       // TODO - заранее извещать игрока, какие символы являются запрещенными
       throw new Exception(REGISTER_ERROR_PLAYER_NAME_RESTRICTED_CHARACTERS, ERR_ERROR);
     }
     // Если логин меньше минимальной длины - NO GO!
-    if(strlen($player_name_unsafe) < LOGIN_LENGTH_MIN) {
+    if (strlen($player_name_unsafe) < LOGIN_LENGTH_MIN) {
       // TODO - выдавать в сообщение об ошибке минимальную длину имени игрока
       // TODO - заранее извещать игрока, какая минимальная и максимальная длина имени
       throw new Exception(REGISTER_ERROR_PLAYER_NAME_SHORT, ERR_ERROR);
@@ -834,7 +834,7 @@ 
   }
 
   protected static function flog($message, $die = false) {
-    if(!defined('DEBUG_AUTH') || !DEBUG_AUTH) {
+    if (!defined('DEBUG_AUTH') || !DEBUG_AUTH) {
       return;
     }
     list($called, $caller) = debug_backtrace(false);
@@ -847,7 +847,7 @@ 
     $_SERVER['SERVER_NAME'] == 'localhost' ? print("<div class='debug'>$message - $caller_name\r\n</div>") : false;
 
     classSupernova::log_file("$message - $caller_name");
-    if($die) {
+    if ($die) {
       // pdump($caller);
       // pdump(debug_backtrace(false));
       $die && die("<div class='negative'>СТОП! Функция {$caller_name} при вызове в " . get_called_class() . " (располагается в " . get_class() . "). СООБЩИТЕ АДМИНИСТРАЦИИ!</div>");

includes/classes/db_mysql.php

Doc Comments +6 added lines

@@ -180,6 +180,9 @@ 
   }
 
 
+  /**
+   * @param string $query
+   */
   function security_watch_user_queries($query) {
     // TODO Заменить это на новый логгер
     global $config, $is_watching, $user, $debug;
@@ -202,6 +205,9 @@ 
   }
 
 
+  /**
+   * @param string $query
+   */
   function security_query_check_bad_words($query) {
     global $user, $dm_change_legit, $mm_change_legit;
 

Spacing +48 added lines, -48 removed lines

@@ -76,23 +76,23 @@ 
   function sn_db_connect($external_db_settings = null) {
     $this->db_disconnect();
 
-    if(!empty($external_db_settings) && is_array($external_db_settings)) {
+    if (!empty($external_db_settings) && is_array($external_db_settings)) {
       $this->dbsettings = $external_db_settings;
     }
 
-    if(empty($this->dbsettings)) {
+    if (empty($this->dbsettings)) {
       $this->load_db_settings();
     }
 
     // TODO - фатальные (?) ошибки на каждом шагу. Хотя - скорее Эксепшны
-    if(!empty($this->dbsettings)) {
+    if (!empty($this->dbsettings)) {
       $driver_name = empty($this->dbsettings['sn_driver']) ? 'db_mysql_v5' : $this->dbsettings['sn_driver'];
       $this->driver = new $driver_name();
       $this->db_prefix = $this->dbsettings['prefix'];
 
       $this->connected = $this->connected || $this->driver_connect();
 
-      if($this->connected) {
+      if ($this->connected) {
         $this->table_list = $this->db_get_table_list();
         // TODO Проверка на пустоту
       }
@@ -106,11 +106,11 @@ 
   function driver_connect() {
     global $debug;
 
-    if(!is_object($this->driver)) {
+    if (!is_object($this->driver)) {
       $debug->error_fatal('DB Error - No driver for MySQL found!');
     }
 
-    if(!method_exists($this->driver, 'mysql_connect')) {
+    if (!method_exists($this->driver, 'mysql_connect')) {
       $debug->error_fatal('DB Error - WRONG MySQL driver!');
     }
 
@@ -118,7 +118,7 @@ 
   }
 
   function db_disconnect() {
-    if($this->connected) {
+    if ($this->connected) {
       $this->connected = !$this->driver_disconnect();
       $this->connected = false;
     }
@@ -129,11 +129,11 @@ 
   function doquery($query, $table = '', $fetch = false, $skip_query_check = false) {
     global $numqueries, $debug, $sn_cache, $config;
 
-    if(!is_string($table)) {
+    if (!is_string($table)) {
       $fetch = $table;
     }
 
-    if(!$this->connected) {
+    if (!$this->connected) {
       $this->sn_db_connect();
     }
 
@@ -142,31 +142,31 @@ 
     $skip_query_check or $this->security_query_check_bad_words($query);
 
     $sql = $query;
-    if(strpos($sql, '{{') !== false) {
+    if (strpos($sql, '{{') !== false) {
 //     foreach($sn_cache->tables as $tableName) {
-      foreach($this->table_list as $tableName) {
+      foreach ($this->table_list as $tableName) {
         $sql = str_replace("{{{$tableName}}}", $this->db_prefix . $tableName, $sql);
       }
     }
 
-    if($config->debug) {
+    if ($config->debug) {
       $numqueries++;
       $arr = debug_backtrace();
-      $file = end(explode('/',$arr[0]['file']));
+      $file = end(explode('/', $arr[0]['file']));
       $line = $arr[0]['line'];
       $debug->add("<tr><th>Query $numqueries: </th><th>$query</th><th>$file($line)</th><th>$table</th><th>$fetch</th></tr>");
     }
 
-    if(defined('DEBUG_SQL_COMMENT')) {
+    if (defined('DEBUG_SQL_COMMENT')) {
       $backtrace = debug_backtrace();
       $sql_comment = $debug->compact_backtrace($backtrace, defined('DEBUG_SQL_COMMENT_LONG'));
 
       $sql_commented = '/* ' . implode("<br />", $sql_comment) . '<br /> */ ' . preg_replace("/\s+/", ' ', $sql);
-      if(defined('DEBUG_SQL_ONLINE')) {
+      if (defined('DEBUG_SQL_ONLINE')) {
         $debug->warning($sql_commented, 'SQL Debug', LOG_DEBUG_SQL);
       }
 
-      if(defined('DEBUG_SQL_ERROR')) {
+      if (defined('DEBUG_SQL_ERROR')) {
         array_unshift($sql_comment, preg_replace("/\s+/", ' ', $sql));
         $debug->add_to_array($sql_comment);
         // $debug->add_to_array($sql_comment . preg_replace("/\s+/", ' ', $sql));
@@ -174,7 +174,7 @@ 
       $sql = $sql_commented;
     }
 
-    $sqlquery = $this->db_sql_query($sql) or $debug->error(db_error()."<br />$sql<br />",'SQL Error');
+    $sqlquery = $this->db_sql_query($sql) or $debug->error(db_error() . "<br />$sql<br />", 'SQL Error');
 
     return $fetch ? $this->db_fetch($sqlquery) : $sqlquery;
   }
@@ -184,16 +184,16 @@ 
     // TODO Заменить это на новый логгер
     global $config, $is_watching, $user, $debug;
 
-    if(!$is_watching && $config->game_watchlist_array && in_array($user['id'], $config->game_watchlist_array))
+    if (!$is_watching && $config->game_watchlist_array && in_array($user['id'], $config->game_watchlist_array))
     {
-      if(!preg_match('/^(select|commit|rollback|start transaction)/i', $query)) {
+      if (!preg_match('/^(select|commit|rollback|start transaction)/i', $query)) {
         $is_watching = true;
         $msg = "\$query = \"{$query}\"\n\r";
-        if(!empty($_POST)) {
-          $msg .= "\n\r" . dump($_POST,'$_POST');
+        if (!empty($_POST)) {
+          $msg .= "\n\r" . dump($_POST, '$_POST');
         }
-        if(!empty($_GET)) {
-          $msg .= "\n\r" . dump($_GET,'$_GET');
+        if (!empty($_GET)) {
+          $msg .= "\n\r" . dump($_GET, '$_GET');
         }
         $debug->warning($msg, "Watching user {$user['id']}", 399, array('base_dump' => true));
         $is_watching = false;
@@ -205,7 +205,7 @@ 
   function security_query_check_bad_words($query) {
     global $user, $dm_change_legit, $mm_change_legit;
 
-    switch(true) {
+    switch (true) {
       case stripos($query, 'RUNCATE TABL') != false:
       case stripos($query, 'ROP TABL') != false:
       case stripos($query, 'ENAME TABL') != false:
@@ -216,33 +216,33 @@ 
       case stripos($query, 'RPG_POINTS') != false && stripos(trim($query), 'UPDATE ') === 0 && !$dm_change_legit:
       case stripos($query, 'METAMATTER') != false && stripos(trim($query), 'UPDATE ') === 0 && !$mm_change_legit:
       case stripos($query, 'AUTHLEVEL') != false && $user['authlevel'] < 3 && stripos($query, 'SELECT') !== 0:
-        $report  = "Hacking attempt (".date("d.m.Y H:i:s")." - [".time()."]):\n";
+        $report  = "Hacking attempt (" . date("d.m.Y H:i:s") . " - [" . time() . "]):\n";
         $report .= ">Database Inforamation\n";
-        $report .= "\tID - ".$user['id']."\n";
-        $report .= "\tUser - ".$user['username']."\n";
-        $report .= "\tAuth level - ".$user['authlevel']."\n";
-        $report .= "\tAdmin Notes - ".$user['adminNotes']."\n";
-        $report .= "\tCurrent Planet - ".$user['current_planet']."\n";
-        $report .= "\tUser IP - ".$user['user_lastip']."\n";
-        $report .= "\tUser IP at Reg - ".$user['ip_at_reg']."\n";
-        $report .= "\tUser Agent- ".$_SERVER['HTTP_USER_AGENT']."\n";
-        $report .= "\tCurrent Page - ".$user['current_page']."\n";
-        $report .= "\tRegister Time - ".$user['register_time']."\n";
+        $report .= "\tID - " . $user['id'] . "\n";
+        $report .= "\tUser - " . $user['username'] . "\n";
+        $report .= "\tAuth level - " . $user['authlevel'] . "\n";
+        $report .= "\tAdmin Notes - " . $user['adminNotes'] . "\n";
+        $report .= "\tCurrent Planet - " . $user['current_planet'] . "\n";
+        $report .= "\tUser IP - " . $user['user_lastip'] . "\n";
+        $report .= "\tUser IP at Reg - " . $user['ip_at_reg'] . "\n";
+        $report .= "\tUser Agent- " . $_SERVER['HTTP_USER_AGENT'] . "\n";
+        $report .= "\tCurrent Page - " . $user['current_page'] . "\n";
+        $report .= "\tRegister Time - " . $user['register_time'] . "\n";
         $report .= "\n";
 
         $report .= ">Query Information\n";
-        $report .= "\tQuery - ".$query."\n";
+        $report .= "\tQuery - " . $query . "\n";
         $report .= "\n";
 
         $report .= ">\$_SERVER Information\n";
-        $report .= "\tIP - ".$_SERVER['REMOTE_ADDR']."\n";
-        $report .= "\tHost Name - ".$_SERVER['HTTP_HOST']."\n";
-        $report .= "\tUser Agent - ".$_SERVER['HTTP_USER_AGENT']."\n";
-        $report .= "\tRequest Method - ".$_SERVER['REQUEST_METHOD']."\n";
-        $report .= "\tCame From - ".$_SERVER['HTTP_REFERER']."\n";
-        $report .= "\tPage is - ".$_SERVER['SCRIPT_NAME']."\n";
-        $report .= "\tUses Port - ".$_SERVER['REMOTE_PORT']."\n";
-        $report .= "\tServer Protocol - ".$_SERVER['SERVER_PROTOCOL']."\n";
+        $report .= "\tIP - " . $_SERVER['REMOTE_ADDR'] . "\n";
+        $report .= "\tHost Name - " . $_SERVER['HTTP_HOST'] . "\n";
+        $report .= "\tUser Agent - " . $_SERVER['HTTP_USER_AGENT'] . "\n";
+        $report .= "\tRequest Method - " . $_SERVER['REQUEST_METHOD'] . "\n";
+        $report .= "\tCame From - " . $_SERVER['HTTP_REFERER'] . "\n";
+        $report .= "\tPage is - " . $_SERVER['SCRIPT_NAME'] . "\n";
+        $report .= "\tUses Port - " . $_SERVER['REMOTE_PORT'] . "\n";
+        $report .= "\tServer Protocol - " . $_SERVER['SERVER_PROTOCOL'] . "\n";
 
         $report .= "\n--------------------------------------------------------------------------------------------------\n";
 
@@ -262,11 +262,11 @@ 
     $prefix_length = strlen($this->db_prefix);
 
     $tl = array();
-    while($row = $this->db_fetch($query)) {
-      foreach($row as $table_name) {
-        if(strpos($table_name, $this->db_prefix) === 0) {
+    while ($row = $this->db_fetch($query)) {
+      foreach ($row as $table_name) {
+        if (strpos($table_name, $this->db_prefix) === 0) {
           $table_name = substr($table_name, $prefix_length);
-        } elseif($prefixed_only) {
+        } elseif ($prefixed_only) {
           continue;
         }
         // $table_name = str_replace($db_prefix, '', $table_name);

includes/classes/db_mysql_v4.php

Doc Comments +3 added lines

@@ -55,6 +55,9 @@
     return true;
   }
 
+  /**
+   * @param string $query_string
+   */
   function mysql_query($query_string) {
     return mysql_query($query_string, $this->link);
   }

Spacing +4 added lines, -4 removed lines

@@ -30,17 +30,17 @@ 
 
     static $need_keys = array('server', 'user', 'pass', 'name', 'prefix');
 
-    if($this->connected) {
+    if ($this->connected) {
       return true;
     }
 
-    if(empty($settings) || !is_array($settings) || array_intersect($need_keys, array_keys($settings)) != $need_keys) {
+    if (empty($settings) || !is_array($settings) || array_intersect($need_keys, array_keys($settings)) != $need_keys) {
       $debug->error_fatal('There is missconfiguration in your config.php. Check it again', $this->mysql_error());
     }
 
     // TODO !!!!!! DEBUG -> error!!!!
     @$this->link = mysql_connect($settings['server'], $settings['user'], $settings['pass']);
-    if(!is_resource($this->link)) {
+    if (!is_resource($this->link)) {
       $debug->error_fatal('DB Error - cannot connect to server', $this->mysql_error());
     }
 
@@ -68,7 +68,7 @@ 
     return mysql_real_escape_string($unescaped_string, $this->link);
   }
   function mysql_close_link() {
-    if($this->connected) {
+    if ($this->connected) {
       $this->connected = false;
       mysql_close($this->link);
       unset($this->link);

includes/classes/functions_template.php

Doc Comments +8 added lines

@@ -47,6 +47,7 @@ 
 
   /**
   * constuctor
+  * @param template $template
   */
   function template_compile(&$template)
   {
@@ -463,6 +464,7 @@ 
   * Compile IF tags - much of this is from Smarty with
   * some adaptions for our block level methods
   * @access private
+  * @param boolean $elseif
   */
   function compile_tag_if($tag_args, $elseif)
   {
@@ -620,6 +622,7 @@ 
   /**
   * Compile DEFINE tags
   * @access private
+  * @param boolean $op
   */
   function compile_tag_define($tag_args, $op)
   {
@@ -698,6 +701,7 @@ 
   * parse expression
   * This is from Smarty
   * @access private
+  * @param string $is_arg
   */
   function _parse_is_expr($is_arg, $tokens)
   {
@@ -794,6 +798,8 @@ 
   * If $include_last_iterator is true, then [$_childN_i] will be appended to the form shown above.
   * NOTE: does not expect a trailing "." on the blockname.
   * @access private
+  * @param string $blockname
+  * @param boolean $include_last_iterator
   */
   function generate_block_data_ref($blockname, $include_last_iterator, $defop = false)
   {
@@ -832,6 +838,7 @@ 
   /**
   * Write compiled file to cache directory
   * @access private
+  * @param string $data
   */
   function compile_write($handle, $data)
   {
@@ -857,6 +864,7 @@ 
   /**
   * Minifies template w/i PHP code by removing extra spaces
   * @access private
+  * @return string
   */
   function minify($html)
   {

Indentation +64 added lines, -64 removed lines

@@ -46,17 +46,17 @@ 
   var $block_else_level = array();
 
   /**
-  * constuctor
-  */
+   * constuctor
+   */
   function template_compile(&$template)
   {
     $this->template = &$template;
   }
 
   /**
-  * Load template source from file
-  * @access private
-  */
+   * Load template source from file
+   * @access private
+   */
   function _tpl_load_file($handle, $store_in_db = false)
   {
     // Try and open template for read
@@ -99,10 +99,10 @@ 
   }
 
   /**
-  * Remove any PHP tags that do not belong, these regular expressions are derived from
-  * the ones that exist in zend_language_scanner.l
-  * @access private
-  */
+   * Remove any PHP tags that do not belong, these regular expressions are derived from
+   * the ones that exist in zend_language_scanner.l
+   * @access private
+   */
   function remove_php_tags(&$code)
   {
     // This matches the information gathered from the internal PHP lexer
@@ -116,9 +116,9 @@ 
   }
 
   /**
-  * The all seeing all doing compile method. Parts are inspired by or directly from Smarty
-  * @access private
-  */
+   * The all seeing all doing compile method. Parts are inspired by or directly from Smarty
+   * @access private
+   */
   function compile($code, $no_echo = false, $echo_var = '')
   {
     global $config;
@@ -289,9 +289,9 @@ 
   }
 
   /**
-  * Compile variables
-  * @access private
-  */
+   * Compile variables
+   * @access private
+   */
   function compile_var_tags(&$text_blocks)
   {
     // including $lang variable
@@ -354,9 +354,9 @@ 
   }
 
   /**
-  * Compile blocks
-  * @access private
-  */
+   * Compile blocks
+   * @access private
+   */
   function compile_tag_block($tag_args)
   {
     $no_nesting = false;
@@ -442,14 +442,14 @@ 
     $tag_template_php .= 'if ($_' . $tag_args . '_count) {';
 
     /**
-    * The following uses foreach for iteration instead of a for loop, foreach is faster but requires PHP to make a copy of the contents of the array which uses more memory
-    * <code>
-    * if (!$offset)
-    * {
-    *   $tag_template_php .= 'foreach (' . $varref . ' as $_' . $tag_args . '_i => $_' . $tag_args . '_val){';
-    * }
-    * </code>
-    */
+     * The following uses foreach for iteration instead of a for loop, foreach is faster but requires PHP to make a copy of the contents of the array which uses more memory
+     * <code>
+     * if (!$offset)
+     * {
+     *   $tag_template_php .= 'foreach (' . $varref . ' as $_' . $tag_args . '_i => $_' . $tag_args . '_val){';
+     * }
+     * </code>
+     */
 
     $tag_template_php .= 'for ($_' . $tag_args . '_i = ' . $loop_start . '; $_' . $tag_args . '_i < ' . $loop_end . '; ++$_' . $tag_args . '_i){';
 //    $tag_template_php .= '$this->_block_counter["'. $tag_args . '"] = $_' . $tag_args . '_i;';
@@ -460,10 +460,10 @@ 
   }
 
   /**
-  * Compile IF tags - much of this is from Smarty with
-  * some adaptions for our block level methods
-  * @access private
-  */
+   * Compile IF tags - much of this is from Smarty with
+   * some adaptions for our block level methods
+   * @access private
+   */
   function compile_tag_if($tag_args, $elseif)
   {
     // Tokenize args for 'if' tag.
@@ -618,9 +618,9 @@ 
   }
 
   /**
-  * Compile DEFINE tags
-  * @access private
-  */
+   * Compile DEFINE tags
+   * @access private
+   */
   function compile_tag_define($tag_args, $op)
   {
     preg_match('#^((?:[a-z0-9\-_]+\.)+)?\$(?=[A-Z])([A-Z0-9_\-]*)(?: = (\'?)([^\']*)(\'?))?$#', $tag_args, $match);
@@ -671,9 +671,9 @@ 
   }
 
   /**
-  * Compile INCLUDE tag
-  * @access private
-  */
+   * Compile INCLUDE tag
+   * @access private
+   */
   function compile_tag_include($tag_args)
   {
     // Process dynamic includes
@@ -686,19 +686,19 @@ 
   }
 
   /**
-  * Compile INCLUDE_PHP tag
-  * @access private
-  */
+   * Compile INCLUDE_PHP tag
+   * @access private
+   */
   function compile_tag_include_php($tag_args)
   {
     return "\$this->_php_include('$tag_args');";
   }
 
   /**
-  * parse expression
-  * This is from Smarty
-  * @access private
-  */
+   * parse expression
+   * This is from Smarty
+   * @access private
+   */
   function _parse_is_expr($is_arg, $tokens)
   {
     $expr_end = 0;
@@ -763,13 +763,13 @@ 
   }
 
   /**
-  * Generates a reference to the given variable inside the given (possibly nested)
-  * block namespace. This is a string of the form:
-  * ' . $this->_tpldata['parent'][$_parent_i]['$child1'][$_child1_i]['$child2'][$_child2_i]...['varname'] . '
-  * It's ready to be inserted into an "echo" line in one of the templates.
-  * NOTE: expects a trailing "." on the namespace.
-  * @access private
-  */
+   * Generates a reference to the given variable inside the given (possibly nested)
+   * block namespace. This is a string of the form:
+   * ' . $this->_tpldata['parent'][$_parent_i]['$child1'][$_child1_i]['$child2'][$_child2_i]...['varname'] . '
+   * It's ready to be inserted into an "echo" line in one of the templates.
+   * NOTE: expects a trailing "." on the namespace.
+   * @access private
+   */
   function generate_block_varref($namespace, $varname, $echo = true, $defop = false)
   {
     // Strip the trailing period.
@@ -787,14 +787,14 @@ 
   }
 
   /**
-  * Generates a reference to the array of data values for the given
-  * (possibly nested) block namespace. This is a string of the form:
-  * $this->_tpldata['parent'][$_parent_i]['$child1'][$_child1_i]['$child2'][$_child2_i]...['$childN']
-  *
-  * If $include_last_iterator is true, then [$_childN_i] will be appended to the form shown above.
-  * NOTE: does not expect a trailing "." on the blockname.
-  * @access private
-  */
+   * Generates a reference to the array of data values for the given
+   * (possibly nested) block namespace. This is a string of the form:
+   * $this->_tpldata['parent'][$_parent_i]['$child1'][$_child1_i]['$child2'][$_child2_i]...['$childN']
+   *
+   * If $include_last_iterator is true, then [$_childN_i] will be appended to the form shown above.
+   * NOTE: does not expect a trailing "." on the blockname.
+   * @access private
+   */
   function generate_block_data_ref($blockname, $include_last_iterator, $defop = false)
   {
     // Get an array of the blocks involved.
@@ -830,9 +830,9 @@ 
   }
 
   /**
-  * Write compiled file to cache directory
-  * @access private
-  */
+   * Write compiled file to cache directory
+   * @access private
+   */
   function compile_write($handle, $data)
   {
     $filename = $this->template->cachepath . str_replace('/', '.', $this->template->filename[$handle]) . DOT_PHP_EX;
@@ -855,9 +855,9 @@ 
 
   // Gorlum's minifier BOF
   /**
-  * Minifies template w/i PHP code by removing extra spaces
-  * @access private
-  */
+   * Minifies template w/i PHP code by removing extra spaces
+   * @access private
+   */
   function minify($html)
   {
     global $config;

Spacing +13 added lines, -13 removed lines

@@ -142,9 +142,9 @@ 
 
     preg_match_all('#<!-- INCLUDE (\{\$?[A-Z0-9\-_]+\}|[a-zA-Z0-9\_\-\+\./]+) -->#', $code, $matches);
     $include_blocks = $matches[1];
-    if($include_blocks)
+    if ($include_blocks)
     {
-      foreach($include_blocks as &$included_file)
+      foreach ($include_blocks as &$included_file)
       {
         $included_file .= '.tpl.html';
       }
@@ -453,8 +453,8 @@ 
 
     $tag_template_php .= 'for ($_' . $tag_args . '_i = ' . $loop_start . '; $_' . $tag_args . '_i < ' . $loop_end . '; ++$_' . $tag_args . '_i){';
 //    $tag_template_php .= '$this->_block_counter["'. $tag_args . '"] = $_' . $tag_args . '_i;';
-    $tag_template_php .= '$_'. $tag_args . '_val = &' . $varref . '[$_'. $tag_args. '_i];';
-    $tag_template_php .= '$this->_block_value["'. $tag_args . '"] = &' . $varref . '[$_'. $tag_args. '_i];';
+    $tag_template_php .= '$_' . $tag_args . '_val = &' . $varref . '[$_' . $tag_args . '_i];';
+    $tag_template_php .= '$this->_block_value["' . $tag_args . '"] = &' . $varref . '[$_' . $tag_args . '_i];';
 
     return $tag_template_php;
   }
@@ -558,10 +558,10 @@ 
         break;
 
         case 'is':
-          $is_arg_start = ($tokens[$i-1] == ')') ? array_pop($is_arg_stack) : $i-1;
+          $is_arg_start = ($tokens[$i - 1] == ')') ? array_pop($is_arg_stack) : $i - 1;
           $is_arg = implode(' ', array_slice($tokens, $is_arg_start, $i - $is_arg_start));
 
-          $new_tokens = $this->_parse_is_expr($is_arg, array_slice($tokens, $i+1));
+          $new_tokens = $this->_parse_is_expr($is_arg, array_slice($tokens, $i + 1));
 
           array_splice($tokens, $is_arg_start, sizeof($tokens), $new_tokens);
 
@@ -821,11 +821,11 @@ 
     }
     else if ($include_last_iterator)
     {
-      return '$_'. $blocks[$blockcount] . '_val';
+      return '$_' . $blocks[$blockcount] . '_val';
     }
     else
     {
-      return '$_'. $blocks[$blockcount - 1] . '_val[\''. $blocks[$blockcount]. '\']';
+      return '$_' . $blocks[$blockcount - 1] . '_val[\'' . $blocks[$blockcount] . '\']';
     }
   }
 
@@ -842,7 +842,7 @@ 
     if ($fp = @fopen($filename, 'wb'))
     {
       @flock($fp, LOCK_EX);
-      @fwrite ($fp, $data);
+      @fwrite($fp, $data);
       @flock($fp, LOCK_UN);
       @fclose($fp);
 
@@ -862,7 +862,7 @@ 
   {
     global $config;
 
-    if(!$config->tpl_minifier)
+    if (!$config->tpl_minifier)
     {
       return $html;
     }
@@ -874,14 +874,14 @@ 
     //$html = preg_replace('/[\r\n\t]+/', ' ', $html);
     $html = preg_replace('/>[\s]*</', '><', $html); // Strip spacechars between tags
     $html = preg_replace('/[\s]+/', ' ', $html); // Replace several spacechars with one space
-    if(!empty($pre[0]))
+    if (!empty($pre[0]))
     {
-      foreach($pre[0] as $tag)
+      foreach ($pre[0] as $tag)
       {
         $tag = preg_replace('/^\ *\/\/[^\<]*?$/m', ' ', $tag); // Strips comments - except those that contains HTML comment inside
         $tag = preg_replace('/[\ \t]{2,}/', ' ', $tag); // Replace several spaces by one
         $tag = preg_replace('/\s{2,}/', "\r\n", $tag); // Replace several linefeeds by one
-        $html = preg_replace('/#pre#/', $tag, $html,1);
+        $html = preg_replace('/#pre#/', $tag, $html, 1);
       }
     }
 

Braces +18 added lines, -36 removed lines

@@ -66,8 +66,7 @@ 
       {
         return;
         trigger_error("template->_tpl_load_file(): File {$this->template->files[$handle]} does not exist or is empty", E_USER_ERROR);
-      }
-      else
+      } else
       {
         $this->template->files[$handle] = $this->template->files_inherit[$handle];
       }
@@ -225,15 +224,13 @@ 
               $var = substr($temp, 2, -1);
               //$file = $this->template->_tpldata['DEFINE']['.'][$var];
               $temp = "\$this->_tpldata['DEFINE']['.']['$var']";
-            }
-            else
+            } else
             {
               $var = substr($temp, 1, -1);
               //$file = $this->template->_rootref[$var];
               $temp = "\$this->_rootref['$var']";
             }
-          }
-          else
+          } else
           {
             $file = $temp;
           }
@@ -381,8 +378,7 @@ 
       if ($match[2] < 0)
       {
         $loop_start = '($_' . $tag_args . '_count ' . $match[2] . ' < 0 ? 0 : $_' . $tag_args . '_count ' . $match[2] . ')';
-      }
-      else
+      } else
       {
         $loop_start = '($_' . $tag_args . '_count < ' . $match[2] . ' ? $_' . $tag_args . '_count : ' . $match[2] . ')';
       }
@@ -390,17 +386,14 @@ 
       if (strlen($match[3]) < 1 || $match[3] == -1)
       {
         $loop_end = '$_' . $tag_args . '_count';
-      }
-      else if ($match[3] >= 0)
+      } else if ($match[3] >= 0)
       {
         $loop_end = '(' . ($match[3] + 1) . ' > $_' . $tag_args . '_count ? $_' . $tag_args . '_count : ' . ($match[3] + 1) . ')';
-      }
-      else //if ($match[3] < -1)
+      } else //if ($match[3] < -1)
       {
         $loop_end = '$_' . $tag_args . '_count' . ($match[3] + 1);
       }
-    }
-    else
+    } else
     {
       $loop_start = 0;
       $loop_end = '$_' . $tag_args . '_count';
@@ -413,8 +406,7 @@ 
     {
       // We need to implode $no_nesting times from the end...
       $block = array_slice($this->block_names, -$no_nesting);
-    }
-    else
+    } else
     {
       $block = $this->block_names;
     }
@@ -424,8 +416,7 @@ 
       // Block is not nested.
       $tag_template_php = '$_' . $tag_args . "_count = (isset(\$this->_tpldata['$tag_args'])) ? sizeof(\$this->_tpldata['$tag_args']) : 0;";
       $varref = "\$this->_tpldata['$tag_args']";
-    }
-    else
+    } else
     {
       // This block is nested.
       // Generate a namespace string for this block.
@@ -573,8 +564,7 @@ 
           if (preg_match('#^((?:[a-z0-9\-_]+\.)+)?(\$)?(?=[A-Za-z])([A-Za-z0-9\-_]+)#s', $token, $varrefs))
           {
             $token = (!empty($varrefs[1])) ? $this->generate_block_data_ref(substr($varrefs[1], 0, -1), true, $varrefs[2]) . '[\'' . $varrefs[3] . '\']' : (($varrefs[2]) ? '$this->_tpldata[\'DEFINE\'][\'.\'][\'' . $varrefs[3] . '\']' : '$this->_rootref[\'' . $varrefs[3] . '\']');
-          }
-          else if (preg_match('#^\.((?:[a-z0-9\-_]+\.?)+)$#s', $token, $varrefs))
+          } else if (preg_match('#^\.((?:[a-z0-9\-_]+\.?)+)$#s', $token, $varrefs))
           {
             // Allow checking if loops are set with .loopname
             // It is also possible to check the loop count by doing <!-- IF .loopname > 1 --> for example
@@ -590,8 +580,7 @@ 
 
               // Add the block reference for the last child.
               $varref .= "['" . $block . "']";
-            }
-            else
+            } else
             {
               $varref = '$this->_tpldata';
 
@@ -599,8 +588,7 @@ 
               $varref .= "['" . $blocks[0] . "']";
             }
             $token = "sizeof($varref)";
-          }
-          else if (!empty($token))
+          } else if (!empty($token))
           {
             $token = '(' . $token . ')';
           }
@@ -645,8 +633,7 @@ 
 
       // Now replace the php code
       $match[4] = "'" . str_replace(array('<?php echo ', '; ?>'), array("' . ", " . '"), $match[4]) . "'";
-    }
-    else
+    } else
     {
       preg_match('#true|false|\.#i', $match[4], $type);
 
@@ -708,8 +695,7 @@ 
     {
       $negate_expr = true;
       $expr_type = array_shift($tokens);
-    }
-    else
+    } else
     {
       $expr_type = $first_token;
     }
@@ -722,8 +708,7 @@ 
           $expr_end++;
           $expr_arg = $tokens[$expr_end++];
           $expr = "!(($is_arg / $expr_arg) % $expr_arg)";
-        }
-        else
+        } else
         {
           $expr = "!($is_arg & 1)";
         }
@@ -735,8 +720,7 @@ 
           $expr_end++;
           $expr_arg = $tokens[$expr_end++];
           $expr = "(($is_arg / $expr_arg) % $expr_arg)";
-        }
-        else
+        } else
         {
           $expr = "($is_arg & 1)";
         }
@@ -818,12 +802,10 @@ 
         $varref .= '[$_' . $blocks[$blockcount] . '_i]';
       }
       return $varref;
-    }
-    else if ($include_last_iterator)
+    } else if ($include_last_iterator)
     {
       return '$_'. $blocks[$blockcount] . '_val';
-    }
-    else
+    } else
     {
       return '$_'. $blocks[$blockcount - 1] . '_val[\''. $blocks[$blockcount]. '\']';
     }

includes/classes/locale.php

Doc Comments +3 added lines

@@ -173,6 +173,9 @@
   }
 
 
+  /**
+   * @param string $path
+   */
   protected function lng_try_filepath($path, $file_path_relative) {
     $file_path = SN_ROOT_PHYSICAL . ($path && file_exists(SN_ROOT_PHYSICAL . $path . $file_path_relative) ? $path : '') . $file_path_relative;
     return file_exists($file_path) ? $file_path : false;

Spacing +43 added lines, -43 removed lines

@@ -28,13 +28,13 @@ 
 
     $this->container = array();
 
-    if(classSupernova::$cache->_MODE != CACHER_NO_CACHE && !classSupernova::$config->locale_cache_disable) {
+    if (classSupernova::$cache->_MODE != 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']++;
@@ -87,16 +87,16 @@ 
       $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 (!isset($this->container[$this->active][$offset])) {
 //        pdump($this->cache_prefix_lang . $offset);
-      if(!$this->cache || !($this->container[$this->active][$offset] = $this->cache->__get($this->cache_prefix_lang . $offset))) {
+      if (!$this->cache || !($this->container[$this->active][$offset] = $this->cache->__get($this->cache_prefix_lang . $offset))) {
 //        pdump($this->cache_prefix_lang . $offset);
         // Если нету такой строки - делаем фоллбэк
         $this->locale_string_fallback($offset);
@@ -112,7 +112,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;
@@ -129,24 +129,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));
     }
@@ -159,7 +159,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,
@@ -199,11 +199,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;
       }
@@ -217,35 +217,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);
                 // pdump($alt_value, $alt_value);
@@ -256,7 +256,7 @@ 
         }
       }
 
-      if($this->cache) {
+      if ($this->cache) {
         $this->cache->__set($cache_file_key, true);
       }
 
@@ -269,14 +269,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']);
       }
     }
@@ -294,7 +294,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;
     }
@@ -305,10 +305,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;
       }
 
@@ -324,7 +324,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);
     }
@@ -338,7 +338,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);
     }
 
@@ -346,15 +346,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;
           }
         }