@@ -29,7 +29,7 @@ |
||
| 29 | 29 | */ |
| 30 | 30 | protected $_repository; |
| 31 | 31 | |
| 32 | - /** |
|
| 32 | + /** |
|
| 33 | 33 | * @var ContainerPlus $_oldRepo |
| 34 | 34 | */ |
| 35 | 35 | protected $_oldRepo; |
@@ -86,7 +86,7 @@ |
||
| 86 | 86 | |
| 87 | 87 | public function get($entityClass, $id) { |
| 88 | 88 | $entityIndex = get_class($entityClass) . '\\' . $id; |
| 89 | - if(!isset($this->_repository[$entityIndex])) { |
|
| 89 | + if (!isset($this->_repository[$entityIndex])) { |
|
| 90 | 90 | |
| 91 | 91 | } |
| 92 | 92 | |
@@ -11,7 +11,7 @@ |
||
| 11 | 11 | class SnBootstrap { |
| 12 | 12 | |
| 13 | 13 | public static function install_benchmark() { |
| 14 | - register_shutdown_function(function () { |
|
| 14 | + register_shutdown_function(function() { |
|
| 15 | 15 | if (defined('IN_AJAX')) { |
| 16 | 16 | return; |
| 17 | 17 | } |
@@ -58,7 +58,7 @@ |
||
| 58 | 58 | $config->pass()->game_disable = GAME_DISABLE_STAT; |
| 59 | 59 | |
| 60 | 60 | $statMinimalInterval = intval($config->pass()->stats_minimal_interval); |
| 61 | - $config->pass()->var_stat_update_end= date(FMT_DATE_TIME_SQL, SN_TIME_NOW + ($statMinimalInterval ? $statMinimalInterval : STATS_RUN_INTERVAL_MINIMUM)); |
|
| 61 | + $config->pass()->var_stat_update_end = date(FMT_DATE_TIME_SQL, SN_TIME_NOW + ($statMinimalInterval ? $statMinimalInterval : STATS_RUN_INTERVAL_MINIMUM)); |
|
| 62 | 62 | $config->pass()->var_stat_update_msg = 'Update started'; |
| 63 | 63 | sn_db_transaction_commit(); |
| 64 | 64 | |
@@ -22,11 +22,11 @@ |
||
| 22 | 22 | |
| 23 | 23 | define('IN_AJAX', true); |
| 24 | 24 | |
| 25 | -if(($result = StatUpdateLauncher::scheduler_process()) && !defined('IN_ADMIN')) { |
|
| 25 | +if (($result = StatUpdateLauncher::scheduler_process()) && !defined('IN_ADMIN')) { |
|
| 26 | 26 | $result = htmlspecialchars($result, ENT_QUOTES, 'UTF-8'); |
| 27 | 27 | print(json_encode($result)); |
| 28 | 28 | } |
| 29 | 29 | |
| 30 | -if(!defined('IN_ADMIN')) { |
|
| 30 | +if (!defined('IN_ADMIN')) { |
|
| 31 | 31 | die(); |
| 32 | 32 | } |
@@ -96,12 +96,12 @@ discard block |
||
| 96 | 96 | $this->prepare(); |
| 97 | 97 | |
| 98 | 98 | $this->manifest['active'] = false; |
| 99 | - if(!empty($this->config) && is_array($this->config['db'])) { |
|
| 99 | + if (!empty($this->config) && is_array($this->config['db'])) { |
|
| 100 | 100 | // БД, отличная от стандартной |
| 101 | 101 | $this->db = new db_mysql(); |
| 102 | 102 | |
| 103 | 103 | $this->db->sn_db_connect($this->config['db']); |
| 104 | - if($this->manifest['active'] = $this->db->connected) { |
|
| 104 | + if ($this->manifest['active'] = $this->db->connected) { |
|
| 105 | 105 | $this->provider_id = ACCOUNT_PROVIDER_CENTRAL; |
| 106 | 106 | |
| 107 | 107 | $this->domain = $this->config['domain']; |
@@ -115,7 +115,7 @@ discard block |
||
| 115 | 115 | } |
| 116 | 116 | |
| 117 | 117 | // Fallback to local DB |
| 118 | - if(!$this->manifest['active']) { |
|
| 118 | + if (!$this->manifest['active']) { |
|
| 119 | 119 | $this->db = classSupernova::$db; |
| 120 | 120 | |
| 121 | 121 | $this->provider_id = ACCOUNT_PROVIDER_LOCAL; |
@@ -169,7 +169,7 @@ discard block |
||
| 169 | 169 | */ |
| 170 | 170 | public function password_change($old_password_unsafe, $new_password_unsafe, $salt_unsafe = null) { |
| 171 | 171 | $result = parent::password_change($old_password_unsafe, $new_password_unsafe, $salt_unsafe); |
| 172 | - if($result) { |
|
| 172 | + if ($result) { |
|
| 173 | 173 | $this->cookie_set(); |
| 174 | 174 | } |
| 175 | 175 | |
@@ -198,12 +198,12 @@ discard block |
||
| 198 | 198 | protected function password_reset_send_code() { |
| 199 | 199 | global $lang, $config; |
| 200 | 200 | |
| 201 | - if(!$this->is_password_reset) { |
|
| 201 | + if (!$this->is_password_reset) { |
|
| 202 | 202 | return $this->account_login_status; |
| 203 | 203 | } |
| 204 | 204 | |
| 205 | 205 | // Проверяем поддержку сброса пароля |
| 206 | - if(!$this->is_feature_supported(AUTH_FEATURE_PASSWORD_RESET)) { |
|
| 206 | + if (!$this->is_feature_supported(AUTH_FEATURE_PASSWORD_RESET)) { |
|
| 207 | 207 | return $this->account_login_status; |
| 208 | 208 | } |
| 209 | 209 | |
@@ -213,7 +213,7 @@ discard block |
||
| 213 | 213 | unset($this->account); |
| 214 | 214 | $this->account = new Account($this->db); |
| 215 | 215 | |
| 216 | - if(!$this->account->db_get_by_email($email_unsafe)) { |
|
| 216 | + if (!$this->account->db_get_by_email($email_unsafe)) { |
|
| 217 | 217 | throw new Exception(PASSWORD_RESTORE_ERROR_EMAIL_NOT_EXISTS, ERR_ERROR); |
| 218 | 218 | // return $this->account_login_status; |
| 219 | 219 | } |
@@ -223,14 +223,14 @@ discard block |
||
| 223 | 223 | |
| 224 | 224 | // TODO - Проверять уровень доступа аккаунта! |
| 225 | 225 | // Аккаунты с АУТЛЕВЕЛ больше 0 - НЕ СБРАСЫВАЮТ ПАРОЛИ! |
| 226 | - foreach($user_list as $user_id => $user_data) { |
|
| 227 | - if($user_data['authlevel'] > AUTH_LEVEL_REGISTERED) { |
|
| 226 | + foreach ($user_list as $user_id => $user_data) { |
|
| 227 | + if ($user_data['authlevel'] > AUTH_LEVEL_REGISTERED) { |
|
| 228 | 228 | throw new Exception(PASSWORD_RESTORE_ERROR_ADMIN_ACCOUNT, ERR_ERROR); |
| 229 | 229 | } |
| 230 | 230 | } |
| 231 | 231 | |
| 232 | 232 | $confirmation = $this->confirmation->db_confirmation_get_latest_by_type_and_email(CONFIRM_PASSWORD_RESET, $email_unsafe); // OK 4.5 |
| 233 | - if(isset($confirmation['create_time']) && SN_TIME_NOW - strtotime($confirmation['create_time']) < PERIOD_MINUTE_10) { |
|
| 233 | + if (isset($confirmation['create_time']) && SN_TIME_NOW - strtotime($confirmation['create_time']) < PERIOD_MINUTE_10) { |
|
| 234 | 234 | throw new Exception(PASSWORD_RESTORE_ERROR_TOO_OFTEN, ERR_ERROR); |
| 235 | 235 | } |
| 236 | 236 | |
@@ -241,7 +241,7 @@ discard block |
||
| 241 | 241 | $confirm_code_unsafe = $this->confirmation->db_confirmation_get_unique_code_by_type_and_email(CONFIRM_PASSWORD_RESET, $email_unsafe); // OK 4.5 |
| 242 | 242 | sn_db_transaction_commit(); |
| 243 | 243 | |
| 244 | - if(!is_email($email_unsafe)) { |
|
| 244 | + if (!is_email($email_unsafe)) { |
|
| 245 | 245 | classSupernova::$debug->error("Email is invalid: '{$email_unsafe}'", 'Invalid email for password restoration'); |
| 246 | 246 | } |
| 247 | 247 | |
@@ -251,7 +251,7 @@ discard block |
||
| 251 | 251 | ); |
| 252 | 252 | |
| 253 | 253 | $result = $result ? PASSWORD_RESTORE_SUCCESS_CODE_SENT : PASSWORD_RESTORE_ERROR_SENDING; |
| 254 | - } catch(Exception $e) { |
|
| 254 | + } catch (Exception $e) { |
|
| 255 | 255 | sn_db_transaction_rollback(); |
| 256 | 256 | $result = $e->getMessage(); |
| 257 | 257 | } |
@@ -266,46 +266,46 @@ discard block |
||
| 266 | 266 | protected function password_reset_confirm() { |
| 267 | 267 | global $lang, $config; |
| 268 | 268 | |
| 269 | - if(!$this->is_password_reset_confirm) { |
|
| 269 | + if (!$this->is_password_reset_confirm) { |
|
| 270 | 270 | return $this->account_login_status; |
| 271 | 271 | } |
| 272 | 272 | |
| 273 | - if($this->account_login_status != LOGIN_UNDEFINED) { |
|
| 273 | + if ($this->account_login_status != LOGIN_UNDEFINED) { |
|
| 274 | 274 | return $this->account_login_status; |
| 275 | 275 | } |
| 276 | 276 | |
| 277 | 277 | // Проверяем поддержку сброса пароля |
| 278 | - if(!$this->is_feature_supported(AUTH_FEATURE_PASSWORD_RESET)) { |
|
| 278 | + if (!$this->is_feature_supported(AUTH_FEATURE_PASSWORD_RESET)) { |
|
| 279 | 279 | return $this->account_login_status; |
| 280 | 280 | } |
| 281 | 281 | |
| 282 | 282 | try { |
| 283 | 283 | $code_unsafe = sys_get_param_str_unsafe('password_reset_code'); |
| 284 | - if(empty($code_unsafe)) { |
|
| 284 | + if (empty($code_unsafe)) { |
|
| 285 | 285 | throw new Exception(PASSWORD_RESTORE_ERROR_CODE_EMPTY, ERR_ERROR); |
| 286 | 286 | } |
| 287 | 287 | |
| 288 | 288 | sn_db_transaction_start(); |
| 289 | 289 | $confirmation = $this->confirmation->db_confirmation_get_by_type_and_code(CONFIRM_PASSWORD_RESET, $code_unsafe); // OK 4.5 |
| 290 | 290 | |
| 291 | - if(empty($confirmation)) { |
|
| 291 | + if (empty($confirmation)) { |
|
| 292 | 292 | throw new Exception(PASSWORD_RESTORE_ERROR_CODE_WRONG, ERR_ERROR); |
| 293 | 293 | } |
| 294 | 294 | |
| 295 | - if(SN_TIME_NOW - strtotime($confirmation['create_time']) > AUTH_PASSWORD_RESET_CONFIRMATION_EXPIRE) { |
|
| 295 | + if (SN_TIME_NOW - strtotime($confirmation['create_time']) > AUTH_PASSWORD_RESET_CONFIRMATION_EXPIRE) { |
|
| 296 | 296 | throw new Exception(PASSWORD_RESTORE_ERROR_CODE_TOO_OLD, ERR_ERROR); |
| 297 | 297 | } |
| 298 | 298 | |
| 299 | 299 | unset($this->account); |
| 300 | 300 | $this->account = new Account($this->db); |
| 301 | 301 | |
| 302 | - if(!$this->account->db_get_by_email($confirmation['email'])) { |
|
| 302 | + if (!$this->account->db_get_by_email($confirmation['email'])) { |
|
| 303 | 303 | throw new Exception(PASSWORD_RESTORE_ERROR_CODE_OK_BUT_NO_ACCOUNT_FOR_EMAIL, ERR_ERROR); |
| 304 | 304 | } |
| 305 | 305 | |
| 306 | 306 | $new_password_unsafe = $this->make_random_password(); |
| 307 | 307 | $salt_unsafe = $this->password_salt_generate(); |
| 308 | - if(!$this->account->db_set_password($new_password_unsafe, $salt_unsafe)) { |
|
| 308 | + if (!$this->account->db_set_password($new_password_unsafe, $salt_unsafe)) { |
|
| 309 | 309 | // Ошибка смены пароля |
| 310 | 310 | throw new Exception(AUTH_ERROR_INTERNAL_PASSWORD_CHANGE_ON_RESTORE, ERR_ERROR); |
| 311 | 311 | } |
@@ -315,7 +315,7 @@ discard block |
||
| 315 | 315 | $this->cookie_set(); |
| 316 | 316 | $this->login_cookie(); |
| 317 | 317 | |
| 318 | - if($this->account_login_status == LOGIN_SUCCESS) { |
|
| 318 | + if ($this->account_login_status == LOGIN_SUCCESS) { |
|
| 319 | 319 | // TODO - НЕ ОБЯЗАТЕЛЬНО ОТПРАВЛЯТЬ ЧЕРЕЗ ЕМЕЙЛ! ЕСЛИ ЭТО ФЕЙСБУЧЕК ИЛИ ВКШЕЧКА - МОЖНО ЧЕРЕЗ ЛС ПИСАТЬ!! |
| 320 | 320 | $message_header = sprintf($lang['log_lost_email_title'], $config->game_name); |
| 321 | 321 | $message = sprintf($lang['log_lost_email_pass'], $config->game_name, $this->account->account_name, $new_password_unsafe); |
@@ -323,7 +323,7 @@ discard block |
||
| 323 | 323 | |
| 324 | 324 | // $users_translated = classSupernova::$auth->db_translate_get_users_from_account_list($this->provider_id, $this->account->account_id); // OK 4.5 |
| 325 | 325 | $users_translated = PlayerToAccountTranslate::db_translate_get_users_from_account_list($this->provider_id, $this->account->account_id); // OK 4.5 |
| 326 | - if(!empty($users_translated)) { |
|
| 326 | + if (!empty($users_translated)) { |
|
| 327 | 327 | // Отправляем в лички письмо о сбросе пароля |
| 328 | 328 | |
| 329 | 329 | // ПО ОПРЕДЕЛЕНИЮ в $users_translated только |
@@ -335,7 +335,7 @@ discard block |
||
| 335 | 335 | $message = HelperString::nl2br($message) . '<br><br>'; |
| 336 | 336 | // 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); |
| 337 | 337 | |
| 338 | - foreach($users_translated as $user_id => $providers_list) { |
|
| 338 | + foreach ($users_translated as $user_id => $providers_list) { |
|
| 339 | 339 | msg_send_simple_message($user_id, 0, SN_TIME_NOW, MSG_TYPE_ADMIN, $lang['sys_administration'], $lang['sys_login_register_message_title'], $message); |
| 340 | 340 | } |
| 341 | 341 | } else { |
@@ -388,7 +388,7 @@ discard block |
||
| 388 | 388 | $this->flog('Регистрация: начинаем. Провайдер ' . $this->provider_id); |
| 389 | 389 | |
| 390 | 390 | try { |
| 391 | - if(!$this->is_register) { |
|
| 391 | + if (!$this->is_register) { |
|
| 392 | 392 | $this->flog('Регистрация: не выставлен флаг регистрации - пропускаем'); |
| 393 | 393 | throw new Exception(LOGIN_UNDEFINED, ERR_ERROR); |
| 394 | 394 | } |
@@ -400,8 +400,8 @@ discard block |
||
| 400 | 400 | // $this->account_check_duplicate_name_or_email($this->input_login_unsafe, $this->input_email_unsafe); |
| 401 | 401 | |
| 402 | 402 | $this->account->db_get_by_name_or_email($this->input_login_unsafe, $this->input_email_unsafe); |
| 403 | - if($this->account->is_exists) { |
|
| 404 | - if($this->account->account_email == $this->input_email_unsafe) { |
|
| 403 | + if ($this->account->is_exists) { |
|
| 404 | + if ($this->account->account_email == $this->input_email_unsafe) { |
|
| 405 | 405 | throw new Exception(REGISTER_ERROR_EMAIL_EXISTS, ERR_ERROR); |
| 406 | 406 | } else { |
| 407 | 407 | throw new Exception(REGISTER_ERROR_ACCOUNT_NAME_EXISTS, ERR_ERROR); |
@@ -440,7 +440,7 @@ discard block |
||
| 440 | 440 | // А вот это пока не нужно. Трансляцией аккаунтов в юзеров и созданием новых юзеров для новозашедших аккаунтов занимается Auth |
| 441 | 441 | // $this->register_account(); |
| 442 | 442 | sn_db_transaction_commit(); |
| 443 | - } catch(Exception $e) { |
|
| 443 | + } catch (Exception $e) { |
|
| 444 | 444 | sn_db_transaction_rollback(); |
| 445 | 445 | $this->account_login_status == LOGIN_UNDEFINED ? $this->account_login_status = $e->getMessage() : false; |
| 446 | 446 | } |
@@ -455,7 +455,7 @@ discard block |
||
| 455 | 455 | * @return int Результат попытки |
| 456 | 456 | */ |
| 457 | 457 | protected function login_cookie() { |
| 458 | - if($this->account_login_status != LOGIN_UNDEFINED) { |
|
| 458 | + if ($this->account_login_status != LOGIN_UNDEFINED) { |
|
| 459 | 459 | return $this->account_login_status; |
| 460 | 460 | } |
| 461 | 461 | |
@@ -481,7 +481,7 @@ discard block |
||
| 481 | 481 | // $this->cookie_clear(); |
| 482 | 482 | // } |
| 483 | 483 | |
| 484 | - if($this->account->cookieLogin($rememberMe)) { |
|
| 484 | + if ($this->account->cookieLogin($rememberMe)) { |
|
| 485 | 485 | $this->account_login_status = LOGIN_SUCCESS; |
| 486 | 486 | $this->remember_me = intval($rememberMe); |
| 487 | 487 | } |
@@ -498,13 +498,13 @@ discard block |
||
| 498 | 498 | protected function login_username() { |
| 499 | 499 | // TODO - Логин по старым именам |
| 500 | 500 | try { |
| 501 | - if(!$this->is_login) { |
|
| 501 | + if (!$this->is_login) { |
|
| 502 | 502 | $this->flog('Логин: не выставлен флаг входа в игру - это не логин'); |
| 503 | 503 | throw new Exception(LOGIN_UNDEFINED, ERR_ERROR); |
| 504 | 504 | } |
| 505 | 505 | |
| 506 | 506 | // TODO Пустое имя аккаунта |
| 507 | - if(!$this->input_login_unsafe) { |
|
| 507 | + if (!$this->input_login_unsafe) { |
|
| 508 | 508 | throw new Exception(LOGIN_UNDEFINED, ERR_ERROR); |
| 509 | 509 | } |
| 510 | 510 | |
@@ -514,11 +514,11 @@ discard block |
||
| 514 | 514 | // if(empty($account)) { |
| 515 | 515 | // throw new Exception(LOGIN_ERROR_USERNAME, ERR_ERROR); |
| 516 | 516 | // } |
| 517 | - if(!$this->account->db_get_by_name($this->input_login_unsafe) && !$this->account->db_get_by_email($this->input_login_unsafe)) { |
|
| 517 | + if (!$this->account->db_get_by_name($this->input_login_unsafe) && !$this->account->db_get_by_email($this->input_login_unsafe)) { |
|
| 518 | 518 | throw new Exception(LOGIN_ERROR_USERNAME, ERR_ERROR); |
| 519 | 519 | } |
| 520 | 520 | |
| 521 | - if(!$this->account->password_check($this->input_login_password_raw)) { |
|
| 521 | + if (!$this->account->password_check($this->input_login_password_raw)) { |
|
| 522 | 522 | throw new Exception(LOGIN_ERROR_PASSWORD, ERR_ERROR); |
| 523 | 523 | } |
| 524 | 524 | |
@@ -526,7 +526,7 @@ discard block |
||
| 526 | 526 | |
| 527 | 527 | $this->cookie_set(); |
| 528 | 528 | $this->account_login_status = LOGIN_SUCCESS; |
| 529 | - } catch(Exception $e) { |
|
| 529 | + } catch (Exception $e) { |
|
| 530 | 530 | $this->account_login_status == LOGIN_UNDEFINED ? $this->account_login_status = $e->getMessage() : false; |
| 531 | 531 | } |
| 532 | 532 | |
@@ -547,11 +547,11 @@ discard block |
||
| 547 | 547 | protected function cookie_set($account_to_impersonate = null) { |
| 548 | 548 | $this_account = is_object($account_to_impersonate) ? $account_to_impersonate : $this->account; |
| 549 | 549 | |
| 550 | - if(!is_object($this_account) || !$this_account->is_exists) { |
|
| 550 | + if (!is_object($this_account) || !$this_account->is_exists) { |
|
| 551 | 551 | throw new Exception(LOGIN_ERROR_NO_ACCOUNT_FOR_COOKIE_SET, ERR_ERROR); |
| 552 | 552 | } |
| 553 | 553 | |
| 554 | - if(is_object($account_to_impersonate) && $account_to_impersonate->is_exists) { |
|
| 554 | + if (is_object($account_to_impersonate) && $account_to_impersonate->is_exists) { |
|
| 555 | 555 | sn_setcookie($this->cookie_name_impersonate, $_COOKIE[$this->cookie_name], SN_TIME_NOW + PERIOD_YEAR, $this->sn_root_path, $this->domain); |
| 556 | 556 | } |
| 557 | 557 | |
@@ -588,10 +588,10 @@ discard block |
||
| 588 | 588 | protected function login_validate_input() { |
| 589 | 589 | // Проверяем, что бы в начале и конце не было пустых символов |
| 590 | 590 | // TODO - при копировании Эксель -> Опера - в конце образуются пустые места. Это не должно быть проблемой! Вынести проверку пароля в регистрацию! |
| 591 | - if($this->input_login_password_raw != trim($this->input_login_password_raw)) { |
|
| 591 | + if ($this->input_login_password_raw != trim($this->input_login_password_raw)) { |
|
| 592 | 592 | throw new Exception(LOGIN_ERROR_PASSWORD_TRIMMED, ERR_ERROR); |
| 593 | 593 | } |
| 594 | - if(!$this->input_login_password_raw) { |
|
| 594 | + if (!$this->input_login_password_raw) { |
|
| 595 | 595 | throw new Exception(LOGIN_ERROR_PASSWORD_EMPTY, ERR_ERROR); |
| 596 | 596 | } |
| 597 | 597 | } |
@@ -606,37 +606,37 @@ discard block |
||
| 606 | 606 | $this->login_validate_input(); |
| 607 | 607 | |
| 608 | 608 | // Если нет имени пользователя - NO GO! |
| 609 | - if(!$this->input_login_unsafe) { |
|
| 609 | + if (!$this->input_login_unsafe) { |
|
| 610 | 610 | throw new Exception(LOGIN_ERROR_USERNAME_EMPTY, ERR_ERROR); |
| 611 | 611 | } |
| 612 | 612 | // Если логин имеет запрещенные символы - NO GO! |
| 613 | - if(strpbrk($this->input_login_unsafe, LOGIN_REGISTER_CHARACTERS_PROHIBITED)) { |
|
| 613 | + if (strpbrk($this->input_login_unsafe, LOGIN_REGISTER_CHARACTERS_PROHIBITED)) { |
|
| 614 | 614 | throw new Exception(LOGIN_ERROR_USERNAME_RESTRICTED_CHARACTERS, ERR_ERROR); |
| 615 | 615 | } |
| 616 | 616 | // Если логин меньше минимальной длины - NO GO! |
| 617 | - if(strlen($this->input_login_unsafe) < LOGIN_LENGTH_MIN) { |
|
| 617 | + if (strlen($this->input_login_unsafe) < LOGIN_LENGTH_MIN) { |
|
| 618 | 618 | throw new Exception(REGISTER_ERROR_USERNAME_SHORT, ERR_ERROR); |
| 619 | 619 | } |
| 620 | 620 | // Если пароль меньше минимальной длины - NO GO! |
| 621 | - if(strlen($this->input_login_password_raw) < PASSWORD_LENGTH_MIN) { |
|
| 621 | + if (strlen($this->input_login_password_raw) < PASSWORD_LENGTH_MIN) { |
|
| 622 | 622 | throw new Exception(REGISTER_ERROR_PASSWORD_INSECURE, ERR_ERROR); |
| 623 | 623 | } |
| 624 | 624 | // Если пароль имеет пробельные символы в начале или конце - NO GO! |
| 625 | - if($this->input_login_password_raw != trim($this->input_login_password_raw)) { |
|
| 625 | + if ($this->input_login_password_raw != trim($this->input_login_password_raw)) { |
|
| 626 | 626 | throw new Exception(LOGIN_ERROR_PASSWORD_TRIMMED, ERR_ERROR); |
| 627 | 627 | } |
| 628 | 628 | // Если пароль не совпадает с подтверждением - NO GO! То, что у пароля нет пробельных символов в начале/конце - мы уже проверили выше |
| 629 | 629 | //Если они есть у повтора - значит пароль и повтор не совпадут |
| 630 | - if($this->input_login_password_raw <> $this->input_login_password_raw_repeat) { |
|
| 630 | + if ($this->input_login_password_raw <> $this->input_login_password_raw_repeat) { |
|
| 631 | 631 | throw new Exception(REGISTER_ERROR_PASSWORD_DIFFERENT, ERR_ERROR); |
| 632 | 632 | } |
| 633 | 633 | // Если нет емейла - NO GO! |
| 634 | 634 | // TODO - регистрация без емейла |
| 635 | - if(!$this->input_email_unsafe) { |
|
| 635 | + if (!$this->input_email_unsafe) { |
|
| 636 | 636 | throw new Exception(REGISTER_ERROR_EMAIL_EMPTY, ERR_ERROR); |
| 637 | 637 | } |
| 638 | 638 | // Если емейл не является емейлом - NO GO! |
| 639 | - if(!is_email($this->input_email_unsafe)) { |
|
| 639 | + if (!is_email($this->input_email_unsafe)) { |
|
| 640 | 640 | throw new Exception(REGISTER_ERROR_EMAIL_WRONG, ERR_ERROR); |
| 641 | 641 | } |
| 642 | 642 | } |
@@ -667,7 +667,7 @@ discard block |
||
| 667 | 667 | return core_auth::make_random_password(); |
| 668 | 668 | } |
| 669 | 669 | protected function flog($message, $die = false) { |
| 670 | - if(!defined('DEBUG_AUTH') || !DEBUG_AUTH) { |
|
| 670 | + if (!defined('DEBUG_AUTH') || !DEBUG_AUTH) { |
|
| 671 | 671 | return; |
| 672 | 672 | } |
| 673 | 673 | list($called, $caller) = debug_backtrace(false); |
@@ -681,7 +681,7 @@ discard block |
||
| 681 | 681 | $_SERVER['SERVER_NAME'] == 'localhost' ? print("<div class='debug'>$message - $caller_name\r\n</div>") : false; |
| 682 | 682 | |
| 683 | 683 | classSupernova::log_file("$message - $caller_name"); |
| 684 | - if($die) { |
|
| 684 | + if ($die) { |
|
| 685 | 685 | $die && die("<div class='negative'>СТОП! Функция {$caller_name} при вызове в " . get_called_class() . " (располагается в " . get_class() . "). СООБЩИТЕ АДМИНИСТРАЦИИ!</div>"); |
| 686 | 686 | } |
| 687 | 687 | } |
@@ -7,9 +7,9 @@ discard block |
||
| 7 | 7 | * |
| 8 | 8 | */ |
| 9 | 9 | |
| 10 | -define('INSIDE' , true); |
|
| 11 | -define('INSTALL' , false); |
|
| 12 | -define('IN_ADMIN' , true); |
|
| 10 | +define('INSIDE', true); |
|
| 11 | +define('INSTALL', false); |
|
| 12 | +define('IN_ADMIN', true); |
|
| 13 | 13 | |
| 14 | 14 | require('../common.' . substr(strrchr(__FILE__, '.'), 1)); |
| 15 | 15 | |
@@ -20,12 +20,12 @@ discard block |
||
| 20 | 20 | function adm_lng_assign_string($lang_id, $locale_string_name, $value) { |
| 21 | 21 | global $locale_string_template, $languages_info, $languages, $domain; |
| 22 | 22 | |
| 23 | - if(is_array($value)) { |
|
| 24 | - foreach($value as $sub_key => $sub_value) { |
|
| 23 | + if (is_array($value)) { |
|
| 24 | + foreach ($value as $sub_key => $sub_value) { |
|
| 25 | 25 | adm_lng_assign_string($lang_id, "{$locale_string_name}[{$sub_key}]", $sub_value); |
| 26 | 26 | } |
| 27 | - } elseif($value) { |
|
| 28 | - if(!isset($locale_string_template[$locale_string_name])) { |
|
| 27 | + } elseif ($value) { |
|
| 28 | + if (!isset($locale_string_template[$locale_string_name])) { |
|
| 29 | 29 | $locale_string_template[$locale_string_name] = array(); |
| 30 | 30 | } |
| 31 | 31 | $locale_string_template[$locale_string_name] = array_merge($locale_string_template[$locale_string_name], array("[{$lang_id}]" => htmlentities($value, ENT_COMPAT, 'utf-8'))); |
@@ -46,11 +46,11 @@ discard block |
||
| 46 | 46 | global $domain, $lang_id; |
| 47 | 47 | |
| 48 | 48 | $return = "{$ident}'{$string_name}' => "; |
| 49 | - if(isset($string_value[$lang_id]) && !is_array($string_value[$lang_id])) { |
|
| 49 | + if (isset($string_value[$lang_id]) && !is_array($string_value[$lang_id])) { |
|
| 50 | 50 | $return .= "'" . str_replace(array("\\", "'"), array('\\\\', "\\'"), $string_value[$lang_id]) . "',"; |
| 51 | 51 | } else { |
| 52 | 52 | $return .= "array(\r\n"; |
| 53 | - foreach($string_value as $arr_name => $arr_data) { |
|
| 53 | + foreach ($string_value as $arr_name => $arr_data) { |
|
| 54 | 54 | $return .= adm_lng_parse_string($arr_name, $arr_data, $ident . ' '); |
| 55 | 55 | } |
| 56 | 56 | $return .= "{$ident}),\r\n"; |
@@ -103,12 +103,12 @@ discard block |
||
| 103 | 103 | |
| 104 | 104 | $string_name_new = false; |
| 105 | 105 | |
| 106 | - if(isset($honor_constants[$domain][$string_name_prefix])) { |
|
| 106 | + if (isset($honor_constants[$domain][$string_name_prefix])) { |
|
| 107 | 107 | $found_constants = array_keys($constants, $string_name); |
| 108 | - foreach($found_constants as $constant_name) { |
|
| 108 | + foreach ($found_constants as $constant_name) { |
|
| 109 | 109 | $honor_prefix_list = is_array($honor_constants[$domain][$string_name_prefix]) ? $honor_constants[$domain][$string_name_prefix] : array($honor_constants[$domain][$string_name_prefix]); |
| 110 | - foreach($honor_prefix_list as $honor_prefix) { |
|
| 111 | - if(strpos($constant_name, $honor_prefix) === 0) { |
|
| 110 | + foreach ($honor_prefix_list as $honor_prefix) { |
|
| 111 | + if (strpos($constant_name, $honor_prefix) === 0) { |
|
| 112 | 112 | $string_name_new = $constant_name; |
| 113 | 113 | break; |
| 114 | 114 | } |
@@ -118,13 +118,13 @@ discard block |
||
| 118 | 118 | |
| 119 | 119 | $string_name_new = $string_name_new ? $string_name_new : "'{$string_name}'"; |
| 120 | 120 | fwrite($file_handler, "{$ident}{$string_name_new} => "); |
| 121 | - if(isset($string_value[$lang_id]) && !is_array($string_value[$lang_id])) { |
|
| 121 | + if (isset($string_value[$lang_id]) && !is_array($string_value[$lang_id])) { |
|
| 122 | 122 | fwrite($file_handler, "'" . str_replace(array("\\", "'"), array('\\\\', "\\'"), $string_value[$lang_id]) . "',"); |
| 123 | 123 | // fwrite($file_handler, "'" . addslashes($string_value[$lang_id]) . "',"); |
| 124 | 124 | } else { |
| 125 | 125 | $string_name_prefix = $string_name_prefix . "[{$string_name}]"; |
| 126 | 126 | fwrite($file_handler, "array(\r\n"); |
| 127 | - foreach($string_value as $arr_name => $arr_data) { |
|
| 127 | + foreach ($string_value as $arr_name => $arr_data) { |
|
| 128 | 128 | adm_lng_write_string($arr_name, $arr_data, $ident . ' ', $string_name_prefix); |
| 129 | 129 | } |
| 130 | 130 | fwrite($file_handler, "{$ident}),\r\n"); |
@@ -144,13 +144,13 @@ discard block |
||
| 144 | 144 | $languages_info = lng_get_list(); |
| 145 | 145 | $domain = sys_get_param_str('domain'); |
| 146 | 146 | |
| 147 | -if($domain) { |
|
| 147 | +if ($domain) { |
|
| 148 | 148 | $lang_new = sys_get_param('lang_new'); |
| 149 | - if(!empty($lang_new) && is_array($lang_new)) { |
|
| 149 | + if (!empty($lang_new) && is_array($lang_new)) { |
|
| 150 | 150 | $constants = get_defined_constants(true); |
| 151 | 151 | $constants = $constants['user']; |
| 152 | 152 | ksort($constants); |
| 153 | - foreach($languages_info as $lang_id => $land_data) { |
|
| 153 | + foreach ($languages_info as $lang_id => $land_data) { |
|
| 154 | 154 | $file_handler = fopen(SN_ROOT_PHYSICAL . "language/{$lang_id}/{$domain}.mo.php.new", 'w'); |
| 155 | 155 | fwrite($file_handler, "<?php\r\n\r\n/*\r\n############################################################################# |
| 156 | 156 | # Filename: {$domain}.mo.php |
@@ -158,7 +158,7 @@ discard block |
||
| 158 | 158 | # Website: http://www.supernova.ws |
| 159 | 159 | # Description: Massive Multiplayer Online Browser Space Startegy Game\r\n#\r\n"); |
| 160 | 160 | |
| 161 | - foreach($land_data['LANG_COPYRIGHT'] as $lang_copyright) { |
|
| 161 | + foreach ($land_data['LANG_COPYRIGHT'] as $lang_copyright) { |
|
| 162 | 162 | $lang_copyright = str_replace(array('©', '"', '<', '>'), array('©', '"', '<', '>'), $lang_copyright); |
| 163 | 163 | fwrite($file_handler, "# {$lang_copyright}\r\n"); |
| 164 | 164 | } |
@@ -166,7 +166,7 @@ discard block |
||
| 166 | 166 | /**\r\n*\r\n* @package language\r\n* @system [{$land_data['LANG_NAME_ENGLISH']}]\r\n* @version " . SN_VERSION . "\r\n*\r\n*/\r\n |
| 167 | 167 | /**\r\n* DO NOT CHANGE\r\n*/\r\n\r\nif (!defined('INSIDE')) die();\r\n |
| 168 | 168 | \$a_lang_array = array(\r\n"); |
| 169 | - foreach($lang_new as $string_name => $string_value) { |
|
| 169 | + foreach ($lang_new as $string_name => $string_value) { |
|
| 170 | 170 | adm_lng_write_string($string_name, $string_value); |
| 171 | 171 | } |
| 172 | 172 | fwrite($file_handler, ");\r\n"); |
@@ -176,21 +176,21 @@ discard block |
||
| 176 | 176 | sys_redirect("admin_locale.php?domain={$domain}"); |
| 177 | 177 | } |
| 178 | 178 | |
| 179 | - foreach($languages_info as $lang_id => $lang_data) { |
|
| 179 | + foreach ($languages_info as $lang_id => $lang_data) { |
|
| 180 | 180 | $template->assign_block_vars('language', $lang_data); |
| 181 | 181 | $full_filename = SN_ROOT_PHYSICAL . "language/{$lang_id}/{$domain}.mo.php"; |
| 182 | 182 | $languages[$lang_id] = adm_lng_load($full_filename . (file_exists($full_filename . '.new') ? '.new' : '')); |
| 183 | - foreach($languages[$lang_id] as $locale_string_name => $cork) { |
|
| 183 | + foreach ($languages[$lang_id] as $locale_string_name => $cork) { |
|
| 184 | 184 | adm_lng_assign_string($lang_id, "[{$locale_string_name}]", $languages[$lang_id][$locale_string_name]); |
| 185 | 185 | } |
| 186 | 186 | } |
| 187 | 187 | |
| 188 | - foreach($locale_string_template as $locale_string_name => $locale_string_list) { |
|
| 188 | + foreach ($locale_string_template as $locale_string_name => $locale_string_list) { |
|
| 189 | 189 | $template->assign_block_vars('string', array( |
| 190 | 190 | 'NAME' => $locale_string_name, |
| 191 | 191 | )); |
| 192 | 192 | |
| 193 | - foreach($languages_info as $lang_id => $cork2) { |
|
| 193 | + foreach ($languages_info as $lang_id => $cork2) { |
|
| 194 | 194 | $template->assign_block_vars('string.locale', array( |
| 195 | 195 | 'LANG' => $lang_id, |
| 196 | 196 | 'VALUE' => $locale_string_list["[{$lang_id}]"], |
@@ -206,17 +206,17 @@ discard block |
||
| 206 | 206 | $dir = dir($path); |
| 207 | 207 | while (false !== ($lang_id = $dir->read())) { |
| 208 | 208 | $full_path = $path . $lang_id; |
| 209 | - if($lang_id[0] != "." && is_dir($full_path)) { |
|
| 209 | + if ($lang_id[0] != "." && is_dir($full_path)) { |
|
| 210 | 210 | $lang_file_list = dir($full_path); |
| 211 | 211 | while (false !== ($filename = $lang_file_list->read())) { |
| 212 | 212 | $lang_domain = strtolower(substr($filename, 0, strpos($filename, '.'))); |
| 213 | - if(!$lang_domain) { |
|
| 213 | + if (!$lang_domain) { |
|
| 214 | 214 | continue; |
| 215 | 215 | } |
| 216 | 216 | |
| 217 | 217 | $file_ext = strtolower(substr($filename, strpos($filename, '.'))); |
| 218 | - if($lang_domain != 'language') { |
|
| 219 | - if($file_ext == '.mo.php.new' || ($file_ext == '.mo.php' && empty($languages[$lang_id][$lang_domain]))) { |
|
| 218 | + if ($lang_domain != 'language') { |
|
| 219 | + if ($file_ext == '.mo.php.new' || ($file_ext == '.mo.php' && empty($languages[$lang_id][$lang_domain]))) { |
|
| 220 | 220 | $language_domains[$lang_domain] = $lang_domain; |
| 221 | 221 | $languages[$lang_id][$lang_domain] = $lang_domain; |
| 222 | 222 | } |
@@ -226,7 +226,7 @@ discard block |
||
| 226 | 226 | } |
| 227 | 227 | $dir->close(); |
| 228 | 228 | |
| 229 | - foreach($language_domains as $lang_domain) { |
|
| 229 | + foreach ($language_domains as $lang_domain) { |
|
| 230 | 230 | $template->assign_block_vars('domain', array( |
| 231 | 231 | 'NAME' => $lang_domain, |
| 232 | 232 | )); |
@@ -27,7 +27,7 @@ discard block |
||
| 27 | 27 | 'START_NAME' => $planetrow['name'], |
| 28 | 28 | ); |
| 29 | 29 | |
| 30 | - if(!empty($TargetPlanet)) { |
|
| 30 | + if (!empty($TargetPlanet)) { |
|
| 31 | 31 | $template_route += array( |
| 32 | 32 | 'END_TYPE_TEXT_SH' => $lang['sys_planet_type_sh'][$TargetPlanet['planet_type']], |
| 33 | 33 | 'END_COORDS' => uni_render_coordinates($TargetPlanet), |
@@ -38,8 +38,8 @@ discard block |
||
| 38 | 38 | $template->assign_block_vars('fleets', $template_route); |
| 39 | 39 | |
| 40 | 40 | $sn_groups_fleet = sn_get_groups('fleet'); |
| 41 | - foreach($fleetarray as $ship_id => $ship_count) { |
|
| 42 | - if(in_array($ship_id, $sn_groups_fleet) && $ship_count) { |
|
| 41 | + foreach ($fleetarray as $ship_id => $ship_count) { |
|
| 42 | + if (in_array($ship_id, $sn_groups_fleet) && $ship_count) { |
|
| 43 | 43 | // $ship_base_data = get_ship_data($ship_id, $user); |
| 44 | 44 | $template->assign_block_vars('fleets.ships', array( |
| 45 | 45 | 'ID' => $ship_id, |
@@ -57,11 +57,10 @@ discard block |
||
| 57 | 57 | $fleet_capacity += get_unit_param($Ship, P_CAPACITY) * $Count; |
| 58 | 58 | } |
| 59 | 59 | |
| 60 | - $max_duration = $target_mission == MT_EXPLORE ? get_player_max_expedition_duration($user) : |
|
| 61 | - (isset($missiontype[MT_HOLD]) ? 12 : 0); |
|
| 62 | - if($max_duration) { |
|
| 60 | + $max_duration = $target_mission == MT_EXPLORE ? get_player_max_expedition_duration($user) : (isset($missiontype[MT_HOLD]) ? 12 : 0); |
|
| 61 | + if ($max_duration) { |
|
| 63 | 62 | $config_game_speed_expedition = ($target_mission == MT_EXPLORE && $config->game_speed_expedition ? $config->game_speed_expedition : 1); |
| 64 | - for($i = 1; $i <= $max_duration; $i++) { |
|
| 63 | + for ($i = 1; $i <= $max_duration; $i++) { |
|
| 65 | 64 | $template->assign_block_vars('duration', array( |
| 66 | 65 | 'ID' => $i, |
| 67 | 66 | 'TIME' => pretty_time(ceil($i * 3600 / $config_game_speed_expedition)), |
@@ -80,7 +79,7 @@ discard block |
||
| 80 | 79 | // $TableTitle = uni_render_planet_full($planetrow) . ' => ' . uni_render_planet_full($temp); |
| 81 | 80 | |
| 82 | 81 | $sn_group_resources = sn_get_groups('resources'); |
| 83 | - for($i = 0; $i<3; $i++) { |
|
| 82 | + for ($i = 0; $i < 3; $i++) { |
|
| 84 | 83 | $amount = $planetrow[$sn_group_resources[$i]] - ($i == 2 ? $consumption : 0); |
| 85 | 84 | $template->assign_block_vars('resources', array( |
| 86 | 85 | 'ID' => $i, |
@@ -90,7 +89,7 @@ discard block |
||
| 90 | 89 | )); |
| 91 | 90 | } |
| 92 | 91 | |
| 93 | - if($sn_module['unit_captain']->manifest['active'] && ($captain = $sn_module['unit_captain']->unit_captain_get($planetrow['id'])) && $captain['unit_location_type'] == LOC_PLANET) { |
|
| 92 | + if ($sn_module['unit_captain']->manifest['active'] && ($captain = $sn_module['unit_captain']->unit_captain_get($planetrow['id'])) && $captain['unit_location_type'] == LOC_PLANET) { |
|
| 94 | 93 | $template->assign_vars(array( |
| 95 | 94 | 'CAPTAIN_ID' => $captain['unit_id'], |
| 96 | 95 | 'CAPTAIN_LEVEL' => $captain['captain_level'], |
@@ -112,9 +111,9 @@ discard block |
||
| 112 | 111 | |
| 113 | 112 | |
| 114 | 113 | 'speedallsmin' => sys_get_param_float('speedallsmin'), |
| 115 | - 'speed' => sys_get_param_int('speed') , |
|
| 114 | + 'speed' => sys_get_param_int('speed'), |
|
| 116 | 115 | |
| 117 | - 'fleet_group' => sys_get_param_id('fleet_group') , |
|
| 116 | + 'fleet_group' => sys_get_param_id('fleet_group'), |
|
| 118 | 117 | 'acs_target_mr' => sys_get_param_str('acs_target_mr'), |
| 119 | 118 | |
| 120 | 119 | 'MAX_DURATION' => $max_duration, |
@@ -39,11 +39,11 @@ discard block |
||
| 39 | 39 | $planet = sys_get_param_int('planet', $planetrow['planet']); |
| 40 | 40 | |
| 41 | 41 | $target_mission = sys_get_param_int('target_mission'); |
| 42 | -if($target_mission == MT_COLONIZE || $target_mission == MT_EXPLORE) { |
|
| 42 | +if ($target_mission == MT_COLONIZE || $target_mission == MT_EXPLORE) { |
|
| 43 | 43 | $planet_type = PT_PLANET; |
| 44 | -} elseif($target_mission == MT_RECYCLE) { |
|
| 44 | +} elseif ($target_mission == MT_RECYCLE) { |
|
| 45 | 45 | $planet_type = PT_DEBRIS; |
| 46 | -} elseif($target_mission == MT_DESTROY) { |
|
| 46 | +} elseif ($target_mission == MT_DESTROY) { |
|
| 47 | 47 | $planet_type = PT_MOON; |
| 48 | 48 | } else { |
| 49 | 49 | $planet_type = sys_get_param_int('planet_type'); |
@@ -59,15 +59,15 @@ discard block |
||
| 59 | 59 | //$FlyingFleets = doquery("SELECT COUNT(fleet_id) as Number FROM {{fleets}} WHERE `fleet_owner`='{$user['id']}'", true); |
| 60 | 60 | //$FlyingFleets = $FlyingFleets['Number']; |
| 61 | 61 | $FlyingFleets = fleet_count_flying($user['id']); |
| 62 | -if($MaxFleets <= $FlyingFleets && $fleet_page && $fleet_page != 4) { |
|
| 62 | +if ($MaxFleets <= $FlyingFleets && $fleet_page && $fleet_page != 4) { |
|
| 63 | 63 | messageBox($lang['fl_noslotfree'], $lang['fl_error'], "fleet." . PHP_EX, 5); |
| 64 | 64 | } |
| 65 | 65 | |
| 66 | 66 | $MaxExpeditions = get_player_max_expeditons($user); |
| 67 | -if($MaxExpeditions) { |
|
| 67 | +if ($MaxExpeditions) { |
|
| 68 | 68 | // $FlyingExpeditions = doquery("SELECT COUNT(fleet_owner) AS `expedi` FROM {{fleets}} WHERE `fleet_owner` = {$user['id']} AND `fleet_mission` = '" . MT_EXPLORE . "';", '', true); |
| 69 | 69 | // $FlyingExpeditions = $FlyingExpeditions['expedi']; |
| 70 | - $FlyingExpeditions = fleet_count_flying($user['id'], MT_EXPLORE); |
|
| 70 | + $FlyingExpeditions = fleet_count_flying($user['id'], MT_EXPLORE); |
|
| 71 | 71 | } else { |
| 72 | 72 | $FlyingExpeditions = 0; |
| 73 | 73 | } |
@@ -80,8 +80,8 @@ discard block |
||
| 80 | 80 | $fleetarray = json_decode(base64_decode(str_rot13(sys_get_param('usedfleet'))), true); |
| 81 | 81 | $fleetarray = is_array($fleetarray) ? $fleetarray : array(); |
| 82 | 82 | |
| 83 | - foreach($fleetarray as $ship_id => &$ship_amount) { |
|
| 84 | - if(!in_array($ship_id, sn_get_groups('fleet')) || (string)floatval($ship_amount) != $ship_amount || $ship_amount < 1) { |
|
| 83 | + foreach ($fleetarray as $ship_id => &$ship_amount) { |
|
| 84 | + if (!in_array($ship_id, sn_get_groups('fleet')) || (string) floatval($ship_amount) != $ship_amount || $ship_amount < 1) { |
|
| 85 | 85 | $debug->warning('Supplying wrong ship in ship list on fleet page', 'Hack attempt', 302, array('base_dump' => true)); |
| 86 | 86 | die(); |
| 87 | 87 | } |
@@ -112,11 +112,11 @@ discard block |
||
| 112 | 112 | $target_mission = MT_COLONIZE; |
| 113 | 113 | $planet_type = PT_PLANET; |
| 114 | 114 | } else { |
| 115 | - messageBox ("<font color=\"red\"><b>". $lang['fl_no_planet_type'] ."</b></font>", $lang['fl_error']); |
|
| 115 | + messageBox("<font color=\"red\"><b>" . $lang['fl_no_planet_type'] . "</b></font>", $lang['fl_error']); |
|
| 116 | 116 | } |
| 117 | 117 | } else { |
| 118 | 118 | $recyclers = 0; |
| 119 | - foreach(sn_get_groups('flt_recyclers') as $recycler_id) { |
|
| 119 | + foreach (sn_get_groups('flt_recyclers') as $recycler_id) { |
|
| 120 | 120 | $recyclers += $fleetarray[$recycler_id]; |
| 121 | 121 | } |
| 122 | 122 | if ($recyclers > 0 && $planet_type == PT_DEBRIS) { |
@@ -141,7 +141,7 @@ discard block |
||
| 141 | 141 | |
| 142 | 142 | $missiontype[MT_HOLD] = $lang['type_mission'][MT_HOLD]; |
| 143 | 143 | |
| 144 | - if($planet_type == PT_MOON && $fleetarray[SHIP_HUGE_DEATH_STAR]) { |
|
| 144 | + if ($planet_type == PT_MOON && $fleetarray[SHIP_HUGE_DEATH_STAR]) { |
|
| 145 | 145 | $missiontype[MT_DESTROY] = $lang['type_mission'][MT_DESTROY]; |
| 146 | 146 | } |
| 147 | 147 | } |
@@ -201,14 +201,14 @@ discard block |
||
| 201 | 201 | ); |
| 202 | 202 | |
| 203 | 203 | $is_transport_missions = false; |
| 204 | -if($missiontype) { |
|
| 204 | +if ($missiontype) { |
|
| 205 | 205 | $sn_group_missions = sn_get_groups('missions'); |
| 206 | - foreach($missiontype as $mission_data_id => $mission_data) { |
|
| 206 | + foreach ($missiontype as $mission_data_id => $mission_data) { |
|
| 207 | 207 | $is_transport_missions = $is_transport_missions || (isset($sn_group_missions[$mission_data_id]['transport']) && $sn_group_missions[$mission_data_id]['transport']); |
| 208 | 208 | } |
| 209 | 209 | } |
| 210 | 210 | |
| 211 | -switch($fleet_page) { |
|
| 211 | +switch ($fleet_page) { |
|
| 212 | 212 | case 1: |
| 213 | 213 | require('includes/includes/flt_page1.inc'); |
| 214 | 214 | break; |
@@ -75,121 +75,121 @@ discard block |
||
| 75 | 75 | } |
| 76 | 76 | |
| 77 | 77 | switch ($fleet_page) { |
| 78 | - case 3: |
|
| 78 | + case 3: |
|
| 79 | 79 | |
| 80 | - case 2: |
|
| 81 | - $fleet_group_mr = sys_get_param_id('fleet_group'); |
|
| 82 | - $fleetarray = json_decode(base64_decode(str_rot13(sys_get_param('usedfleet'))), true); |
|
| 83 | - $fleetarray = is_array($fleetarray) ? $fleetarray : array(); |
|
| 80 | + case 2: |
|
| 81 | + $fleet_group_mr = sys_get_param_id('fleet_group'); |
|
| 82 | + $fleetarray = json_decode(base64_decode(str_rot13(sys_get_param('usedfleet'))), true); |
|
| 83 | + $fleetarray = is_array($fleetarray) ? $fleetarray : array(); |
|
| 84 | 84 | |
| 85 | - foreach($fleetarray as $ship_id => &$ship_amount) { |
|
| 86 | - if(!in_array($ship_id, sn_get_groups('fleet')) || (string)floatval($ship_amount) != $ship_amount || $ship_amount < 1) { |
|
| 87 | - $debug->warning('Supplying wrong ship in ship list on fleet page', 'Hack attempt', 302, array('base_dump' => true)); |
|
| 88 | - die(); |
|
| 89 | - } |
|
| 90 | - $ship_amount = floatval($ship_amount); |
|
| 91 | - } |
|
| 92 | - |
|
| 93 | - $UsedPlanet = false; |
|
| 94 | - $YourPlanet = false; |
|
| 95 | - $missiontype = array(); |
|
| 96 | - if ($planet > classSupernova::$config->game_maxPlanet) { |
|
| 97 | - $target_mission = MT_EXPLORE; |
|
| 98 | - $missiontype[MT_EXPLORE] = $lang['type_mission'][MT_EXPLORE]; |
|
| 99 | - } elseif ($galaxy && $system && $planet) { |
|
| 100 | - $check_type = $planet_type == PT_MOON ? PT_MOON : PT_PLANET; |
|
| 101 | - |
|
| 102 | - $TargetPlanet = DBStaticPlanet::db_planet_by_gspt($galaxy, $system, $planet, $check_type); |
|
| 103 | - |
|
| 104 | - if ($TargetPlanet['id_owner']) { |
|
| 105 | - $UsedPlanet = true; |
|
| 106 | - if ($TargetPlanet['id_owner'] == $user['id']) { |
|
| 107 | - $YourPlanet = true; |
|
| 85 | + foreach($fleetarray as $ship_id => &$ship_amount) { |
|
| 86 | + if(!in_array($ship_id, sn_get_groups('fleet')) || (string)floatval($ship_amount) != $ship_amount || $ship_amount < 1) { |
|
| 87 | + $debug->warning('Supplying wrong ship in ship list on fleet page', 'Hack attempt', 302, array('base_dump' => true)); |
|
| 88 | + die(); |
|
| 108 | 89 | } |
| 90 | + $ship_amount = floatval($ship_amount); |
|
| 109 | 91 | } |
| 110 | 92 | |
| 111 | - if (!$UsedPlanet) { |
|
| 112 | - if ($fleetarray[SHIP_COLONIZER]) { |
|
| 113 | - $missiontype[MT_COLONIZE] = $lang['type_mission'][MT_COLONIZE]; |
|
| 114 | - $target_mission = MT_COLONIZE; |
|
| 115 | - $planet_type = PT_PLANET; |
|
| 116 | - } else { |
|
| 117 | - messageBox ("<font color=\"red\"><b>". $lang['fl_no_planet_type'] ."</b></font>", $lang['fl_error']); |
|
| 118 | - } |
|
| 119 | - } else { |
|
| 120 | - $recyclers = 0; |
|
| 121 | - foreach(sn_get_groups('flt_recyclers') as $recycler_id) { |
|
| 122 | - $recyclers += $fleetarray[$recycler_id]; |
|
| 93 | + $UsedPlanet = false; |
|
| 94 | + $YourPlanet = false; |
|
| 95 | + $missiontype = array(); |
|
| 96 | + if ($planet > classSupernova::$config->game_maxPlanet) { |
|
| 97 | + $target_mission = MT_EXPLORE; |
|
| 98 | + $missiontype[MT_EXPLORE] = $lang['type_mission'][MT_EXPLORE]; |
|
| 99 | + } elseif ($galaxy && $system && $planet) { |
|
| 100 | + $check_type = $planet_type == PT_MOON ? PT_MOON : PT_PLANET; |
|
| 101 | + |
|
| 102 | + $TargetPlanet = DBStaticPlanet::db_planet_by_gspt($galaxy, $system, $planet, $check_type); |
|
| 103 | + |
|
| 104 | + if ($TargetPlanet['id_owner']) { |
|
| 105 | + $UsedPlanet = true; |
|
| 106 | + if ($TargetPlanet['id_owner'] == $user['id']) { |
|
| 107 | + $YourPlanet = true; |
|
| 108 | + } |
|
| 123 | 109 | } |
| 124 | - if ($recyclers > 0 && $planet_type == PT_DEBRIS) { |
|
| 125 | - $target_mission = MT_RECYCLE; |
|
| 126 | - $missiontype[MT_RECYCLE] = $lang['type_mission'][MT_RECYCLE]; |
|
| 127 | - } elseif ($planet_type == PT_PLANET || $planet_type == PT_MOON) { |
|
| 128 | - if ($YourPlanet) { |
|
| 129 | - $missiontype[MT_RELOCATE] = $lang['type_mission'][MT_RELOCATE]; |
|
| 130 | - $missiontype[MT_TRANSPORT] = $lang['type_mission'][MT_TRANSPORT]; |
|
| 110 | + |
|
| 111 | + if (!$UsedPlanet) { |
|
| 112 | + if ($fleetarray[SHIP_COLONIZER]) { |
|
| 113 | + $missiontype[MT_COLONIZE] = $lang['type_mission'][MT_COLONIZE]; |
|
| 114 | + $target_mission = MT_COLONIZE; |
|
| 115 | + $planet_type = PT_PLANET; |
|
| 131 | 116 | } else { |
| 132 | - // Not Your Planet |
|
| 133 | - if ($fleetarray[SHIP_SPY]) { |
|
| 134 | - // Only spy missions if any spy |
|
| 135 | - $missiontype[MT_SPY] = $lang['type_mission'][MT_SPY]; |
|
| 117 | + messageBox ("<font color=\"red\"><b>". $lang['fl_no_planet_type'] ."</b></font>", $lang['fl_error']); |
|
| 118 | + } |
|
| 119 | + } else { |
|
| 120 | + $recyclers = 0; |
|
| 121 | + foreach(sn_get_groups('flt_recyclers') as $recycler_id) { |
|
| 122 | + $recyclers += $fleetarray[$recycler_id]; |
|
| 123 | + } |
|
| 124 | + if ($recyclers > 0 && $planet_type == PT_DEBRIS) { |
|
| 125 | + $target_mission = MT_RECYCLE; |
|
| 126 | + $missiontype[MT_RECYCLE] = $lang['type_mission'][MT_RECYCLE]; |
|
| 127 | + } elseif ($planet_type == PT_PLANET || $planet_type == PT_MOON) { |
|
| 128 | + if ($YourPlanet) { |
|
| 129 | + $missiontype[MT_RELOCATE] = $lang['type_mission'][MT_RELOCATE]; |
|
| 130 | + $missiontype[MT_TRANSPORT] = $lang['type_mission'][MT_TRANSPORT]; |
|
| 136 | 131 | } else { |
| 137 | - // If no spies... |
|
| 138 | - if ($fleet_group_mr) { |
|
| 139 | - $missiontype[MT_AKS] = $lang['type_mission'][MT_AKS]; |
|
| 132 | + // Not Your Planet |
|
| 133 | + if ($fleetarray[SHIP_SPY]) { |
|
| 134 | + // Only spy missions if any spy |
|
| 135 | + $missiontype[MT_SPY] = $lang['type_mission'][MT_SPY]; |
|
| 140 | 136 | } else { |
| 141 | - $missiontype[MT_ATTACK] = $lang['type_mission'][MT_ATTACK]; |
|
| 142 | - $missiontype[MT_TRANSPORT] = $lang['type_mission'][MT_TRANSPORT]; |
|
| 143 | - |
|
| 144 | - $missiontype[MT_HOLD] = $lang['type_mission'][MT_HOLD]; |
|
| 145 | - |
|
| 146 | - if($planet_type == PT_MOON && $fleetarray[SHIP_HUGE_DEATH_STAR]) { |
|
| 147 | - $missiontype[MT_DESTROY] = $lang['type_mission'][MT_DESTROY]; |
|
| 137 | + // If no spies... |
|
| 138 | + if ($fleet_group_mr) { |
|
| 139 | + $missiontype[MT_AKS] = $lang['type_mission'][MT_AKS]; |
|
| 140 | + } else { |
|
| 141 | + $missiontype[MT_ATTACK] = $lang['type_mission'][MT_ATTACK]; |
|
| 142 | + $missiontype[MT_TRANSPORT] = $lang['type_mission'][MT_TRANSPORT]; |
|
| 143 | + |
|
| 144 | + $missiontype[MT_HOLD] = $lang['type_mission'][MT_HOLD]; |
|
| 145 | + |
|
| 146 | + if($planet_type == PT_MOON && $fleetarray[SHIP_HUGE_DEATH_STAR]) { |
|
| 147 | + $missiontype[MT_DESTROY] = $lang['type_mission'][MT_DESTROY]; |
|
| 148 | + } |
|
| 148 | 149 | } |
| 149 | 150 | } |
| 150 | 151 | } |
| 151 | 152 | } |
| 152 | 153 | } |
| 153 | 154 | } |
| 154 | - } |
|
| 155 | - |
|
| 156 | - if (!$target_mission && is_array($missiontype)) { |
|
| 157 | - $target_mission = MT_ATTACK; |
|
| 158 | - } |
|
| 159 | - |
|
| 160 | -// $sn_group_missions = sn_get_groups('missions'); |
|
| 161 | -// foreach($sn_group_missions as $mission_id => $cork) { |
|
| 162 | -// $missiontype[$mission_id] = $lang['type_mission'][$mission_id]; |
|
| 163 | -// } |
|
| 164 | -// |
|
| 165 | -// |
|
| 166 | - ksort($missiontype); |
|
| 167 | - |
|
| 168 | - $speed_percent = sys_get_param_int('speed', 10); |
|
| 169 | - $travel_data = flt_travel_data($user, $planetrow, array('galaxy' => $galaxy, 'system' => $system, 'planet' => $planet), $fleetarray, $speed_percent); |
|
| 170 | - |
|
| 171 | -// $fleet_speed = flt_fleet_speed($user, $fleetarray); |
|
| 172 | - $fleet_speed = $travel_data['fleet_speed']; |
|
| 173 | - $distance = $travel_data['distance']; |
|
| 174 | - $duration = $travel_data['duration']; |
|
| 175 | - $consumption = $travel_data['consumption']; |
|
| 176 | - // No Break |
|
| 177 | - |
|
| 178 | - case 1: |
|
| 179 | - if ($galaxy && $system && $planet) { |
|
| 180 | - $check_type = $planet_type == PT_MOON ? PT_MOON : PT_PLANET; |
|
| 181 | - |
|
| 182 | - $TargetPlanet = DBStaticPlanet::db_planet_by_gspt($galaxy, $system, $planet, $check_type); |
|
| 183 | - } |
|
| 184 | - |
|
| 185 | - case 0: |
|
| 186 | - $template_result += array( |
|
| 187 | - 'thisgalaxy' => $planetrow['galaxy'], |
|
| 188 | - 'thissystem' => $planetrow['system'], |
|
| 189 | - 'thisplanet' => $planetrow['planet'], |
|
| 190 | - 'thisplanet_type' => $planetrow['planet_type'], |
|
| 191 | - ); |
|
| 192 | - // no break |
|
| 155 | + |
|
| 156 | + if (!$target_mission && is_array($missiontype)) { |
|
| 157 | + $target_mission = MT_ATTACK; |
|
| 158 | + } |
|
| 159 | + |
|
| 160 | + // $sn_group_missions = sn_get_groups('missions'); |
|
| 161 | + // foreach($sn_group_missions as $mission_id => $cork) { |
|
| 162 | + // $missiontype[$mission_id] = $lang['type_mission'][$mission_id]; |
|
| 163 | + // } |
|
| 164 | + // |
|
| 165 | + // |
|
| 166 | + ksort($missiontype); |
|
| 167 | + |
|
| 168 | + $speed_percent = sys_get_param_int('speed', 10); |
|
| 169 | + $travel_data = flt_travel_data($user, $planetrow, array('galaxy' => $galaxy, 'system' => $system, 'planet' => $planet), $fleetarray, $speed_percent); |
|
| 170 | + |
|
| 171 | + // $fleet_speed = flt_fleet_speed($user, $fleetarray); |
|
| 172 | + $fleet_speed = $travel_data['fleet_speed']; |
|
| 173 | + $distance = $travel_data['distance']; |
|
| 174 | + $duration = $travel_data['duration']; |
|
| 175 | + $consumption = $travel_data['consumption']; |
|
| 176 | + // No Break |
|
| 177 | + |
|
| 178 | + case 1: |
|
| 179 | + if ($galaxy && $system && $planet) { |
|
| 180 | + $check_type = $planet_type == PT_MOON ? PT_MOON : PT_PLANET; |
|
| 181 | + |
|
| 182 | + $TargetPlanet = DBStaticPlanet::db_planet_by_gspt($galaxy, $system, $planet, $check_type); |
|
| 183 | + } |
|
| 184 | + |
|
| 185 | + case 0: |
|
| 186 | + $template_result += array( |
|
| 187 | + 'thisgalaxy' => $planetrow['galaxy'], |
|
| 188 | + 'thissystem' => $planetrow['system'], |
|
| 189 | + 'thisplanet' => $planetrow['planet'], |
|
| 190 | + 'thisplanet_type' => $planetrow['planet_type'], |
|
| 191 | + ); |
|
| 192 | + // no break |
|
| 193 | 193 | |
| 194 | 194 | } |
| 195 | 195 | |
@@ -211,35 +211,35 @@ discard block |
||
| 211 | 211 | } |
| 212 | 212 | |
| 213 | 213 | switch($fleet_page) { |
| 214 | - case 1: |
|
| 215 | - require('includes/includes/flt_page1.inc'); |
|
| 216 | - break; |
|
| 217 | - |
|
| 218 | - case 2: |
|
| 219 | - require_once('includes/includes/flt_page2.inc'); |
|
| 220 | - sn_fleet_page2(); |
|
| 221 | - break; |
|
| 222 | - |
|
| 223 | - case 3: |
|
| 224 | - require_once('includes/includes/flt_page3.inc'); |
|
| 225 | - sn_fleet_page3(); |
|
| 226 | - break; |
|
| 227 | - |
|
| 228 | - case 4: |
|
| 229 | - require('includes/includes/flt_page4.inc'); |
|
| 230 | - break; |
|
| 231 | - |
|
| 232 | - case 5: |
|
| 233 | - $template = gettemplate('fleet5', true); |
|
| 234 | - $pageFleet5Gathering = new \Deprecated\PageFleet5Gathering(); |
|
| 235 | - $pageFleet5Gathering->modelFleet5Gathering($user, $planetrow, $template); |
|
| 236 | - // Building list of own planets & moons |
|
| 237 | - $pageFleet5Gathering->viewPage5Gathering($user, $planetrow, $template); |
|
| 238 | - break; |
|
| 239 | - |
|
| 240 | - default: |
|
| 241 | - define('SN_RENDER_NAVBAR_PLANET', true); |
|
| 242 | - |
|
| 243 | - require('includes/includes/flt_page0.inc'); |
|
| 244 | - break; |
|
| 214 | + case 1: |
|
| 215 | + require('includes/includes/flt_page1.inc'); |
|
| 216 | + break; |
|
| 217 | + |
|
| 218 | + case 2: |
|
| 219 | + require_once('includes/includes/flt_page2.inc'); |
|
| 220 | + sn_fleet_page2(); |
|
| 221 | + break; |
|
| 222 | + |
|
| 223 | + case 3: |
|
| 224 | + require_once('includes/includes/flt_page3.inc'); |
|
| 225 | + sn_fleet_page3(); |
|
| 226 | + break; |
|
| 227 | + |
|
| 228 | + case 4: |
|
| 229 | + require('includes/includes/flt_page4.inc'); |
|
| 230 | + break; |
|
| 231 | + |
|
| 232 | + case 5: |
|
| 233 | + $template = gettemplate('fleet5', true); |
|
| 234 | + $pageFleet5Gathering = new \Deprecated\PageFleet5Gathering(); |
|
| 235 | + $pageFleet5Gathering->modelFleet5Gathering($user, $planetrow, $template); |
|
| 236 | + // Building list of own planets & moons |
|
| 237 | + $pageFleet5Gathering->viewPage5Gathering($user, $planetrow, $template); |
|
| 238 | + break; |
|
| 239 | + |
|
| 240 | + default: |
|
| 241 | + define('SN_RENDER_NAVBAR_PLANET', true); |
|
| 242 | + |
|
| 243 | + require('includes/includes/flt_page0.inc'); |
|
| 244 | + break; |
|
| 245 | 245 | } |
@@ -778,10 +778,10 @@ discard block |
||
| 778 | 778 | $rexep = "#" . strtr(preg_quote($format), $masks) . "#"; |
| 779 | 779 | if (preg_match($rexep, $date, $out)) { |
| 780 | 780 | $ret = array( |
| 781 | - "tm_sec" => (int)$out['S'], |
|
| 782 | - "tm_min" => (int)$out['M'], |
|
| 783 | - "tm_hour" => (int)$out['H'], |
|
| 784 | - "tm_mday" => (int)$out['d'], |
|
| 781 | + "tm_sec" => (int) $out['S'], |
|
| 782 | + "tm_min" => (int) $out['M'], |
|
| 783 | + "tm_hour" => (int) $out['H'], |
|
| 784 | + "tm_mday" => (int) $out['d'], |
|
| 785 | 785 | "tm_mon" => $out['m'] ? $out['m'] - 1 : 0, |
| 786 | 786 | "tm_year" => $out['Y'] > 1900 ? $out['Y'] - 1900 : 0, |
| 787 | 787 | ); |
@@ -1432,7 +1432,7 @@ discard block |
||
| 1432 | 1432 | $time_left = min(floor($time_left / PERIOD_DAY), $term_original); |
| 1433 | 1433 | $cost_left = $term_original > 0 ? ceil($time_left / $term_original * $original_cost) : 0; |
| 1434 | 1434 | |
| 1435 | - array_walk_recursive($result, function (&$value) use ($cost_left) { |
|
| 1435 | + array_walk_recursive($result, function(&$value) use ($cost_left) { |
|
| 1436 | 1436 | $value -= $cost_left; |
| 1437 | 1437 | }); |
| 1438 | 1438 | } |