@@ -542,7 +542,8 @@ discard block |
||
542 | 542 | $location_info = &static::$location_info[$location_type]; |
543 | 543 | $id_field = $location_info[P_ID]; |
544 | 544 | $table_name = $location_info[P_TABLE_NAME]; |
545 | - if ($result = static::db_query($q = "UPDATE {{{$table_name}}} SET {$set} WHERE `{$id_field}` = {$record_id}")) // TODO Как-то вернуть может быть LIMIT 1 ? |
|
545 | + if ($result = static::db_query($q = "UPDATE {{{$table_name}}} SET {$set} WHERE `{$id_field}` = {$record_id}")) { |
|
546 | + // TODO Как-то вернуть может быть LIMIT 1 ? |
|
546 | 547 | { |
547 | 548 | if (static::$db->db_affected_rows()) { |
548 | 549 | // Обновляем данные только если ряд был затронут |
@@ -550,6 +551,7 @@ discard block |
||
550 | 551 | |
551 | 552 | // Тут именно так, а не cache_unset - что бы в кэшах автоматически обновилась запись. Будет нужно на будущее |
552 | 553 | static::$data[$location_type][$record_id] = null; |
554 | + } |
|
553 | 555 | // Вытаскиваем обновленную запись |
554 | 556 | static::db_get_record_by_id($location_type, $record_id); |
555 | 557 | static::cache_clear($location_type, false); // Мягкий сброс - только $queries |
@@ -589,9 +591,11 @@ discard block |
||
589 | 591 | $set = trim($set); |
590 | 592 | $table_name = static::$location_info[$location_type][P_TABLE_NAME]; |
591 | 593 | if ($result = static::db_query("INSERT INTO `{{{$table_name}}}` SET {$set}")) { |
592 | - if (static::$db->db_affected_rows()) // Обновляем данные только если ряд был затронут |
|
594 | + if (static::$db->db_affected_rows()) { |
|
595 | + // Обновляем данные только если ряд был затронут |
|
593 | 596 | { |
594 | 597 | $record_id = db_insert_id(); |
598 | + } |
|
595 | 599 | // Вытаскиваем запись целиком, потому что в $set могли быть "данные по умолчанию" |
596 | 600 | $result = static::db_get_record_by_id($location_type, $record_id); |
597 | 601 | // Очищаем второстепенные кэши - потому что вставленная запись могла повлиять на результаты запросов или локация или еще чего |
@@ -93,12 +93,12 @@ discard block |
||
93 | 93 | $this->prepare(); |
94 | 94 | |
95 | 95 | $this->manifest['active'] = false; |
96 | - if(!empty($this->config) && is_array($this->config['db'])) { |
|
96 | + if (!empty($this->config) && is_array($this->config['db'])) { |
|
97 | 97 | // БД, отличная от стандартной |
98 | 98 | $this->db = new db_mysql(); |
99 | 99 | |
100 | 100 | $this->db->sn_db_connect($this->config['db']); |
101 | - if($this->manifest['active'] = $this->db->connected) { |
|
101 | + if ($this->manifest['active'] = $this->db->connected) { |
|
102 | 102 | $this->provider_id = ACCOUNT_PROVIDER_CENTRAL; |
103 | 103 | |
104 | 104 | $this->domain = $this->config['domain']; |
@@ -112,7 +112,7 @@ discard block |
||
112 | 112 | } |
113 | 113 | |
114 | 114 | // Fallback to local DB |
115 | - if(!$this->manifest['active']) { |
|
115 | + if (!$this->manifest['active']) { |
|
116 | 116 | $this->db = classSupernova::$db; |
117 | 117 | |
118 | 118 | $this->provider_id = ACCOUNT_PROVIDER_LOCAL; |
@@ -125,7 +125,7 @@ discard block |
||
125 | 125 | $this->manifest['active'] = true; |
126 | 126 | } |
127 | 127 | |
128 | - $this->cookie_name_impersonate = $this->cookie_name . AUTH_COOKIE_IMPERSONATE_SUFFIX; |
|
128 | + $this->cookie_name_impersonate = $this->cookie_name.AUTH_COOKIE_IMPERSONATE_SUFFIX; |
|
129 | 129 | |
130 | 130 | $this->account = new Account($this->db); |
131 | 131 | $this->confirmation = new Confirmation($this->db); |
@@ -166,7 +166,7 @@ discard block |
||
166 | 166 | // OK v4.5 |
167 | 167 | public function password_change($old_password_unsafe, $new_password_unsafe, $salt_unsafe = null) { |
168 | 168 | $result = parent::password_change($old_password_unsafe, $new_password_unsafe, $salt_unsafe); |
169 | - if($result) { |
|
169 | + if ($result) { |
|
170 | 170 | $this->cookie_set(); |
171 | 171 | } |
172 | 172 | |
@@ -194,12 +194,12 @@ discard block |
||
194 | 194 | */ |
195 | 195 | // OK v4.6 |
196 | 196 | protected function password_reset_send_code() { |
197 | - if(!$this->is_password_reset) { |
|
197 | + if (!$this->is_password_reset) { |
|
198 | 198 | return $this->account_login_status; |
199 | 199 | } |
200 | 200 | |
201 | 201 | // Проверяем поддержку сброса пароля |
202 | - if(!$this->is_feature_supported(AUTH_FEATURE_PASSWORD_RESET)) { |
|
202 | + if (!$this->is_feature_supported(AUTH_FEATURE_PASSWORD_RESET)) { |
|
203 | 203 | return $this->account_login_status; |
204 | 204 | } |
205 | 205 | |
@@ -209,7 +209,7 @@ discard block |
||
209 | 209 | unset($this->account); |
210 | 210 | $this->account = new Account($this->db); |
211 | 211 | |
212 | - if(!$this->account->db_get_by_email($email_unsafe)) { |
|
212 | + if (!$this->account->db_get_by_email($email_unsafe)) { |
|
213 | 213 | throw new Exception(PASSWORD_RESTORE_ERROR_EMAIL_NOT_EXISTS, ERR_ERROR); |
214 | 214 | // return $this->account_login_status; |
215 | 215 | } |
@@ -219,14 +219,14 @@ discard block |
||
219 | 219 | |
220 | 220 | // TODO - Проверять уровень доступа аккаунта! |
221 | 221 | // Аккаунты с АУТЛЕВЕЛ больше 0 - НЕ СБРАСЫВАЮТ ПАРОЛИ! |
222 | - foreach($user_list as $user_id => $user_data) { |
|
223 | - if($user_data['authlevel'] > AUTH_LEVEL_REGISTERED) { |
|
222 | + foreach ($user_list as $user_id => $user_data) { |
|
223 | + if ($user_data['authlevel'] > AUTH_LEVEL_REGISTERED) { |
|
224 | 224 | throw new Exception(PASSWORD_RESTORE_ERROR_ADMIN_ACCOUNT, ERR_ERROR); |
225 | 225 | } |
226 | 226 | } |
227 | 227 | |
228 | 228 | $confirmation = $this->confirmation->db_confirmation_get_latest_by_type_and_email(CONFIRM_PASSWORD_RESET, $email_unsafe); // OK 4.5 |
229 | - if(isset($confirmation['create_time']) && SN_TIME_NOW - strtotime($confirmation['create_time']) < PERIOD_MINUTE_10) { |
|
229 | + if (isset($confirmation['create_time']) && SN_TIME_NOW - strtotime($confirmation['create_time']) < PERIOD_MINUTE_10) { |
|
230 | 230 | throw new Exception(PASSWORD_RESTORE_ERROR_TOO_OFTEN, ERR_ERROR); |
231 | 231 | } |
232 | 232 | |
@@ -239,11 +239,11 @@ discard block |
||
239 | 239 | |
240 | 240 | @$result = mymail($email_unsafe, |
241 | 241 | sprintf(classLocale::$lang['log_lost_email_title'], classSupernova::$config->game_name), |
242 | - sprintf(classLocale::$lang['log_lost_email_code'], SN_ROOT_VIRTUAL . 'login.php', $confirm_code_unsafe, date(FMT_DATE_TIME, SN_TIME_NOW + AUTH_PASSWORD_RESET_CONFIRMATION_EXPIRE), classSupernova::$config->game_name) |
|
242 | + sprintf(classLocale::$lang['log_lost_email_code'], SN_ROOT_VIRTUAL.'login.php', $confirm_code_unsafe, date(FMT_DATE_TIME, SN_TIME_NOW + AUTH_PASSWORD_RESET_CONFIRMATION_EXPIRE), classSupernova::$config->game_name) |
|
243 | 243 | ); |
244 | 244 | |
245 | 245 | $result = $result ? PASSWORD_RESTORE_SUCCESS_CODE_SENT : PASSWORD_RESTORE_ERROR_SENDING; |
246 | - } catch(Exception $e) { |
|
246 | + } catch (Exception $e) { |
|
247 | 247 | sn_db_transaction_rollback(); |
248 | 248 | $result = $e->getMessage(); |
249 | 249 | } |
@@ -256,46 +256,46 @@ discard block |
||
256 | 256 | * @return int|string |
257 | 257 | */ |
258 | 258 | protected function password_reset_confirm() { |
259 | - if(!$this->is_password_reset_confirm) { |
|
259 | + if (!$this->is_password_reset_confirm) { |
|
260 | 260 | return $this->account_login_status; |
261 | 261 | } |
262 | 262 | |
263 | - if($this->account_login_status != LOGIN_UNDEFINED) { |
|
263 | + if ($this->account_login_status != LOGIN_UNDEFINED) { |
|
264 | 264 | return $this->account_login_status; |
265 | 265 | } |
266 | 266 | |
267 | 267 | // Проверяем поддержку сброса пароля |
268 | - if(!$this->is_feature_supported(AUTH_FEATURE_PASSWORD_RESET)) { |
|
268 | + if (!$this->is_feature_supported(AUTH_FEATURE_PASSWORD_RESET)) { |
|
269 | 269 | return $this->account_login_status; |
270 | 270 | } |
271 | 271 | |
272 | 272 | try { |
273 | 273 | $code_unsafe = sys_get_param_str_unsafe('password_reset_code'); |
274 | - if(empty($code_unsafe)) { |
|
274 | + if (empty($code_unsafe)) { |
|
275 | 275 | throw new Exception(PASSWORD_RESTORE_ERROR_CODE_EMPTY, ERR_ERROR); |
276 | 276 | } |
277 | 277 | |
278 | 278 | sn_db_transaction_start(); |
279 | 279 | $confirmation = $this->confirmation->db_confirmation_get_by_type_and_code(CONFIRM_PASSWORD_RESET, $code_unsafe); // OK 4.5 |
280 | 280 | |
281 | - if(empty($confirmation)) { |
|
281 | + if (empty($confirmation)) { |
|
282 | 282 | throw new Exception(PASSWORD_RESTORE_ERROR_CODE_WRONG, ERR_ERROR); |
283 | 283 | } |
284 | 284 | |
285 | - if(SN_TIME_NOW - strtotime($confirmation['create_time']) > AUTH_PASSWORD_RESET_CONFIRMATION_EXPIRE) { |
|
285 | + if (SN_TIME_NOW - strtotime($confirmation['create_time']) > AUTH_PASSWORD_RESET_CONFIRMATION_EXPIRE) { |
|
286 | 286 | throw new Exception(PASSWORD_RESTORE_ERROR_CODE_TOO_OLD, ERR_ERROR); |
287 | 287 | } |
288 | 288 | |
289 | 289 | unset($this->account); |
290 | 290 | $this->account = new Account($this->db); |
291 | 291 | |
292 | - if(!$this->account->db_get_by_email($confirmation['email'])) { |
|
292 | + if (!$this->account->db_get_by_email($confirmation['email'])) { |
|
293 | 293 | throw new Exception(PASSWORD_RESTORE_ERROR_CODE_OK_BUT_NO_ACCOUNT_FOR_EMAIL, ERR_ERROR); |
294 | 294 | } |
295 | 295 | |
296 | 296 | $new_password_unsafe = $this->make_random_password(); |
297 | 297 | $salt_unsafe = $this->password_salt_generate(); |
298 | - if(!$this->account->db_set_password($new_password_unsafe, $salt_unsafe)) { |
|
298 | + if (!$this->account->db_set_password($new_password_unsafe, $salt_unsafe)) { |
|
299 | 299 | // Ошибка смены пароля |
300 | 300 | throw new Exception(AUTH_ERROR_INTERNAL_PASSWORD_CHANGE_ON_RESTORE, ERR_ERROR); |
301 | 301 | } |
@@ -305,14 +305,14 @@ discard block |
||
305 | 305 | $this->cookie_set(); |
306 | 306 | $this->login_cookie(); |
307 | 307 | |
308 | - if($this->account_login_status == LOGIN_SUCCESS) { |
|
308 | + if ($this->account_login_status == LOGIN_SUCCESS) { |
|
309 | 309 | // TODO - НЕ ОБЯЗАТЕЛЬНО ОТПРАВЛЯТЬ ЧЕРЕЗ ЕМЕЙЛ! ЕСЛИ ЭТО ФЕЙСБУЧЕК ИЛИ ВКШЕЧКА - МОЖНО ЧЕРЕЗ ЛС ПИСАТЬ!! |
310 | 310 | $message_header = sprintf(classLocale::$lang['log_lost_email_title'], classSupernova::$config->game_name); |
311 | 311 | $message = sprintf(classLocale::$lang['log_lost_email_pass'], classSupernova::$config->game_name, $this->account->account_name, $new_password_unsafe); |
312 | 312 | @$operation_result = mymail($confirmation['email'], $message_header, htmlspecialchars($message)); |
313 | 313 | |
314 | 314 | $users_translated = PlayerToAccountTranslate::db_translate_get_users_from_account_list($this->provider_id, $this->account->account_id); // OK 4.5 |
315 | - if(!empty($users_translated)) { |
|
315 | + if (!empty($users_translated)) { |
|
316 | 316 | // Отправляем в лички письмо о сбросе пароля |
317 | 317 | |
318 | 318 | // ПО ОПРЕДЕЛЕНИЮ в $users_translated только |
@@ -321,9 +321,9 @@ discard block |
||
321 | 321 | // - игроки, привязанные только к этим аккаунтам |
322 | 322 | // Значит им всем сразу скопом можно отправлять сообщения |
323 | 323 | $message = sprintf(classLocale::$lang['sys_password_reset_message_body'], $new_password_unsafe); |
324 | - $message = sys_bbcodeParse($message) . '<br><br>'; |
|
324 | + $message = sys_bbcodeParse($message).'<br><br>'; |
|
325 | 325 | |
326 | - foreach($users_translated as $user_id => $providers_list) { |
|
326 | + foreach ($users_translated as $user_id => $providers_list) { |
|
327 | 327 | msg_send_simple_message($user_id, 0, SN_TIME_NOW, MSG_TYPE_ADMIN, classLocale::$lang['sys_administration'], classLocale::$lang['sys_login_register_message_title'], $message); |
328 | 328 | } |
329 | 329 | } else { |
@@ -375,10 +375,10 @@ discard block |
||
375 | 375 | // OK v4.5 |
376 | 376 | protected function register() { |
377 | 377 | // TODO РЕГИСТРАЦИЯ ВСЕГДА ДОЛЖНА ЛОГИНИТЬ ПОЛЬЗОВАТЕЛЯ! |
378 | - $this->flog('Регистрация: начинаем. Провайдер ' . $this->provider_id); |
|
378 | + $this->flog('Регистрация: начинаем. Провайдер '.$this->provider_id); |
|
379 | 379 | |
380 | 380 | try { |
381 | - if(!$this->is_register) { |
|
381 | + if (!$this->is_register) { |
|
382 | 382 | $this->flog('Регистрация: не выставлен флаг регистрации - пропускаем'); |
383 | 383 | throw new Exception(LOGIN_UNDEFINED, ERR_ERROR); |
384 | 384 | } |
@@ -388,8 +388,8 @@ discard block |
||
388 | 388 | sn_db_transaction_start(); |
389 | 389 | |
390 | 390 | $this->account->db_get_by_name_or_email($this->input_login_unsafe, $this->input_email_unsafe); |
391 | - if($this->account->is_exists) { |
|
392 | - if($this->account->account_email == $this->input_email_unsafe) { |
|
391 | + if ($this->account->is_exists) { |
|
392 | + if ($this->account->account_email == $this->input_email_unsafe) { |
|
393 | 393 | throw new Exception(REGISTER_ERROR_EMAIL_EXISTS, ERR_ERROR); |
394 | 394 | } else { |
395 | 395 | throw new Exception(REGISTER_ERROR_ACCOUNT_NAME_EXISTS, ERR_ERROR); |
@@ -411,7 +411,7 @@ discard block |
||
411 | 411 | // А вот это пока не нужно. Трансляцией аккаунтов в юзеров и созданием новых юзеров для новозашедших аккаунтов занимается Auth |
412 | 412 | // $this->register_account(); |
413 | 413 | sn_db_transaction_commit(); |
414 | - } catch(Exception $e) { |
|
414 | + } catch (Exception $e) { |
|
415 | 415 | sn_db_transaction_rollback(); |
416 | 416 | $this->account_login_status == LOGIN_UNDEFINED ? $this->account_login_status = $e->getMessage() : false; |
417 | 417 | } |
@@ -427,19 +427,19 @@ discard block |
||
427 | 427 | */ |
428 | 428 | // OK v4.5 |
429 | 429 | protected function login_cookie() { |
430 | - if($this->account_login_status != LOGIN_UNDEFINED) { |
|
430 | + if ($this->account_login_status != LOGIN_UNDEFINED) { |
|
431 | 431 | return $this->account_login_status; |
432 | 432 | } |
433 | 433 | |
434 | 434 | // Пытаемся войти по куке |
435 | - if(!empty($_COOKIE[$this->cookie_name])) { |
|
436 | - if(count(explode("/%/", $_COOKIE[$this->cookie_name])) < 4) { |
|
435 | + if (!empty($_COOKIE[$this->cookie_name])) { |
|
436 | + if (count(explode("/%/", $_COOKIE[$this->cookie_name])) < 4) { |
|
437 | 437 | list($account_id_unsafe, $cookie_password_hash_salted, $user_remember_me) = explode(AUTH_COOKIE_DELIMETER, $_COOKIE[$this->cookie_name]); |
438 | 438 | } else { |
439 | 439 | list($account_id_unsafe, $user_name, $cookie_password_hash_salted, $user_remember_me) = explode("/%/", $_COOKIE[$this->cookie_name]); |
440 | 440 | } |
441 | 441 | |
442 | - if( |
|
442 | + if ( |
|
443 | 443 | $this->account->db_get_by_id($account_id_unsafe) |
444 | 444 | && ($this->password_encode_for_cookie($this->account->account_password) == $cookie_password_hash_salted) |
445 | 445 | ) { |
@@ -448,7 +448,7 @@ discard block |
||
448 | 448 | } |
449 | 449 | } |
450 | 450 | |
451 | - if($this->account_login_status != LOGIN_SUCCESS) { |
|
451 | + if ($this->account_login_status != LOGIN_SUCCESS) { |
|
452 | 452 | // Невалидная кука - чистим |
453 | 453 | $this->cookie_clear(); |
454 | 454 | } |
@@ -466,29 +466,29 @@ discard block |
||
466 | 466 | protected function login_username() { |
467 | 467 | // TODO - Логин по старым именам |
468 | 468 | try { |
469 | - if(!$this->is_login) { |
|
469 | + if (!$this->is_login) { |
|
470 | 470 | $this->flog('Логин: не выставлен флаг входа в игру - это не логин'); |
471 | 471 | throw new Exception(LOGIN_UNDEFINED, ERR_ERROR); |
472 | 472 | } |
473 | 473 | |
474 | 474 | // TODO Пустое имя аккаунта |
475 | - if(!$this->input_login_unsafe) { |
|
475 | + if (!$this->input_login_unsafe) { |
|
476 | 476 | throw new Exception(LOGIN_UNDEFINED, ERR_ERROR); |
477 | 477 | } |
478 | 478 | |
479 | 479 | $this->login_validate_input(); |
480 | 480 | |
481 | - if(!$this->account->db_get_by_name($this->input_login_unsafe) && !$this->account->db_get_by_email($this->input_login_unsafe)) { |
|
481 | + if (!$this->account->db_get_by_name($this->input_login_unsafe) && !$this->account->db_get_by_email($this->input_login_unsafe)) { |
|
482 | 482 | throw new Exception(LOGIN_ERROR_USERNAME, ERR_ERROR); |
483 | 483 | } |
484 | 484 | |
485 | - if(!$this->account->password_check($this->input_login_password_raw)) { |
|
485 | + if (!$this->account->password_check($this->input_login_password_raw)) { |
|
486 | 486 | throw new Exception(LOGIN_ERROR_PASSWORD, ERR_ERROR); |
487 | 487 | } |
488 | 488 | |
489 | 489 | $this->cookie_set(); |
490 | 490 | $this->account_login_status = LOGIN_SUCCESS; |
491 | - } catch(Exception $e) { |
|
491 | + } catch (Exception $e) { |
|
492 | 492 | $this->account_login_status == LOGIN_UNDEFINED ? $this->account_login_status = $e->getMessage() : false; |
493 | 493 | } |
494 | 494 | |
@@ -510,18 +510,18 @@ discard block |
||
510 | 510 | protected function cookie_set($account_to_impersonate = null) { |
511 | 511 | $this_account = is_object($account_to_impersonate) ? $account_to_impersonate : $this->account; |
512 | 512 | |
513 | - if(!is_object($this_account) || !$this_account->is_exists) { |
|
513 | + if (!is_object($this_account) || !$this_account->is_exists) { |
|
514 | 514 | throw new Exception(LOGIN_ERROR_NO_ACCOUNT_FOR_COOKIE_SET, ERR_ERROR); |
515 | 515 | } |
516 | 516 | |
517 | - if(is_object($account_to_impersonate) && $account_to_impersonate->is_exists) { |
|
517 | + if (is_object($account_to_impersonate) && $account_to_impersonate->is_exists) { |
|
518 | 518 | sn_setcookie($this->cookie_name_impersonate, $_COOKIE[$this->cookie_name], SN_TIME_NOW + PERIOD_YEAR, $this->sn_root_path, $this->domain); |
519 | 519 | } |
520 | 520 | |
521 | 521 | $expire_time = $this->remember_me ? SN_TIME_NOW + PERIOD_YEAR : 0; |
522 | 522 | |
523 | 523 | $password_encoded = $this->password_encode_for_cookie($this_account->account_password); |
524 | - $cookie = $this_account->account_id . AUTH_COOKIE_DELIMETER . $password_encoded . AUTH_COOKIE_DELIMETER . $this->remember_me; |
|
524 | + $cookie = $this_account->account_id.AUTH_COOKIE_DELIMETER.$password_encoded.AUTH_COOKIE_DELIMETER.$this->remember_me; |
|
525 | 525 | $this->flog("cookie_set() - Устанавливаем куку {$cookie}"); |
526 | 526 | return sn_setcookie($this->cookie_name, $cookie, $expire_time, $this->sn_root_path, $this->domain); |
527 | 527 | } |
@@ -532,7 +532,7 @@ discard block |
||
532 | 532 | // OK v4.1 |
533 | 533 | protected function cookie_clear() { |
534 | 534 | // Автоматически вообще-то - если установлена кука имперсонатора - то чистим обычную, а куку имперсонатора - копируем в неё |
535 | - if(!empty($_COOKIE[$this->cookie_name_impersonate])) { |
|
535 | + if (!empty($_COOKIE[$this->cookie_name_impersonate])) { |
|
536 | 536 | sn_setcookie($this->cookie_name, $_COOKIE[$this->cookie_name_impersonate], SN_TIME_NOW + PERIOD_YEAR, $this->sn_root_path, $this->domain); |
537 | 537 | sn_setcookie($this->cookie_name_impersonate, '', SN_TIME_NOW - PERIOD_WEEK, $this->sn_root_path, $this->domain); |
538 | 538 | } else { |
@@ -551,10 +551,10 @@ discard block |
||
551 | 551 | protected function login_validate_input() { |
552 | 552 | // Проверяем, что бы в начале и конце не было пустых символов |
553 | 553 | // TODO - при копировании Эксель -> Опера - в конце образуются пустые места. Это не должно быть проблемой! Вынести проверку пароля в регистрацию! |
554 | - if($this->input_login_password_raw != trim($this->input_login_password_raw)) { |
|
554 | + if ($this->input_login_password_raw != trim($this->input_login_password_raw)) { |
|
555 | 555 | throw new Exception(LOGIN_ERROR_PASSWORD_TRIMMED, ERR_ERROR); |
556 | 556 | } |
557 | - if(!$this->input_login_password_raw) { |
|
557 | + if (!$this->input_login_password_raw) { |
|
558 | 558 | throw new Exception(LOGIN_ERROR_PASSWORD_EMPTY, ERR_ERROR); |
559 | 559 | } |
560 | 560 | } |
@@ -570,37 +570,37 @@ discard block |
||
570 | 570 | $this->login_validate_input(); |
571 | 571 | |
572 | 572 | // Если нет имени пользователя - NO GO! |
573 | - if(!$this->input_login_unsafe) { |
|
573 | + if (!$this->input_login_unsafe) { |
|
574 | 574 | throw new Exception(LOGIN_ERROR_USERNAME_EMPTY, ERR_ERROR); |
575 | 575 | } |
576 | 576 | // Если логин имеет запрещенные символы - NO GO! |
577 | - if(strpbrk($this->input_login_unsafe, LOGIN_REGISTER_CHARACTERS_PROHIBITED)) { |
|
577 | + if (strpbrk($this->input_login_unsafe, LOGIN_REGISTER_CHARACTERS_PROHIBITED)) { |
|
578 | 578 | throw new Exception(LOGIN_ERROR_USERNAME_RESTRICTED_CHARACTERS, ERR_ERROR); |
579 | 579 | } |
580 | 580 | // Если логин меньше минимальной длины - NO GO! |
581 | - if(strlen($this->input_login_unsafe) < LOGIN_LENGTH_MIN) { |
|
581 | + if (strlen($this->input_login_unsafe) < LOGIN_LENGTH_MIN) { |
|
582 | 582 | throw new Exception(REGISTER_ERROR_USERNAME_SHORT, ERR_ERROR); |
583 | 583 | } |
584 | 584 | // Если пароль меньше минимальной длины - NO GO! |
585 | - if(strlen($this->input_login_password_raw) < PASSWORD_LENGTH_MIN) { |
|
585 | + if (strlen($this->input_login_password_raw) < PASSWORD_LENGTH_MIN) { |
|
586 | 586 | throw new Exception(REGISTER_ERROR_PASSWORD_INSECURE, ERR_ERROR); |
587 | 587 | } |
588 | 588 | // Если пароль имеет пробельные символы в начале или конце - NO GO! |
589 | - if($this->input_login_password_raw != trim($this->input_login_password_raw)) { |
|
589 | + if ($this->input_login_password_raw != trim($this->input_login_password_raw)) { |
|
590 | 590 | throw new Exception(LOGIN_ERROR_PASSWORD_TRIMMED, ERR_ERROR); |
591 | 591 | } |
592 | 592 | // Если пароль не совпадает с подтверждением - NO GO! То, что у пароля нет пробельных символов в начале/конце - мы уже проверили выше |
593 | 593 | //Если они есть у повтора - значит пароль и повтор не совпадут |
594 | - if($this->input_login_password_raw <> $this->input_login_password_raw_repeat) { |
|
594 | + if ($this->input_login_password_raw <> $this->input_login_password_raw_repeat) { |
|
595 | 595 | throw new Exception(REGISTER_ERROR_PASSWORD_DIFFERENT, ERR_ERROR); |
596 | 596 | } |
597 | 597 | // Если нет емейла - NO GO! |
598 | 598 | // TODO - регистрация без емейла |
599 | - if(!$this->input_email_unsafe) { |
|
599 | + if (!$this->input_email_unsafe) { |
|
600 | 600 | throw new Exception(REGISTER_ERROR_EMAIL_EMPTY, ERR_ERROR); |
601 | 601 | } |
602 | 602 | // Если емейл не является емейлом - NO GO! |
603 | - if(!is_email($this->input_email_unsafe)) { |
|
603 | + if (!is_email($this->input_email_unsafe)) { |
|
604 | 604 | throw new Exception(REGISTER_ERROR_EMAIL_WRONG, ERR_ERROR); |
605 | 605 | } |
606 | 606 | } |
@@ -609,7 +609,7 @@ discard block |
||
609 | 609 | |
610 | 610 | // OK v4 |
611 | 611 | protected function password_encode_for_cookie($password) { |
612 | - return md5("{$password}--" . $this->secret_word); |
|
612 | + return md5("{$password}--".$this->secret_word); |
|
613 | 613 | } |
614 | 614 | // OK v4 |
615 | 615 | protected function password_encode($password, $salt) { |
@@ -629,22 +629,22 @@ discard block |
||
629 | 629 | return core_auth::make_random_password(); |
630 | 630 | } |
631 | 631 | protected function flog($message, $die = false) { |
632 | - if(!defined('DEBUG_AUTH') || !DEBUG_AUTH) { |
|
632 | + if (!defined('DEBUG_AUTH') || !DEBUG_AUTH) { |
|
633 | 633 | return; |
634 | 634 | } |
635 | 635 | list($called, $caller) = debug_backtrace(false); |
636 | 636 | |
637 | 637 | $caller_name = |
638 | - ((get_called_class()) ? get_called_class() : (!empty($caller['class']) ? $caller['class'] : '')) . |
|
639 | - (!empty($caller['type']) ? $caller['type'] : '') . |
|
640 | - (!empty($caller['function']) ? $caller['function'] : '') . |
|
641 | - (!empty($called['line']) ? ':' . $called['line'] : ''); |
|
638 | + ((get_called_class()) ? get_called_class() : (!empty($caller['class']) ? $caller['class'] : '')). |
|
639 | + (!empty($caller['type']) ? $caller['type'] : ''). |
|
640 | + (!empty($caller['function']) ? $caller['function'] : ''). |
|
641 | + (!empty($called['line']) ? ':'.$called['line'] : ''); |
|
642 | 642 | |
643 | 643 | $_SERVER['SERVER_NAME'] == 'localhost' ? print("<div class='debug'>$message - $caller_name\r\n</div>") : false; |
644 | 644 | |
645 | 645 | classSupernova::log_file("$message - $caller_name"); |
646 | - if($die) { |
|
647 | - $die && die("<div class='negative'>СТОП! Функция {$caller_name} при вызове в " . get_called_class() . " (располагается в " . get_class() . "). СООБЩИТЕ АДМИНИСТРАЦИИ!</div>"); |
|
646 | + if ($die) { |
|
647 | + $die && die("<div class='negative'>СТОП! Функция {$caller_name} при вызове в ".get_called_class()." (располагается в ".get_class()."). СООБЩИТЕ АДМИНИСТРАЦИИ!</div>"); |
|
648 | 648 | } |
649 | 649 | } |
650 | 650 |