@@ -272,15 +272,15 @@ |
||
272 | 272 | |
273 | 273 | global $sn_mvc; |
274 | 274 | foreach ($sn_mvc as $handler_type => &$handler_data) { |
275 | - if($handler_type == MVC_OPTIONS) { |
|
275 | + if ($handler_type == MVC_OPTIONS) { |
|
276 | 276 | continue; |
277 | 277 | } |
278 | 278 | sn_sys_handler_add($handler_data, $this->manifest['mvc'][$handler_type], $this, $handler_type); |
279 | 279 | } |
280 | 280 | |
281 | - if(!empty($this->manifest['mvc'][MVC_OPTIONS])) { |
|
281 | + if (!empty($this->manifest['mvc'][MVC_OPTIONS])) { |
|
282 | 282 | foreach ($this->manifest['mvc'][MVC_OPTIONS] as $pageName => $pageOptions) { |
283 | - if(empty($pageOptions)) { |
|
283 | + if (empty($pageOptions)) { |
|
284 | 284 | continue; |
285 | 285 | } |
286 | 286 |
@@ -191,18 +191,18 @@ discard block |
||
191 | 191 | // TODO Хотя тут может получится вечный цикл - ПОДУМАТЬ |
192 | 192 | // TODO Тут же можно пробовать провести попытку слияния аккаунтов - хотя это и очень небезопасно |
193 | 193 | |
194 | - if(sys_get_param('login_player_register_logout')) { |
|
194 | + if (sys_get_param('login_player_register_logout')) { |
|
195 | 195 | $this->logout(); |
196 | 196 | } |
197 | 197 | |
198 | 198 | $original_suggest = ''; |
199 | 199 | // Смотрим - есть ли у нас данные от пользователя |
200 | - if(($player_name_submitted = sys_get_param('submit_player_name'))) { |
|
200 | + if (($player_name_submitted = sys_get_param('submit_player_name'))) { |
|
201 | 201 | // Попытка регистрации нового игрока из данных, введенных пользователем |
202 | 202 | $this->player_suggested_name = sys_get_param_str_unsafe('player_suggested_name'); |
203 | 203 | } else { |
204 | - foreach($this->providers_authorised as $provider) { |
|
205 | - if($this->player_suggested_name = $provider->player_name_suggest()) { // OK 4.5 |
|
204 | + foreach ($this->providers_authorised as $provider) { |
|
205 | + if ($this->player_suggested_name = $provider->player_name_suggest()) { // OK 4.5 |
|
206 | 206 | $original_suggest = $provider->player_name_suggest(); |
207 | 207 | break; |
208 | 208 | } |
@@ -210,7 +210,7 @@ discard block |
||
210 | 210 | } |
211 | 211 | |
212 | 212 | // Если у нас провайдеры не дают имени и пользователь не дал свой вариант - это у нас первый логин в игру |
213 | - if(!$this->player_suggested_name) { |
|
213 | + if (!$this->player_suggested_name) { |
|
214 | 214 | $max_user_id = db_player_get_max_id(); // 4.5 |
215 | 215 | // TODO - предлагать имя игрока по локали |
216 | 216 | |
@@ -219,15 +219,15 @@ discard block |
||
219 | 219 | sn_db_transaction_rollback(); |
220 | 220 | $this->player_suggested_name = 'Emperor ' . mt_rand($max_user_id + 1, $max_user_id + 1000); |
221 | 221 | sn_db_transaction_start(); |
222 | - } while(db_player_name_exists($this->player_suggested_name)); |
|
222 | + } while (db_player_name_exists($this->player_suggested_name)); |
|
223 | 223 | |
224 | 224 | } |
225 | 225 | |
226 | - if($player_name_submitted) { |
|
226 | + if ($player_name_submitted) { |
|
227 | 227 | $this->register_player_db_create($this->player_suggested_name); // OK 4.5 |
228 | - if($this->register_status == LOGIN_SUCCESS) { |
|
228 | + if ($this->register_status == LOGIN_SUCCESS) { |
|
229 | 229 | sys_redirect(SN_ROOT_VIRTUAL . 'overview.php'); |
230 | - } elseif($this->register_status == REGISTER_ERROR_PLAYER_NAME_EXISTS && $original_suggest == $this->player_suggested_name) { |
|
230 | + } elseif ($this->register_status == REGISTER_ERROR_PLAYER_NAME_EXISTS && $original_suggest == $this->player_suggested_name) { |
|
231 | 231 | // self::$player_suggested_name .= ' ' . $this->account->account_id; |
232 | 232 | } |
233 | 233 | // if(self::$login_status != LOGIN_SUCCESS) { |
@@ -251,7 +251,7 @@ discard block |
||
251 | 251 | : false |
252 | 252 | ); |
253 | 253 | |
254 | - if($this->register_status == LOGIN_ERROR_USERNAME_RESTRICTED_CHARACTERS) { |
|
254 | + if ($this->register_status == LOGIN_ERROR_USERNAME_RESTRICTED_CHARACTERS) { |
|
255 | 255 | $prohibited_characters = array_map(function($value) { |
256 | 256 | return "'" . htmlentities($value, ENT_QUOTES, 'UTF-8') . "'"; |
257 | 257 | }, str_split(LOGIN_REGISTER_CHARACTERS_PROHIBITED)); |
@@ -284,18 +284,18 @@ discard block |
||
284 | 284 | |
285 | 285 | // !self::$is_init ? self::init() : false; |
286 | 286 | |
287 | - if(!SN::$gc->modules->countModulesInGroup('auth')) { |
|
287 | + if (!SN::$gc->modules->countModulesInGroup('auth')) { |
|
288 | 288 | die('{Не обнаружено ни одного провайдера авторизации в core_auth::login()!}'); |
289 | 289 | } |
290 | 290 | |
291 | 291 | !empty($_POST) ? self::flog(dump($_POST, '$_POST')) : false; |
292 | 292 | !empty($_GET) ? self::flog(dump($_GET, '$_GET')) : false; |
293 | - !empty($_COOKIE) ? self::flog(dump($_COOKIE,'$_COOKIE')) : false; |
|
293 | + !empty($_COOKIE) ? self::flog(dump($_COOKIE, '$_COOKIE')) : false; |
|
294 | 294 | |
295 | 295 | $this->auth_reset(); // OK v4.5 |
296 | 296 | |
297 | 297 | $this->providers = array(); |
298 | - foreach(SN::$gc->modules->getModulesInGroup('auth', true) as $module_name => $module) { |
|
298 | + foreach (SN::$gc->modules->getModulesInGroup('auth', true) as $module_name => $module) { |
|
299 | 299 | /** |
300 | 300 | * @var auth_abstract $module |
301 | 301 | */ |
@@ -304,10 +304,10 @@ discard block |
||
304 | 304 | |
305 | 305 | // $this->providers = array_reverse($this->providers, true); // НИНАДА! СН-аккаунт должен всегда авторизироваться первым! |
306 | 306 | //pdump($this->providers); |
307 | - foreach($this->providers as $provider_id => $provider) { |
|
307 | + foreach ($this->providers as $provider_id => $provider) { |
|
308 | 308 | $login_status = $provider->login(); // OK v4.5 |
309 | 309 | self::flog(($provider->manifest['name'] . '->' . 'login_try - ') . (empty($provider->account->account_id) ? $lang['sys_login_messages'][$provider->account_login_status] : dump($provider))); |
310 | - if($login_status == LOGIN_SUCCESS && is_object($provider->account) && $provider->account instanceof Account && $provider->account->account_id) { |
|
310 | + if ($login_status == LOGIN_SUCCESS && is_object($provider->account) && $provider->account instanceof Account && $provider->account->account_id) { |
|
311 | 311 | $this->providers_authorised[$provider_id] = &$this->providers[$provider_id]; |
312 | 312 | |
313 | 313 | $this->user_id_to_provider = array_replace_recursive( |
@@ -315,20 +315,20 @@ discard block |
||
315 | 315 | // static::db_translate_get_users_from_account_list($provider_id, $provider->account->account_id) // OK 4.5 |
316 | 316 | PlayerToAccountTranslate::db_translate_get_users_from_account_list($provider_id, $provider->account->account_id) // OK 4.5 |
317 | 317 | ); |
318 | - } elseif($login_status != LOGIN_UNDEFINED) { |
|
318 | + } elseif ($login_status != LOGIN_UNDEFINED) { |
|
319 | 319 | $this->provider_error_list[$provider_id] = $login_status; |
320 | 320 | } |
321 | 321 | } |
322 | 322 | |
323 | - if(empty($this->providers_authorised)) { |
|
323 | + if (empty($this->providers_authorised)) { |
|
324 | 324 | // Ни один аккаунт не авторизирован |
325 | 325 | // Проверяем - есть ли у нас ошибки в аккаунтах? |
326 | - if(!empty($this->provider_error_list)) { |
|
326 | + if (!empty($this->provider_error_list)) { |
|
327 | 327 | // Если есть - выводим их |
328 | 328 | self::$login_status = reset($this->provider_error_list); |
329 | 329 | $providerError = $this->providers[key($this->provider_error_list)]->account_login_message; |
330 | 330 | |
331 | - if(!empty($providerError)) { |
|
331 | + if (!empty($providerError)) { |
|
332 | 332 | self::$login_message = $providerError; |
333 | 333 | } |
334 | 334 | } |
@@ -343,12 +343,12 @@ discard block |
||
343 | 343 | // В self::$accessible_user_row_list - список доступных игроков для данных аккаунтов с соответствующими записями из таблицы `users` |
344 | 344 | |
345 | 345 | // Остались ли у нас в списке доступные игроки? |
346 | - if(empty($this->accessible_user_row_list)) { |
|
346 | + if (empty($this->accessible_user_row_list)) { |
|
347 | 347 | // Нет ни одного игрока ни на одном авторизированном аккаунте |
348 | 348 | // Надо регать нового игрока |
349 | 349 | |
350 | 350 | // Сейчас происходит процесс регистрации игрока? |
351 | - if(!$this->is_player_register) { |
|
351 | + if (!$this->is_player_register) { |
|
352 | 352 | // Нет - отправляем на процесс регистрации |
353 | 353 | $partner_id = sys_get_param_int('id_ref', sys_get_param_int('partner_id')); |
354 | 354 | sys_redirect(SN_ROOT_VIRTUAL . 'index.php?page=player_register&player_register=1' . ($partner_id ? '&id_ref=' . $partner_id : '')); |
@@ -357,7 +357,7 @@ discard block |
||
357 | 357 | // Да, есть доступные игроки, которые так же прописаны в базе |
358 | 358 | $this->get_active_user(); // 4.5 |
359 | 359 | |
360 | - if($this->is_impersonating = !empty($_COOKIE[SN_COOKIE_U_I]) ? $_COOKIE[SN_COOKIE_U_I] : 0) { |
|
360 | + if ($this->is_impersonating = !empty($_COOKIE[SN_COOKIE_U_I]) ? $_COOKIE[SN_COOKIE_U_I] : 0) { |
|
361 | 361 | $a_user = db_user_by_id($this->is_impersonating); |
362 | 362 | $this->impersonator_username = $a_user['username']; |
363 | 363 | } |
@@ -365,9 +365,9 @@ discard block |
||
365 | 365 | |
366 | 366 | //Прописываем текущего игрока на все авторизированные аккаунты |
367 | 367 | // TODO - ИЛИ ВСЕХ ИГРОКОВ?? |
368 | - if(empty($this->is_impersonating)) { |
|
369 | - foreach($this->providers_authorised as $provider_id => $provider) { |
|
370 | - if(empty($this->user_id_to_provider[self::$user['id']][$provider_id])) { |
|
368 | + if (empty($this->is_impersonating)) { |
|
369 | + foreach ($this->providers_authorised as $provider_id => $provider) { |
|
370 | + if (empty($this->user_id_to_provider[self::$user['id']][$provider_id])) { |
|
371 | 371 | // self::db_translate_register_user($provider_id, $provider->account->account_id, self::$user['id']); |
372 | 372 | PlayerToAccountTranslate::db_translate_register_user($provider_id, $provider->account->account_id, self::$user['id']); |
373 | 373 | $this->user_id_to_provider[self::$user['id']][$provider_id][$provider->account->account_id] = true; |
@@ -377,9 +377,9 @@ discard block |
||
377 | 377 | } |
378 | 378 | } |
379 | 379 | |
380 | - if(empty(self::$user['id'])) { |
|
380 | + if (empty(self::$user['id'])) { |
|
381 | 381 | self::cookie_set(''); // OK 4.5 |
382 | - } elseif(self::$user['id'] != $_COOKIE[SN_COOKIE_U]) { |
|
382 | + } elseif (self::$user['id'] != $_COOKIE[SN_COOKIE_U]) { |
|
383 | 383 | self::cookie_set(self::$user['id']); // OK 4.5 |
384 | 384 | } |
385 | 385 | |
@@ -398,21 +398,21 @@ discard block |
||
398 | 398 | */ |
399 | 399 | // OK v4.7 |
400 | 400 | public function logout($redirect = true) { |
401 | - if(!empty($_COOKIE[SN_COOKIE_U_I])) { |
|
401 | + if (!empty($_COOKIE[SN_COOKIE_U_I])) { |
|
402 | 402 | self::cookie_set($_COOKIE[SN_COOKIE_U_I]); |
403 | 403 | self::cookie_set(0, true); |
404 | 404 | self::$main_provider->logout(); |
405 | 405 | } else { |
406 | - foreach($this->providers as $provider_name => $provider) { |
|
406 | + foreach ($this->providers as $provider_name => $provider) { |
|
407 | 407 | $provider->logout(); |
408 | 408 | } |
409 | 409 | |
410 | 410 | self::cookie_set(0); |
411 | 411 | } |
412 | 412 | |
413 | - if($redirect === true) { |
|
413 | + if ($redirect === true) { |
|
414 | 414 | sys_redirect(SN_ROOT_RELATIVE . (empty($_COOKIE[SN_COOKIE_U]) ? 'login.php' : 'admin/overview.php')); |
415 | - } elseif($redirect !== false) { |
|
415 | + } elseif ($redirect !== false) { |
|
416 | 416 | sys_redirect($redirect); |
417 | 417 | } |
418 | 418 | } |
@@ -423,15 +423,15 @@ discard block |
||
423 | 423 | * @param $user_selected |
424 | 424 | */ |
425 | 425 | public function impersonate($user_selected) { |
426 | - if($_COOKIE[SN_COOKIE_U_I]) { |
|
426 | + if ($_COOKIE[SN_COOKIE_U_I]) { |
|
427 | 427 | die('You already impersonating someone. Go back to living other\'s life! Or clear your cookies and try again'); // TODO: Log it |
428 | 428 | } |
429 | 429 | |
430 | - if($this->auth_level_max_local < AUTH_LEVEL_ADMINISTRATOR) { |
|
430 | + if ($this->auth_level_max_local < AUTH_LEVEL_ADMINISTRATOR) { |
|
431 | 431 | die('You can\'t impersonate - too low level'); // TODO: Log it |
432 | 432 | } |
433 | 433 | |
434 | - if($this->auth_level_max_local <= $user_selected['authlevel']) { |
|
434 | + if ($this->auth_level_max_local <= $user_selected['authlevel']) { |
|
435 | 435 | die('You can\'t impersonate this account - level is greater or equal to yours'); // TODO: Log it |
436 | 436 | } |
437 | 437 | |
@@ -439,7 +439,7 @@ discard block |
||
439 | 439 | $account_translate = reset($account_translate[$user_selected['id']][self::$main_provider->provider_id]); |
440 | 440 | $account_to_impersonate = new Account(self::$main_provider->db); |
441 | 441 | $account_to_impersonate->db_get_by_id($account_translate['provider_account_id']); |
442 | - if(!$account_to_impersonate->is_exists) { |
|
442 | + if (!$account_to_impersonate->is_exists) { |
|
443 | 443 | die('Какая-то ошибка - не могу найти аккаунт для имперсонации'); // TODO: Log it |
444 | 444 | } |
445 | 445 | self::$main_provider->impersonate($account_to_impersonate); |
@@ -465,12 +465,12 @@ discard block |
||
465 | 465 | public function password_check($password_unsafe) { |
466 | 466 | $result = false; |
467 | 467 | |
468 | - if(empty($this->providers_authorised)) { |
|
468 | + if (empty($this->providers_authorised)) { |
|
469 | 469 | // TODO - такого быть не может! |
470 | 470 | self::flog("password_check: Не найдено ни одного авторизированного провайдера в self::\$providers_authorised", true); |
471 | 471 | } else { |
472 | - foreach($this->providers_authorised as $provider_id => $provider) { |
|
473 | - if($provider->is_feature_supported(AUTH_FEATURE_HAS_PASSWORD)) { |
|
472 | + foreach ($this->providers_authorised as $provider_id => $provider) { |
|
473 | + if ($provider->is_feature_supported(AUTH_FEATURE_HAS_PASSWORD)) { |
|
474 | 474 | $result = $result || $provider->password_check($password_unsafe); |
475 | 475 | } |
476 | 476 | } |
@@ -491,7 +491,7 @@ discard block |
||
491 | 491 | public function password_change($old_password_unsafe, $new_password_unsafe) { |
492 | 492 | global $lang; |
493 | 493 | |
494 | - if(empty($this->providers_authorised)) { |
|
494 | + if (empty($this->providers_authorised)) { |
|
495 | 495 | // TODO - такого быть не может! |
496 | 496 | self::flog("Не найдено ни одного авторизированного провайдера в self::\$providers_authorised", true); |
497 | 497 | return false; |
@@ -504,8 +504,8 @@ discard block |
||
504 | 504 | $salt_unsafe = self::password_salt_generate(); |
505 | 505 | |
506 | 506 | $providers_changed_password = array(); |
507 | - foreach($this->providers_authorised as $provider_id => $provider) { |
|
508 | - if( |
|
507 | + foreach ($this->providers_authorised as $provider_id => $provider) { |
|
508 | + if ( |
|
509 | 509 | !$provider->is_feature_supported(AUTH_FEATURE_PASSWORD_CHANGE) |
510 | 510 | || !$provider->password_change($old_password_unsafe, $new_password_unsafe, $salt_unsafe) |
511 | 511 | ) { |
@@ -517,7 +517,7 @@ discard block |
||
517 | 517 | $account_translation = PlayerToAccountTranslate::db_translate_get_users_from_account_list($provider_id, $provider->account->account_id); |
518 | 518 | |
519 | 519 | // Рассылаем уведомления о смене пароля в ЛС |
520 | - foreach($account_translation as $user_id => $provider_info) { |
|
520 | + foreach ($account_translation as $user_id => $provider_info) { |
|
521 | 521 | // TODO - УКазывать тип аккаунта, на котором сменён пароль |
522 | 522 | msg_send_simple_message($user_id, 0, SN_TIME_NOW, MSG_TYPE_ADMIN, |
523 | 523 | $lang['sys_administration'], $lang['sys_login_register_message_title'], |
@@ -564,7 +564,7 @@ discard block |
||
564 | 564 | sn_db_transaction_start(); |
565 | 565 | // Проверить наличие такого имени в истории имён |
566 | 566 | |
567 | - if(db_player_name_exists($player_name_unsafe)) { |
|
567 | + if (db_player_name_exists($player_name_unsafe)) { |
|
568 | 568 | throw new Exception(REGISTER_ERROR_PLAYER_NAME_EXISTS, ERR_ERROR); |
569 | 569 | } |
570 | 570 | |
@@ -572,11 +572,11 @@ discard block |
||
572 | 572 | $player_language = ''; |
573 | 573 | $player_email = ''; |
574 | 574 | // TODO - порнография - работа должна происходить над списком аккаунтов, а не только на одном аккаунте... |
575 | - foreach($this->providers_authorised as $provider) { |
|
576 | - if(!$player_language && $provider->account->account_language) { |
|
575 | + foreach ($this->providers_authorised as $provider) { |
|
576 | + if (!$player_language && $provider->account->account_language) { |
|
577 | 577 | $player_language = $provider->account->account_language; |
578 | 578 | } |
579 | - if(!$player_email && $provider->account->account_email) { |
|
579 | + if (!$player_email && $provider->account->account_email) { |
|
580 | 580 | $player_email = $provider->account->account_email; |
581 | 581 | } |
582 | 582 | } |
@@ -592,7 +592,7 @@ discard block |
||
592 | 592 | )); |
593 | 593 | // Зарегестрировать на него аккаунты из self::$accounts_authorised |
594 | 594 | $a_user = self::$user; |
595 | - foreach($this->providers_authorised as $provider) { |
|
595 | + foreach ($this->providers_authorised as $provider) { |
|
596 | 596 | // TODO - порнография. Должен быть отдельный класс трансляторов - в т.ч. и кэширующий транслятор |
597 | 597 | // TODO - ну и работа должна происходить над списком аккаунтов, а не только на одном аккаунте... |
598 | 598 | // self::db_translate_register_user($provider->provider_id, $provider->account->account_id, $a_user['id']); |
@@ -604,7 +604,7 @@ discard block |
||
604 | 604 | |
605 | 605 | sn_db_transaction_commit(); |
606 | 606 | $this->register_status = LOGIN_SUCCESS; |
607 | - } catch(Exception $e) { |
|
607 | + } catch (Exception $e) { |
|
608 | 608 | sn_db_transaction_rollback(); |
609 | 609 | |
610 | 610 | // Если старое имя занято |
@@ -623,10 +623,10 @@ discard block |
||
623 | 623 | // Пробиваем все ИД игроков по базе - есть ли вообще такие записи |
624 | 624 | // Вообще-то это не особо нужно - у нас по определению стоят констраинты |
625 | 625 | // Зато так мы узнаем максимальный authlevel, проверим права имперсонейта и вытащим все записи юзеров |
626 | - foreach($this->user_id_to_provider as $user_id => $cork) { |
|
626 | + foreach ($this->user_id_to_provider as $user_id => $cork) { |
|
627 | 627 | $user = db_user_by_id($user_id); |
628 | 628 | // Если записи игрока в БД не существует? |
629 | - if(empty($user['id'])) { |
|
629 | + if (empty($user['id'])) { |
|
630 | 630 | // Удаляем этого и переходим к следующему |
631 | 631 | unset($this->user_id_to_provider[$user_id]); |
632 | 632 | // Де-регистрируем игрока из таблицы трансляции игроков |
@@ -647,7 +647,7 @@ discard block |
||
647 | 647 | // OK v4.5 |
648 | 648 | protected function get_active_user() { |
649 | 649 | // Проверяем куку "текущего игрока" из браузера |
650 | - if( |
|
650 | + if ( |
|
651 | 651 | // Кука не пустая |
652 | 652 | ($_COOKIE[SN_COOKIE_U] = trim($_COOKIE[SN_COOKIE_U])) && !empty($_COOKIE[SN_COOKIE_U]) |
653 | 653 | // И в куке находится ID |
@@ -672,7 +672,7 @@ discard block |
||
672 | 672 | } |
673 | 673 | |
674 | 674 | // В куке нет валидного ИД записи игрока, доступной с текущих аккаунтов |
675 | - if(empty(self::$user['id'])) { |
|
675 | + if (empty(self::$user['id'])) { |
|
676 | 676 | // Берем первого из доступных |
677 | 677 | // TODO - default_user |
678 | 678 | self::$user = reset($this->accessible_user_row_list); |
@@ -696,7 +696,7 @@ discard block |
||
696 | 696 | |
697 | 697 | $result = array(); |
698 | 698 | |
699 | - if($user_id && empty($this->is_impersonating)) { |
|
699 | + if ($user_id && empty($this->is_impersonating)) { |
|
700 | 700 | // self::db_counter_insert(); |
701 | 701 | self::$device->db_counter_insert($user_id); |
702 | 702 | |
@@ -704,12 +704,12 @@ discard block |
||
704 | 704 | |
705 | 705 | sys_user_options_unpack($user); |
706 | 706 | |
707 | - if($user['banaday'] && $user['banaday'] <= SN_TIME_NOW) { |
|
707 | + if ($user['banaday'] && $user['banaday'] <= SN_TIME_NOW) { |
|
708 | 708 | $user['banaday'] = 0; |
709 | 709 | $user['vacation'] = SN_TIME_NOW; |
710 | 710 | } |
711 | 711 | |
712 | - $user['user_lastip'] = self::$device->ip_v4_string;// $ip['ip']; |
|
712 | + $user['user_lastip'] = self::$device->ip_v4_string; // $ip['ip']; |
|
713 | 713 | $user['user_proxy'] = self::$device->ip_v4_proxy_chain; //$ip['proxy_chain']; |
714 | 714 | |
715 | 715 | $result[F_BANNED_STATUS] = $user['banaday']; |
@@ -723,13 +723,13 @@ discard block |
||
723 | 723 | ); |
724 | 724 | } |
725 | 725 | |
726 | - if($extra = $config->security_ban_extra) { |
|
726 | + if ($extra = $config->security_ban_extra) { |
|
727 | 727 | $extra = explode(',', $extra); |
728 | - array_walk($extra,'trim'); |
|
728 | + array_walk($extra, 'trim'); |
|
729 | 729 | in_array(self::$device->device_id, $extra) and die(); |
730 | 730 | } |
731 | 731 | |
732 | - if(self::$login_message) { |
|
732 | + if (self::$login_message) { |
|
733 | 733 | $result[F_LOGIN_MESSAGE] = self::$login_message; |
734 | 734 | } |
735 | 735 | |
@@ -765,21 +765,21 @@ discard block |
||
765 | 765 | protected function register_player_name_validate($player_name_unsafe) { |
766 | 766 | // TODO - переделать под RAW-строки |
767 | 767 | // Если имя игрока пустое - NO GO! |
768 | - if(trim($player_name_unsafe) == '') { |
|
768 | + if (trim($player_name_unsafe) == '') { |
|
769 | 769 | throw new Exception(REGISTER_ERROR_PLAYER_NAME_EMPTY, ERR_ERROR); |
770 | 770 | } |
771 | 771 | // Проверяем, что бы в начале и конце не было пустых символов |
772 | - if($player_name_unsafe != trim($player_name_unsafe)) { |
|
772 | + if ($player_name_unsafe != trim($player_name_unsafe)) { |
|
773 | 773 | throw new Exception(REGISTER_ERROR_PLAYER_NAME_TRIMMED, ERR_ERROR); |
774 | 774 | } |
775 | 775 | // Если логин имеет запрещенные символы - NO GO! |
776 | - if(strpbrk($player_name_unsafe, LOGIN_REGISTER_CHARACTERS_PROHIBITED)) { |
|
776 | + if (strpbrk($player_name_unsafe, LOGIN_REGISTER_CHARACTERS_PROHIBITED)) { |
|
777 | 777 | // TODO - выдавать в сообщение об ошибке список запрещенных символов |
778 | 778 | // TODO - заранее извещать игрока, какие символы являются запрещенными |
779 | 779 | throw new Exception(REGISTER_ERROR_PLAYER_NAME_RESTRICTED_CHARACTERS, ERR_ERROR); |
780 | 780 | } |
781 | 781 | // Если логин меньше минимальной длины - NO GO! |
782 | - if(strlen($player_name_unsafe) < LOGIN_LENGTH_MIN) { |
|
782 | + if (strlen($player_name_unsafe) < LOGIN_LENGTH_MIN) { |
|
783 | 783 | // TODO - выдавать в сообщение об ошибке минимальную длину имени игрока |
784 | 784 | // TODO - заранее извещать игрока, какая минимальная и максимальная длина имени |
785 | 785 | throw new Exception(REGISTER_ERROR_PLAYER_NAME_SHORT, ERR_ERROR); |
@@ -837,7 +837,7 @@ discard block |
||
837 | 837 | } |
838 | 838 | |
839 | 839 | protected static function flog($message, $die = false) { |
840 | - if(!defined('DEBUG_AUTH') || !DEBUG_AUTH) { |
|
840 | + if (!defined('DEBUG_AUTH') || !DEBUG_AUTH) { |
|
841 | 841 | return; |
842 | 842 | } |
843 | 843 | list($called, $caller) = debug_backtrace(false); |
@@ -850,7 +850,7 @@ discard block |
||
850 | 850 | $_SERVER['SERVER_NAME'] == 'localhost' ? print("<div class='debug'>$message - $caller_name\r\n</div>") : false; |
851 | 851 | |
852 | 852 | SN::log_file("$message - $caller_name"); |
853 | - if($die) { |
|
853 | + if ($die) { |
|
854 | 854 | $die && die("<div class='negative'>СТОП! Функция {$caller_name} при вызове в " . get_called_class() . " (располагается в " . get_class() . "). СООБЩИТЕ АДМИНИСТРАЦИИ!</div>"); |
855 | 855 | } |
856 | 856 | } |
@@ -10,8 +10,8 @@ discard block |
||
10 | 10 | const MOON_MIN_SIZE = 1100; |
11 | 11 | const MOON_MAX_SIZE = 8999; |
12 | 12 | |
13 | - const MOON_DEBRIS_MIN = 1000000; // Minimum amount of debris to span a moon |
|
14 | - const MOON_CHANCE_MIN_PERCENT = 1; // Minimum chance to span a moon |
|
13 | + const MOON_DEBRIS_MIN = 1000000; // Minimum amount of debris to span a moon |
|
14 | + const MOON_CHANCE_MIN_PERCENT = 1; // Minimum chance to span a moon |
|
15 | 15 | const MOON_CHANCE_MAX_PERCENT = 30; // Maximum chance to span a moon |
16 | 16 | |
17 | 17 | /** |
@@ -111,7 +111,7 @@ discard block |
||
111 | 111 | continue; |
112 | 112 | } |
113 | 113 | |
114 | - if($fleetRecord->fleet_mission == MT_HOLD) { |
|
114 | + if ($fleetRecord->fleet_mission == MT_HOLD) { |
|
115 | 115 | if (!$fromHold) { |
116 | 116 | continue; |
117 | 117 | } |
@@ -76,8 +76,8 @@ discard block |
||
76 | 76 | public function __construct(GlobalContainer $services = null) { |
77 | 77 | parent::__construct($services); |
78 | 78 | |
79 | - if(empty(static::$shipInfo)) { |
|
80 | - foreach(sn_get_groups('fleet') as $unit_id) { |
|
79 | + if (empty(static::$shipInfo)) { |
|
80 | + foreach (sn_get_groups('fleet') as $unit_id) { |
|
81 | 81 | static::$shipInfo[$unit_id] = get_unit_param($unit_id); |
82 | 82 | static::$shipInfo[$unit_id][P_COST_METAL] = get_unit_cost_in(static::$shipInfo[$unit_id][P_COST]); |
83 | 83 | } |
@@ -103,7 +103,7 @@ discard block |
||
103 | 103 | * @inheritdoc |
104 | 104 | */ |
105 | 105 | public function update() { |
106 | - if($this->getShipCount() < 1) { |
|
106 | + if ($this->getShipCount() < 1) { |
|
107 | 107 | return $this->delete(); |
108 | 108 | } else { |
109 | 109 | return parent::update(); |
@@ -127,7 +127,7 @@ discard block |
||
127 | 127 | */ |
128 | 128 | public function getCostInMetal() { |
129 | 129 | $result = 0; |
130 | - foreach($this->shipList as $shipId => $amount) { |
|
130 | + foreach ($this->shipList as $shipId => $amount) { |
|
131 | 131 | $result += $amount * $this->getShipCostInMetal($shipId); |
132 | 132 | } |
133 | 133 | |
@@ -148,7 +148,7 @@ discard block |
||
148 | 148 | */ |
149 | 149 | public function getCapacity() { |
150 | 150 | $result = 0; |
151 | - foreach($this->shipList as $shipId => $amount) { |
|
151 | + foreach ($this->shipList as $shipId => $amount) { |
|
152 | 152 | $result += $amount * $this->getShipCapacity($shipId); |
153 | 153 | } |
154 | 154 | |
@@ -165,12 +165,12 @@ discard block |
||
165 | 165 | */ |
166 | 166 | public function changeShipCount($shipSnId, $shipCount) { |
167 | 167 | !isset($this->shipList[$shipSnId]) ? $this->shipList[$shipSnId] = 0 : false; |
168 | - if($this->shipList[$shipSnId] + $shipCount < 0) { |
|
168 | + if ($this->shipList[$shipSnId] + $shipCount < 0) { |
|
169 | 169 | throw new \Exception("Trying to deduct more ships [{$shipSnId}] '{$shipCount}' then fleet has {$this->shipList[$shipSnId]}"); |
170 | 170 | } |
171 | 171 | |
172 | 172 | $this->shipList[$shipSnId] += $shipCount; |
173 | - if($this->shipList[$shipSnId] <= 0) { |
|
173 | + if ($this->shipList[$shipSnId] <= 0) { |
|
174 | 174 | unset($this->shipList[$shipSnId]); |
175 | 175 | } |
176 | 176 | |
@@ -185,11 +185,11 @@ discard block |
||
185 | 185 | * @throws \Exception |
186 | 186 | */ |
187 | 187 | public function changeResource($resourceId, $resourceCount) { |
188 | - if(!array_key_exists($resourceId, $this->resources) || empty($resourceCount)) { |
|
188 | + if (!array_key_exists($resourceId, $this->resources) || empty($resourceCount)) { |
|
189 | 189 | return; |
190 | 190 | } |
191 | 191 | |
192 | - if($this->resources[$resourceId] + $resourceCount < 0) { |
|
192 | + if ($this->resources[$resourceId] + $resourceCount < 0) { |
|
193 | 193 | throw new \Exception("Trying to deduct more resources [{$resourceId}] '{$resourceCount}' then fleet has {$this->resources[$resourceId]}"); |
194 | 194 | } |
195 | 195 |
@@ -91,8 +91,8 @@ discard block |
||
91 | 91 | $this->secret_word = SN::$sn_secret_word; |
92 | 92 | |
93 | 93 | $snTableNames = $this->db->schema()->getSnTables(); |
94 | - foreach($this->table_check as $table_name) { |
|
95 | - if(empty($snTableNames[$table_name])) { |
|
94 | + foreach ($this->table_check as $table_name) { |
|
95 | + if (empty($snTableNames[$table_name])) { |
|
96 | 96 | die('Если вы видите это сообщение первый раз после обновления релиза - просто перегрузите страницу.<br /> |
97 | 97 | В противном случае - сообщите Администрации сервера об ошибке.<br/> |
98 | 98 | Не хватает таблицы для работы системы авторизации: ' . $table_name); |
@@ -116,7 +116,7 @@ discard block |
||
116 | 116 | */ |
117 | 117 | // OK v4.6 |
118 | 118 | public function password_change($old_password_unsafe, $new_password_unsafe, $salt_unsafe = null) { |
119 | - if(!$this->password_check($old_password_unsafe)) { |
|
119 | + if (!$this->password_check($old_password_unsafe)) { |
|
120 | 120 | return false; |
121 | 121 | } |
122 | 122 | |
@@ -137,7 +137,7 @@ discard block |
||
137 | 137 | // OK v4.5 |
138 | 138 | public function assign_from_db_row($row) { |
139 | 139 | $this->reset(); |
140 | - if(empty($row) || !is_array($row)) { |
|
140 | + if (empty($row) || !is_array($row)) { |
|
141 | 141 | return false; |
142 | 142 | } |
143 | 143 | $this->account_id = $row['account_id']; |
@@ -202,7 +202,7 @@ discard block |
||
202 | 202 | $this->reset(); |
203 | 203 | |
204 | 204 | $email_safe = $this->db->db_escape($email_unsafe); |
205 | - if($email_safe) { |
|
205 | + if ($email_safe) { |
|
206 | 206 | $account_row = $this->db->doquery("SELECT * FROM {{account}} WHERE LOWER(`account_email`) = LOWER('{$email_safe}') FOR UPDATE;", true); |
207 | 207 | |
208 | 208 | return $this->assign_from_db_row($account_row); |
@@ -275,11 +275,11 @@ discard block |
||
275 | 275 | `account_email` = LOWER('{$email_safe}'), |
276 | 276 | `account_language` = '{$language_safe}'" |
277 | 277 | ); |
278 | - if(!$result) { |
|
278 | + if (!$result) { |
|
279 | 279 | throw new Exception(REGISTER_ERROR_ACCOUNT_CREATE, ERR_ERROR); |
280 | 280 | } |
281 | 281 | |
282 | - if(!($account_id = $this->db->db_insert_id())) { |
|
282 | + if (!($account_id = $this->db->db_insert_id())) { |
|
283 | 283 | throw new Exception(REGISTER_ERROR_ACCOUNT_CREATE, ERR_ERROR); |
284 | 284 | } |
285 | 285 | |
@@ -309,7 +309,7 @@ discard block |
||
309 | 309 | WHERE `account_id` = '{$account_id_safe}'" |
310 | 310 | ) ? true : false; |
311 | 311 | |
312 | - if($result) { |
|
312 | + if ($result) { |
|
313 | 313 | $result = $this->db_get_by_id($this->account_id); |
314 | 314 | } |
315 | 315 | |
@@ -398,7 +398,7 @@ discard block |
||
398 | 398 | public function metamatter_change($change_type, $metamatter, $comment = false, $already_changed = false) { |
399 | 399 | global $debug, $mm_change_legit, $config; |
400 | 400 | |
401 | - if(!$this->is_exists || !($metamatter = round(floatval($metamatter)))) { |
|
401 | + if (!$this->is_exists || !($metamatter = round(floatval($metamatter)))) { |
|
402 | 402 | $debug->error('Ошибка при попытке манипуляции с ММ'); |
403 | 403 | return false; |
404 | 404 | } |
@@ -407,7 +407,7 @@ discard block |
||
407 | 407 | |
408 | 408 | $mm_change_legit = true; |
409 | 409 | // $sn_data_metamatter_db_name = pname_resource_name(RES_METAMATTER); |
410 | - if($already_changed) { |
|
410 | + if ($already_changed) { |
|
411 | 411 | $metamatter_total_delta = 0; |
412 | 412 | $result = -1; |
413 | 413 | } else { |
@@ -420,7 +420,7 @@ discard block |
||
420 | 420 | ($metamatter_total_delta ? ", `account_immortal` = IF(`account_metamatter_total` + '{$metamatter_total_delta}' >= {$config->player_metamatter_immortal} AND `account_immortal` IS NULL, NOW(), `account_immortal`), `account_metamatter_total` = `account_metamatter_total` + '{$metamatter_total_delta}'" : '') . |
421 | 421 | " WHERE `account_id` = {$account_id_safe}" |
422 | 422 | ); |
423 | - if(!$result) { |
|
423 | + if (!$result) { |
|
424 | 424 | $debug->error("Error adjusting Metamatter for player ID {$this->account_id} (Player Not Found?) with {$metamatter}. Reason: {$comment}", 'Metamatter Change', 402); |
425 | 425 | } |
426 | 426 | $result = SN::$db->db_affected_rows(); |
@@ -428,7 +428,7 @@ discard block |
||
428 | 428 | $this->awardImmortal($metamatter, $config); |
429 | 429 | } |
430 | 430 | |
431 | - if(empty(core_auth::$user['id'])) { |
|
431 | + if (empty(core_auth::$user['id'])) { |
|
432 | 432 | $user_list = PlayerToAccountTranslate::db_translate_get_users_from_account_list(core_auth::$main_provider->provider_id, $this->account_id); |
433 | 433 | reset($user_list); |
434 | 434 | $user_id_unsafe = key($user_list); |
@@ -437,30 +437,30 @@ discard block |
||
437 | 437 | } |
438 | 438 | $user_id_safe = $this->db->db_escape($user_id_unsafe); |
439 | 439 | |
440 | - if(!$result) { |
|
440 | + if (!$result) { |
|
441 | 441 | $debug->error("Error adjusting Metamatter for player ID {$this->account_id} (Player Not Found?) with {$metamatter}. Reason: {$comment}", 'Metamatter Change', 402); |
442 | 442 | } |
443 | 443 | |
444 | - if(!$already_changed) { |
|
444 | + if (!$already_changed) { |
|
445 | 445 | $this->account_metamatter += $metamatter; |
446 | 446 | $this->account_metamatter_total += $metamatter_total_delta; |
447 | 447 | } |
448 | 448 | |
449 | - if(is_array($comment)) { |
|
449 | + if (is_array($comment)) { |
|
450 | 450 | $comment = call_user_func_array('sprintf', $comment); |
451 | 451 | } |
452 | 452 | |
453 | 453 | $result = $this->db_mm_log_insert($comment, $change_type, $metamatter, $user_id_unsafe); |
454 | 454 | |
455 | - if($metamatter > 0 && !empty($user_id_safe)) { |
|
455 | + if ($metamatter > 0 && !empty($user_id_safe)) { |
|
456 | 456 | $old_referral = doquery("SELECT * FROM {{referrals}} WHERE `id` = {$user_id_safe} LIMIT 1 FOR UPDATE;", '', true); |
457 | - if($old_referral['id']) { |
|
457 | + if ($old_referral['id']) { |
|
458 | 458 | $dark_matter_from_metamatter = $metamatter * AFFILIATE_MM_TO_REFERRAL_DM; |
459 | 459 | doquery("UPDATE {{referrals}} SET dark_matter = dark_matter + '{$dark_matter_from_metamatter}' WHERE `id` = {$user_id_safe} LIMIT 1;"); |
460 | 460 | $new_referral = doquery("SELECT * FROM {{referrals}} WHERE `id` = {$user_id_safe} LIMIT 1;", '', true); |
461 | 461 | |
462 | 462 | $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); |
463 | - if($partner_bonus > 0 && $new_referral['dark_matter'] >= $config->rpg_bonus_minimum) { |
|
463 | + if ($partner_bonus > 0 && $new_referral['dark_matter'] >= $config->rpg_bonus_minimum) { |
|
464 | 464 | rpg_points_change($new_referral['id_partner'], RPG_REFERRAL_BOUGHT_MM, $partner_bonus, "Incoming MM From Referral ID {$user_id_safe}"); |
465 | 465 | } |
466 | 466 | } |
@@ -476,7 +476,7 @@ discard block |
||
476 | 476 | * @throws Exception |
477 | 477 | */ |
478 | 478 | public function cookieSet($rememberMe = false, $domain = null) { |
479 | - if(!$this->is_exists) { |
|
479 | + if (!$this->is_exists) { |
|
480 | 480 | throw new Exception(LOGIN_ERROR_NO_ACCOUNT_FOR_COOKIE_SET, ERR_ERROR); |
481 | 481 | } |
482 | 482 | |
@@ -495,7 +495,7 @@ discard block |
||
495 | 495 | // OK v4.1 |
496 | 496 | public function cookieClear($domain = null) { |
497 | 497 | // Автоматически вообще-то - если установлена кука имперсонатора - то чистим обычную, а куку имперсонатора - копируем в неё |
498 | - if(!empty($_COOKIE[$this->cookie_name_impersonate])) { |
|
498 | + if (!empty($_COOKIE[$this->cookie_name_impersonate])) { |
|
499 | 499 | sn_setcookie($this->cookie_name, $_COOKIE[$this->cookie_name_impersonate], SN_TIME_NOW + PERIOD_YEAR, $this->sn_root_path, $domain); |
500 | 500 | sn_setcookie($this->cookie_name_impersonate, '', SN_TIME_NOW - PERIOD_WEEK, $this->sn_root_path, $domain); |
501 | 501 | } else { |
@@ -505,14 +505,14 @@ discard block |
||
505 | 505 | |
506 | 506 | public function cookieLogin(&$rememberMe = false) { |
507 | 507 | // Пытаемся войти по куке |
508 | - if(!empty($_COOKIE[$this->cookie_name])) { |
|
509 | - if(count(explode("/%/", $_COOKIE[$this->cookie_name])) < 4) { |
|
508 | + if (!empty($_COOKIE[$this->cookie_name])) { |
|
509 | + if (count(explode("/%/", $_COOKIE[$this->cookie_name])) < 4) { |
|
510 | 510 | list($account_id_unsafe, $cookie_password_hash_salted, $user_remember_me) = explode(AUTH_COOKIE_DELIMETER, $_COOKIE[$this->cookie_name]); |
511 | 511 | } else { |
512 | 512 | list($account_id_unsafe, $user_name, $cookie_password_hash_salted, $user_remember_me) = explode("/%/", $_COOKIE[$this->cookie_name]); |
513 | 513 | } |
514 | 514 | |
515 | - if( |
|
515 | + if ( |
|
516 | 516 | $this->db_get_by_id($account_id_unsafe) |
517 | 517 | && ($this->password_encode_for_cookie($this->account_password) == $cookie_password_hash_salted) |
518 | 518 | ) { |
@@ -537,10 +537,10 @@ discard block |
||
537 | 537 | * @param classConfig $config |
538 | 538 | */ |
539 | 539 | protected function awardImmortal($metamatter, $config) { |
540 | - if(!is_object($awardModule = moduleAward())) { |
|
540 | + if (!is_object($awardModule = moduleAward())) { |
|
541 | 541 | return; |
542 | 542 | } |
543 | - if ($this->account_metamatter + $metamatter >= $config->player_metamatter_immortal ) { |
|
543 | + if ($this->account_metamatter + $metamatter >= $config->player_metamatter_immortal) { |
|
544 | 544 | $account_translation = PlayerToAccountTranslate::db_translate_get_users_from_account_list(ACCOUNT_PROVIDER_LOCAL, $this->account_id); |
545 | 545 | if (!empty($account_translation)) { |
546 | 546 | reset($account_translation); |
@@ -562,10 +562,10 @@ discard block |
||
562 | 562 | * @return bool|mysqli_result|null |
563 | 563 | */ |
564 | 564 | public function getMetamatterSum($where = '', $group = '') { |
565 | - if(is_array($where) && !empty($where)) { |
|
565 | + if (is_array($where) && !empty($where)) { |
|
566 | 566 | $where = implode(' AND ', $where); |
567 | 567 | } |
568 | - if(is_array($group) && !empty($group)) { |
|
568 | + if (is_array($group) && !empty($group)) { |
|
569 | 569 | $group = implode(',', $group); |
570 | 570 | } |
571 | 571 |
@@ -91,95 +91,95 @@ |
||
91 | 91 | |
92 | 92 | // Services -------------------------------------------------------------------------------------------------------- |
93 | 93 | // Default db |
94 | - $gc->db = function (GlobalContainer $c) { |
|
94 | + $gc->db = function(GlobalContainer $c) { |
|
95 | 95 | SN::$db = new \db_mysql($c); |
96 | 96 | |
97 | 97 | return SN::$db; |
98 | 98 | }; |
99 | 99 | |
100 | - $gc->debug = function (/** @noinspection PhpUnusedParameterInspection */ |
|
100 | + $gc->debug = function(/** @noinspection PhpUnusedParameterInspection */ |
|
101 | 101 | GlobalContainer $c) { |
102 | 102 | return new \debug(); |
103 | 103 | }; |
104 | 104 | |
105 | - $gc->cache = function (GlobalContainer $gc) { |
|
105 | + $gc->cache = function(GlobalContainer $gc) { |
|
106 | 106 | return new \classCache($gc->cachePrefix); |
107 | 107 | }; |
108 | 108 | |
109 | - $gc->config = function (GlobalContainer $gc) { |
|
109 | + $gc->config = function(GlobalContainer $gc) { |
|
110 | 110 | return new \classConfig($gc->cachePrefix); |
111 | 111 | }; |
112 | 112 | |
113 | 113 | |
114 | - $gc->repository = function (GlobalContainer $gc) { |
|
114 | + $gc->repository = function(GlobalContainer $gc) { |
|
115 | 115 | return new Repository($gc); |
116 | 116 | }; |
117 | 117 | |
118 | - $gc->storage = function (GlobalContainer $gc) { |
|
118 | + $gc->storage = function(GlobalContainer $gc) { |
|
119 | 119 | return new \Storage($gc); |
120 | 120 | }; |
121 | 121 | |
122 | - $gc->design = function (GlobalContainer $gc) { |
|
122 | + $gc->design = function(GlobalContainer $gc) { |
|
123 | 123 | return new \Design($gc); |
124 | 124 | }; |
125 | 125 | |
126 | - $gc->bbCodeParser = function (GlobalContainer $gc) { |
|
126 | + $gc->bbCodeParser = function(GlobalContainer $gc) { |
|
127 | 127 | return new \BBCodeParser($gc); |
128 | 128 | }; |
129 | 129 | |
130 | - $gc->fleetDispatcher = function (GlobalContainer $gc) { |
|
130 | + $gc->fleetDispatcher = function(GlobalContainer $gc) { |
|
131 | 131 | return new \FleetDispatcher($gc); |
132 | 132 | }; |
133 | 133 | |
134 | - $gc->watchdog = function (GlobalContainer $gc) { |
|
134 | + $gc->watchdog = function(GlobalContainer $gc) { |
|
135 | 135 | return new Watchdog($gc); |
136 | 136 | }; |
137 | 137 | |
138 | - $gc->eventBus = function (GlobalContainer $gc) { |
|
138 | + $gc->eventBus = function(GlobalContainer $gc) { |
|
139 | 139 | return new EventBus($gc); |
140 | 140 | }; |
141 | 141 | |
142 | - $gc->valueStorage = function (GlobalContainer $gc) { |
|
142 | + $gc->valueStorage = function(GlobalContainer $gc) { |
|
143 | 143 | return new ValueStorage([]); |
144 | 144 | }; |
145 | 145 | |
146 | - $gc->bonusCatalog = function (GlobalContainer $gc) { |
|
146 | + $gc->bonusCatalog = function(GlobalContainer $gc) { |
|
147 | 147 | return new BonusCatalog($gc); |
148 | 148 | }; |
149 | 149 | |
150 | - $gc->general = function (GlobalContainer $gc) { |
|
150 | + $gc->general = function(GlobalContainer $gc) { |
|
151 | 151 | return new General($gc); |
152 | 152 | }; |
153 | 153 | |
154 | - $gc->economicHelper = function (GlobalContainer $gc) { |
|
154 | + $gc->economicHelper = function(GlobalContainer $gc) { |
|
155 | 155 | return new EconomicHelper($gc); |
156 | 156 | }; |
157 | 157 | |
158 | - $gc->playerLevelHelper = function (GlobalContainer $gc) { |
|
158 | + $gc->playerLevelHelper = function(GlobalContainer $gc) { |
|
159 | 159 | return new PlayerLevelHelper($gc); |
160 | 160 | }; |
161 | 161 | |
162 | - $gc->pimp = function (GlobalContainer $gc) { |
|
162 | + $gc->pimp = function(GlobalContainer $gc) { |
|
163 | 163 | return new SnPimp($gc); |
164 | 164 | }; |
165 | 165 | |
166 | - $gc->modules = function (GlobalContainer $gc) { |
|
166 | + $gc->modules = function(GlobalContainer $gc) { |
|
167 | 167 | return new ModulesManager($gc); |
168 | 168 | }; |
169 | 169 | |
170 | 170 | // Dummy objects --------------------------------------------------------------------------------------------------- |
171 | - $gc->theUser = function (GlobalContainer $gc) { |
|
171 | + $gc->theUser = function(GlobalContainer $gc) { |
|
172 | 172 | return new \TheUser($gc); |
173 | 173 | }; |
174 | 174 | |
175 | 175 | |
176 | 176 | // Models ---------------------------------------------------------------------------------------------------------- |
177 | 177 | $gc->skinEntityClass = \SkinV2::class; |
178 | - $gc->skinModel = function (GlobalContainer $gc) { |
|
178 | + $gc->skinModel = function(GlobalContainer $gc) { |
|
179 | 179 | return new \SkinModel($gc); |
180 | 180 | }; |
181 | 181 | |
182 | - $gc->textModel = function (GlobalContainer $gc) { |
|
182 | + $gc->textModel = function(GlobalContainer $gc) { |
|
183 | 183 | return new \TextModel($gc); |
184 | 184 | }; |
185 | 185 |
@@ -17,7 +17,7 @@ |
||
17 | 17 | |
18 | 18 | require('../common.' . substr(strrchr(__FILE__, '.'), 1)); |
19 | 19 | |
20 | -if(!SN::$gc->modules->countModulesInGroup('payment')) { |
|
20 | +if (!SN::$gc->modules->countModulesInGroup('payment')) { |
|
21 | 21 | sys_redirect(SN_ROOT_VIRTUAL . 'admin/overview.php'); |
22 | 22 | } |
23 | 23 |
@@ -1,6 +1,6 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | |
3 | -if(defined('__SN_CONSTANTS_DEFINED') && __SN_CONSTANTS_DEFINED === true) { |
|
3 | +if (defined('__SN_CONSTANTS_DEFINED') && __SN_CONSTANTS_DEFINED === true) { |
|
4 | 4 | return; |
5 | 5 | } |
6 | 6 | |
@@ -42,7 +42,7 @@ discard block |
||
42 | 42 | define('SN_ROOT_VIRTUAL', 'http' . (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on' ? 's' : '') . '://' . $_server_http_host . SN_ROOT_RELATIVE); |
43 | 43 | |
44 | 44 | $_server_server_name = isset($_SERVER['SERVER_NAME']) ? $_SERVER['SERVER_NAME'] : ''; |
45 | -if(strpos(strtolower($_server_server_name), 'google.') !== false) { |
|
45 | +if (strpos(strtolower($_server_server_name), 'google.') !== false) { |
|
46 | 46 | define('SN_GOOGLE', true); |
47 | 47 | } |
48 | 48 | define('SN_ROOT_VIRTUAL_PARENT', str_replace('//google.', '//', SN_ROOT_VIRTUAL)); |
@@ -63,8 +63,8 @@ discard block |
||
63 | 63 | |
64 | 64 | // Game type constants starts with GAME_ |
65 | 65 | define('GAME_SUPERNOVA', 0); |
66 | -define('GAME_OGAME' , 1); |
|
67 | -define('GAME_BLITZ' , 2); |
|
66 | +define('GAME_OGAME', 1); |
|
67 | +define('GAME_BLITZ', 2); |
|
68 | 68 | |
69 | 69 | // Date & time range constants |
70 | 70 | define('DATE_FOREVER', 2000000000); |
@@ -77,16 +77,16 @@ discard block |
||
77 | 77 | define('PERIOD_YEAR', PERIOD_DAY * 365); |
78 | 78 | define('PERIOD_FOREVER', PERIOD_YEAR * 100); |
79 | 79 | |
80 | -define('PERIOD_MINUTE_2' , PERIOD_MINUTE * 2); |
|
81 | -define('PERIOD_MINUTE_3' , PERIOD_MINUTE * 3); |
|
82 | -define('PERIOD_MINUTE_5' , PERIOD_MINUTE * 5); |
|
80 | +define('PERIOD_MINUTE_2', PERIOD_MINUTE * 2); |
|
81 | +define('PERIOD_MINUTE_3', PERIOD_MINUTE * 3); |
|
82 | +define('PERIOD_MINUTE_5', PERIOD_MINUTE * 5); |
|
83 | 83 | define('PERIOD_MINUTE_10', PERIOD_MINUTE * 10); |
84 | 84 | define('PERIOD_MINUTE_15', PERIOD_MINUTE * 15); |
85 | -define('PERIOD_DAY_3' , PERIOD_DAY * 3); |
|
86 | -define('PERIOD_WEEK_2' , PERIOD_WEEK * 2); |
|
87 | -define('PERIOD_WEEK_4' , PERIOD_WEEK * 4); |
|
88 | -define('PERIOD_MONTH_2' , PERIOD_MONTH * 2); |
|
89 | -define('PERIOD_MONTH_3' , PERIOD_MONTH * 3); |
|
85 | +define('PERIOD_DAY_3', PERIOD_DAY * 3); |
|
86 | +define('PERIOD_WEEK_2', PERIOD_WEEK * 2); |
|
87 | +define('PERIOD_WEEK_4', PERIOD_WEEK * 4); |
|
88 | +define('PERIOD_MONTH_2', PERIOD_MONTH * 2); |
|
89 | +define('PERIOD_MONTH_3', PERIOD_MONTH * 3); |
|
90 | 90 | |
91 | 91 | define('FONT_SIZE_PERCENT_MIN', 56.25); |
92 | 92 | define('FONT_SIZE_PERCENT_DEFAULT', 68.75); |
@@ -141,38 +141,38 @@ discard block |
||
141 | 141 | |
142 | 142 | // Mot qui sont interdit a la saisie ! |
143 | 143 | global $ListCensure; |
144 | -$ListCensure = array ( '/</', '/>/', '/script/i', '/doquery/i', '/http/i', '/javascript/i'); |
|
144 | +$ListCensure = array('/</', '/>/', '/script/i', '/doquery/i', '/http/i', '/javascript/i'); |
|
145 | 145 | |
146 | 146 | // Confirmation record types |
147 | -define('CONFIRM_REGISTRATION' , 1); |
|
147 | +define('CONFIRM_REGISTRATION', 1); |
|
148 | 148 | define('CONFIRM_PASSWORD_RESET', 2); |
149 | -define('CONFIRM_DELETE' , 3); |
|
149 | +define('CONFIRM_DELETE', 3); |
|
150 | 150 | |
151 | 151 | define('AFFILIATE_MM_TO_REFERRAL_DM', 2); |
152 | 152 | |
153 | 153 | // Ally diplomacy statuses |
154 | -define('ALLY_DIPLOMACY_SELF' , 'self'); |
|
155 | -define('ALLY_DIPLOMACY_NEUTRAL' , 'neutral'); |
|
156 | -define('ALLY_DIPLOMACY_WAR' , 'war'); |
|
157 | -define('ALLY_DIPLOMACY_PEACE' , 'peace'); |
|
154 | +define('ALLY_DIPLOMACY_SELF', 'self'); |
|
155 | +define('ALLY_DIPLOMACY_NEUTRAL', 'neutral'); |
|
156 | +define('ALLY_DIPLOMACY_WAR', 'war'); |
|
157 | +define('ALLY_DIPLOMACY_PEACE', 'peace'); |
|
158 | 158 | define('ALLY_DIPLOMACY_CONFEDERATION', 'confederation'); |
159 | -define('ALLY_DIPLOMACY_FEDERATION' , 'federation'); |
|
160 | -define('ALLY_DIPLOMACY_UNION' , 'union'); |
|
161 | -define('ALLY_DIPLOMACY_MASTER' , 'master'); |
|
162 | -define('ALLY_DIPLOMACY_SLAVE' , 'slave'); |
|
159 | +define('ALLY_DIPLOMACY_FEDERATION', 'federation'); |
|
160 | +define('ALLY_DIPLOMACY_UNION', 'union'); |
|
161 | +define('ALLY_DIPLOMACY_MASTER', 'master'); |
|
162 | +define('ALLY_DIPLOMACY_SLAVE', 'slave'); |
|
163 | 163 | |
164 | 164 | define('ALLY_PROPOSE_SEND', 0); |
165 | 165 | |
166 | 166 | // Quest types |
167 | -define('QUEST_TYPE_BUILD' , 1); |
|
167 | +define('QUEST_TYPE_BUILD', 1); |
|
168 | 168 | define('QUEST_TYPE_RESEARCH', 2); |
169 | -define('QUEST_TYPE_COMBAT' , 3); |
|
169 | +define('QUEST_TYPE_COMBAT', 3); |
|
170 | 170 | |
171 | -define('QUEST_STATUS_EXCEPT_COMPLETE' , -2); |
|
172 | -define('QUEST_STATUS_ALL' , -1); |
|
173 | -define('QUEST_STATUS_NOT_STARTED' , 0); |
|
174 | -define('QUEST_STATUS_STARTED' , 1); |
|
175 | -define('QUEST_STATUS_COMPLETE' , 2); |
|
171 | +define('QUEST_STATUS_EXCEPT_COMPLETE', -2); |
|
172 | +define('QUEST_STATUS_ALL', -1); |
|
173 | +define('QUEST_STATUS_NOT_STARTED', 0); |
|
174 | +define('QUEST_STATUS_STARTED', 1); |
|
175 | +define('QUEST_STATUS_COMPLETE', 2); |
|
176 | 176 | |
177 | 177 | define('TYPE_EMPTY', ''); |
178 | 178 | define('TYPE_INTEGER', 'integer'); |
@@ -185,69 +185,69 @@ discard block |
||
185 | 185 | |
186 | 186 | // *** Combat-related constants |
187 | 187 | // *** Mission Type constants starts with MT_ |
188 | -define('MT_NONE' , 0); |
|
189 | -define('MT_ATTACK' , 1); |
|
190 | -define('MT_AKS' , 2); |
|
191 | -define('MT_TRANSPORT', 3); |
|
192 | -define('MT_RELOCATE' , 4); |
|
193 | -define('MT_HOLD' , 5); |
|
194 | -define('MT_SPY' , 6); |
|
195 | -define('MT_COLONIZE' , 7); |
|
196 | -define('MT_RECYCLE' , 8); |
|
197 | -define('MT_DESTROY' , 9); |
|
198 | -define('MT_MISSILE' , 10); |
|
199 | -define('MT_EXPLORE' , 15); |
|
188 | +define('MT_NONE', 0); |
|
189 | +define('MT_ATTACK', 1); |
|
190 | +define('MT_AKS', 2); |
|
191 | +define('MT_TRANSPORT', 3); |
|
192 | +define('MT_RELOCATE', 4); |
|
193 | +define('MT_HOLD', 5); |
|
194 | +define('MT_SPY', 6); |
|
195 | +define('MT_COLONIZE', 7); |
|
196 | +define('MT_RECYCLE', 8); |
|
197 | +define('MT_DESTROY', 9); |
|
198 | +define('MT_MISSILE', 10); |
|
199 | +define('MT_EXPLORE', 15); |
|
200 | 200 | |
201 | 201 | // *** Planet Target constants starts with PT_ |
202 | 202 | define('PT_NONE', 0); |
203 | 203 | define('PT_ALL', 0); |
204 | 204 | define('PT_PLANET', 1); |
205 | 205 | define('PT_DEBRIS', 2); |
206 | -define('PT_MOON' , 3); |
|
206 | +define('PT_MOON', 3); |
|
207 | 207 | |
208 | 208 | // *** Unit locations - shows db table where unit belong |
209 | 209 | // Also cache indexes |
210 | 210 | define('LOC_AUTODETECT', -2); |
211 | -define('LOC_NONE', -1); // Deprecated |
|
211 | +define('LOC_NONE', -1); // Deprecated |
|
212 | 212 | define('LOC_UNIVERSE', 0); |
213 | -define('LOC_PLANET', 1); |
|
214 | -define('LOC_DEBRIS', 2); // Translates to `planets` table planet_type = 1, `debris_*` fields |
|
215 | -define('LOC_MOON', 3); // Translates to `planets` table planet_type = 3 |
|
216 | -define('LOC_PLAYER', 4); |
|
217 | -define('LOC_USER', LOC_PLAYER); // Deprecated alias for LOC_PLAYER |
|
218 | -define('LOC_FLEET', 5); |
|
219 | -define('LOC_ALLY', 6); |
|
220 | -define('LOC_SERVER', 7); // Located on server |
|
213 | +define('LOC_PLANET', 1); |
|
214 | +define('LOC_DEBRIS', 2); // Translates to `planets` table planet_type = 1, `debris_*` fields |
|
215 | +define('LOC_MOON', 3); // Translates to `planets` table planet_type = 3 |
|
216 | +define('LOC_PLAYER', 4); |
|
217 | +define('LOC_USER', LOC_PLAYER); // Deprecated alias for LOC_PLAYER |
|
218 | +define('LOC_FLEET', 5); |
|
219 | +define('LOC_ALLY', 6); |
|
220 | +define('LOC_SERVER', 7); // Located on server |
|
221 | 221 | |
222 | 222 | // ТОЛЬКО ВНУТРЕНЕЕ!!! |
223 | -define('LOC_UNIT', 'LOC_UNIT'); |
|
224 | -define('LOC_QUE', 'LOC_QUE'); |
|
225 | -define('LOC_LOCATION','LOC_LOCATION'); |
|
226 | -define('LOC_LOCKS','LOC_LOCKS'); |
|
223 | +define('LOC_UNIT', 'LOC_UNIT'); |
|
224 | +define('LOC_QUE', 'LOC_QUE'); |
|
225 | +define('LOC_LOCATION', 'LOC_LOCATION'); |
|
226 | +define('LOC_LOCKS', 'LOC_LOCKS'); |
|
227 | 227 | |
228 | 228 | // *** Caching masks |
229 | -define('CACHE_NOTHING' , 0); |
|
230 | -define('CACHE_FLEET' , 1); |
|
231 | -define('CACHE_PLANET' , 2); |
|
232 | -define('CACHE_USER' , 4); |
|
233 | -define('CACHE_SOURCE' , 8); |
|
229 | +define('CACHE_NOTHING', 0); |
|
230 | +define('CACHE_FLEET', 1); |
|
231 | +define('CACHE_PLANET', 2); |
|
232 | +define('CACHE_USER', 4); |
|
233 | +define('CACHE_SOURCE', 8); |
|
234 | 234 | define('CACHE_DESTINATION', 16); |
235 | -define('CACHE_EVENT' , 32); |
|
235 | +define('CACHE_EVENT', 32); |
|
236 | 236 | |
237 | -define('CACHE_USER_SRC' , CACHE_USER | CACHE_SOURCE); |
|
238 | -define('CACHE_USER_DST' , CACHE_USER | CACHE_DESTINATION); |
|
237 | +define('CACHE_USER_SRC', CACHE_USER | CACHE_SOURCE); |
|
238 | +define('CACHE_USER_DST', CACHE_USER | CACHE_DESTINATION); |
|
239 | 239 | define('CACHE_PLANET_SRC', CACHE_PLANET | CACHE_SOURCE); |
240 | 240 | define('CACHE_PLANET_DST', CACHE_PLANET | CACHE_DESTINATION); |
241 | -define('CACHE_COMBAT' , CACHE_FLEET | CACHE_PLANET | CACHE_USER | CACHE_SOURCE | CACHE_DESTINATION); |
|
241 | +define('CACHE_COMBAT', CACHE_FLEET | CACHE_PLANET | CACHE_USER | CACHE_SOURCE | CACHE_DESTINATION); |
|
242 | 242 | |
243 | -define('CACHE_ALL' , CACHE_FLEET | CACHE_PLANET | CACHE_USER | CACHE_SOURCE | CACHE_DESTINATION | CACHE_EVENT); |
|
243 | +define('CACHE_ALL', CACHE_FLEET | CACHE_PLANET | CACHE_USER | CACHE_SOURCE | CACHE_DESTINATION | CACHE_EVENT); |
|
244 | 244 | |
245 | -define('CACHE_NONE' , CACHE_NOTHING); // Alias for me |
|
245 | +define('CACHE_NONE', CACHE_NOTHING); // Alias for me |
|
246 | 246 | |
247 | 247 | // *** Event types |
248 | 248 | define('EVENT_FLEET_NONE', 0); |
249 | 249 | define('EVENT_FLEET_ARRIVE', 1); |
250 | -define('EVENT_FLEET_STAY' , 2); |
|
250 | +define('EVENT_FLEET_STAY', 2); |
|
251 | 251 | define('EVENT_FLEET_RETURN', 3); |
252 | 252 | |
253 | 253 | // *** Constants for changing DM |
@@ -306,11 +306,11 @@ discard block |
||
306 | 306 | |
307 | 307 | |
308 | 308 | // Operation error status HARDCODE! |
309 | -define('ERR_NONE' , 0); // No error |
|
310 | -define('ERR_WARNING' , 1); // There is warning - something altering normal operation process |
|
311 | -define('ERR_ERROR' , 2); // There is error - something permits operation from process |
|
312 | -define('ERR_HACK' , 4); // Operation is qualified as hack attempt |
|
313 | -define('ERR_NOTICE' , 8); // There is notice - nothing really critical but operator should know |
|
309 | +define('ERR_NONE', 0); // No error |
|
310 | +define('ERR_WARNING', 1); // There is warning - something altering normal operation process |
|
311 | +define('ERR_ERROR', 2); // There is error - something permits operation from process |
|
312 | +define('ERR_HACK', 4); // Operation is qualified as hack attempt |
|
313 | +define('ERR_NOTICE', 8); // There is notice - nothing really critical but operator should know |
|
314 | 314 | // New GLOBAL operation results |
315 | 315 | //define('RESULT_DEFAULT' , 0); // Default result - all went OK or result really doesn't matter |
316 | 316 | //define('RESULT_WARNING' , 1); |
@@ -330,7 +330,7 @@ discard block |
||
330 | 330 | define('SN_PAYMENT_REQUEST_OK', 0); |
331 | 331 | define('SN_PAYMENT_REQUEST_ERROR_UNIT_AMOUNT', 1); |
332 | 332 | define('SN_PAYMENT_REQUEST_ERROR_PAYLINK_UNSUPPORTED', 2); |
333 | -define('SN_PAYMENT_REQUEST_IP_WRONG', 3); // Неправильный IP входящей системы - обычно хак |
|
333 | +define('SN_PAYMENT_REQUEST_IP_WRONG', 3); // Неправильный IP входящей системы - обычно хак |
|
334 | 334 | define('SN_PAYMENT_REQUEST_COMMAND_UNSUPPORTED', 4); // Неподдерживаемая команда - обычно хак |
335 | 335 | define('SN_PAYMENT_REQUEST_SIGNATURE_INVALID', 5); // Неправильная подпись или не сошлась контрольная сумма - обычно хак |
336 | 336 | define('SN_MODULE_DISABLED', 6); // Модуль отключен // УНИВЕРСАЛЬНЫЙ ОТВЕТ! |
@@ -606,16 +606,16 @@ discard block |
||
606 | 606 | //define('F_DEVICE_ID', 'F_DEVICE_ID'); |
607 | 607 | //define('F_DEVICE_CYPHER', 'F_DEVICE_CYPHER'); |
608 | 608 | |
609 | -define('F_PROVIDER_ID', 'F_PROVIDER_ID'); |
|
609 | +define('F_PROVIDER_ID', 'F_PROVIDER_ID'); |
|
610 | 610 | // define('F_PROVIDER_LIST', 'F_PROVIDER_LIST'); |
611 | 611 | |
612 | 612 | define('F_IMPERSONATE_STATUS', 'F_IMPERSONATE_STATUS'); |
613 | 613 | define('F_IMPERSONATE_OPERATOR', 'F_IMPERSONATE_OPERATOR'); |
614 | 614 | |
615 | -define('F_LOGIN_STATUS', 'F_LOGIN_STATUS'); |
|
615 | +define('F_LOGIN_STATUS', 'F_LOGIN_STATUS'); |
|
616 | 616 | define('F_LOGIN_MESSAGE', 'F_LOGIN_MESSAGE'); |
617 | 617 | |
618 | -define('F_PLAYER_REGISTER_STATUS', 'F_PLAYER_REGISTER_STATUS'); |
|
618 | +define('F_PLAYER_REGISTER_STATUS', 'F_PLAYER_REGISTER_STATUS'); |
|
619 | 619 | define('F_PLAYER_REGISTER_MESSAGE', 'F_PLAYER_REGISTER_MESSAGE'); |
620 | 620 | |
621 | 621 | define('F_USER_ID', 'F_USER_ID'); |
@@ -659,78 +659,78 @@ discard block |
||
659 | 659 | |
660 | 660 | |
661 | 661 | // Option groups |
662 | -define('OPT_ALL', 0); |
|
663 | -define('OPT_MESSAGE', 1); |
|
662 | +define('OPT_ALL', 0); |
|
663 | +define('OPT_MESSAGE', 1); |
|
664 | 664 | define('OPT_UNIVERSE', 2); |
665 | 665 | define('OPT_INTERFACE', 3); |
666 | 666 | |
667 | 667 | // Message classes |
668 | -define('MSG_TYPE_OUTBOX' , -1); |
|
669 | -define('MSG_TYPE_SPY' , 0); |
|
670 | -define('MSG_TYPE_PLAYER' , 1); |
|
671 | -define('MSG_TYPE_ALLIANCE' , 2); |
|
672 | -define('MSG_TYPE_COMBAT' , 3); |
|
673 | -define('MSG_TYPE_RECYCLE' , 4); |
|
674 | -define('MSG_TYPE_TRANSPORT', 5); |
|
675 | -define('MSG_TYPE_ADMIN' , 6); |
|
676 | -define('MSG_TYPE_EXPLORE' , 15); |
|
677 | -define('MSG_TYPE_QUE' , 99); |
|
678 | -define('MSG_TYPE_NEW' , 100); |
|
668 | +define('MSG_TYPE_OUTBOX', -1); |
|
669 | +define('MSG_TYPE_SPY', 0); |
|
670 | +define('MSG_TYPE_PLAYER', 1); |
|
671 | +define('MSG_TYPE_ALLIANCE', 2); |
|
672 | +define('MSG_TYPE_COMBAT', 3); |
|
673 | +define('MSG_TYPE_RECYCLE', 4); |
|
674 | +define('MSG_TYPE_TRANSPORT', 5); |
|
675 | +define('MSG_TYPE_ADMIN', 6); |
|
676 | +define('MSG_TYPE_EXPLORE', 15); |
|
677 | +define('MSG_TYPE_QUE', 99); |
|
678 | +define('MSG_TYPE_NEW', 100); |
|
679 | 679 | |
680 | 680 | // Attack verification statuses |
681 | -define('ATTACK_ALLOWED' , 0); |
|
682 | -define('ATTACK_NO_TARGET' , 1); |
|
683 | -define('ATTACK_OWN' , 2); |
|
684 | -define('ATTACK_WRONG_MISSION' , 3); |
|
685 | -define('ATTACK_NO_ALLY_DEPOSIT' , 4); |
|
686 | -define('ATTACK_NO_DEBRIS' , 5); |
|
687 | -define('ATTACK_VACATION' , 6); |
|
688 | -define('ATTACK_SAME_IP' , 7); |
|
689 | -define('ATTACK_BUFFING' , 8); |
|
690 | -define('ATTACK_ADMIN' , 9); |
|
691 | -define('ATTACK_NOOB' , 10); |
|
692 | -define('ATTACK_OWN_VACATION' , 11); |
|
693 | -define('ATTACK_NO_SILO' , 12); |
|
694 | -define('ATTACK_NO_MISSILE' , 13); |
|
695 | -define('ATTACK_NO_FLEET' , 14); |
|
696 | -define('ATTACK_NO_SLOTS' , 15); |
|
697 | -define('ATTACK_NO_SHIPS' , 16); |
|
698 | -define('ATTACK_NO_RECYCLERS' , 17); |
|
699 | -define('ATTACK_NO_SPIES' , 18); |
|
700 | -define('ATTACK_NO_COLONIZER' , 19); |
|
701 | -define('ATTACK_MISSILE_TOO_FAR' , 20); |
|
702 | -define('ATTACK_WRONG_STRUCTURE' , 21); |
|
703 | -define('ATTACK_NO_FUEL' , 22); |
|
704 | -define('ATTACK_NO_RESOURCES' , 23); |
|
705 | -define('ATTACK_NO_ACS' , 24); |
|
706 | -define('ATTACK_ACS_MISSTARGET' , 25); |
|
707 | -define('ATTACK_WRONG_SPEED' , 26); |
|
708 | -define('ATTACK_ACS_TOO_LATE' , 27); |
|
709 | -define('ATTACK_BASHING' , 28); |
|
710 | -define('ATTACK_BASHING_WAR_DELAY' , 29); |
|
711 | -define('ATTACK_ACS_WRONG_TARGET' , 30); |
|
712 | -define('ATTACK_SAME' , 31); |
|
681 | +define('ATTACK_ALLOWED', 0); |
|
682 | +define('ATTACK_NO_TARGET', 1); |
|
683 | +define('ATTACK_OWN', 2); |
|
684 | +define('ATTACK_WRONG_MISSION', 3); |
|
685 | +define('ATTACK_NO_ALLY_DEPOSIT', 4); |
|
686 | +define('ATTACK_NO_DEBRIS', 5); |
|
687 | +define('ATTACK_VACATION', 6); |
|
688 | +define('ATTACK_SAME_IP', 7); |
|
689 | +define('ATTACK_BUFFING', 8); |
|
690 | +define('ATTACK_ADMIN', 9); |
|
691 | +define('ATTACK_NOOB', 10); |
|
692 | +define('ATTACK_OWN_VACATION', 11); |
|
693 | +define('ATTACK_NO_SILO', 12); |
|
694 | +define('ATTACK_NO_MISSILE', 13); |
|
695 | +define('ATTACK_NO_FLEET', 14); |
|
696 | +define('ATTACK_NO_SLOTS', 15); |
|
697 | +define('ATTACK_NO_SHIPS', 16); |
|
698 | +define('ATTACK_NO_RECYCLERS', 17); |
|
699 | +define('ATTACK_NO_SPIES', 18); |
|
700 | +define('ATTACK_NO_COLONIZER', 19); |
|
701 | +define('ATTACK_MISSILE_TOO_FAR', 20); |
|
702 | +define('ATTACK_WRONG_STRUCTURE', 21); |
|
703 | +define('ATTACK_NO_FUEL', 22); |
|
704 | +define('ATTACK_NO_RESOURCES', 23); |
|
705 | +define('ATTACK_NO_ACS', 24); |
|
706 | +define('ATTACK_ACS_MISSTARGET', 25); |
|
707 | +define('ATTACK_WRONG_SPEED', 26); |
|
708 | +define('ATTACK_ACS_TOO_LATE', 27); |
|
709 | +define('ATTACK_BASHING', 28); |
|
710 | +define('ATTACK_BASHING_WAR_DELAY', 29); |
|
711 | +define('ATTACK_ACS_WRONG_TARGET', 30); |
|
712 | +define('ATTACK_SAME', 31); |
|
713 | 713 | define('ATTACK_RESOURCE_FORBIDDEN', 32); |
714 | -define('ATTACK_TRANSPORT_EMPTY' , 33); |
|
715 | -define('ATTACK_SPIES_LONLY' , 34); |
|
716 | -define('ATTACK_TOO_FAR' , 35); |
|
717 | -define('ATTACK_OVERLOADED' , 36); |
|
718 | -define('ATTACK_MISSION_ABSENT' , 37); |
|
719 | -define('ATTACK_WRONG_UNIT' , 38); |
|
720 | -define('ATTACK_ZERO_SPEED' , 39); |
|
721 | -define('ATTACK_SHIP_COUNT_WRONG' , 40); |
|
714 | +define('ATTACK_TRANSPORT_EMPTY', 33); |
|
715 | +define('ATTACK_SPIES_LONLY', 34); |
|
716 | +define('ATTACK_TOO_FAR', 35); |
|
717 | +define('ATTACK_OVERLOADED', 36); |
|
718 | +define('ATTACK_MISSION_ABSENT', 37); |
|
719 | +define('ATTACK_WRONG_UNIT', 38); |
|
720 | +define('ATTACK_ZERO_SPEED', 39); |
|
721 | +define('ATTACK_SHIP_COUNT_WRONG', 40); |
|
722 | 722 | define('ATTACK_RESOURCE_COUNT_WRONG', 41); |
723 | 723 | define('ATTACK_MORATORIUM', 42); |
724 | 724 | define('ATTACK_CHILD_PROTECTION', 43); |
725 | 725 | |
726 | 726 | |
727 | 727 | // *** Races - Homeworlds |
728 | -define('RACE_NONE' , 0); |
|
729 | -define('RACE_EARTH' , 1); |
|
730 | -define('RACE_MOON' , 2); |
|
731 | -define('RACE_MERCURY' , 3); |
|
732 | -define('RACE_VENUS' , 4); |
|
733 | -define('RACE_MARS' , 5); |
|
728 | +define('RACE_NONE', 0); |
|
729 | +define('RACE_EARTH', 1); |
|
730 | +define('RACE_MOON', 2); |
|
731 | +define('RACE_MERCURY', 3); |
|
732 | +define('RACE_VENUS', 4); |
|
733 | +define('RACE_MARS', 5); |
|
734 | 734 | define('RACE_ASTEROID', 6); |
735 | 735 | // define('MARKET_INFO' , 7); |
736 | 736 | |
@@ -738,115 +738,115 @@ discard block |
||
738 | 738 | |
739 | 739 | // *** Market variables |
740 | 740 | // === Market blocks |
741 | -define('MARKET_ENTRY' , 0); |
|
742 | -define('MARKET_RESOURCES' , 1); |
|
743 | -define('MARKET_SCRAPPER' , 2); |
|
744 | -define('MARKET_STOCKMAN' , 3); |
|
745 | -define('MARKET_EXCHANGE' , 4); |
|
746 | -define('MARKET_BANKER' , 5); |
|
747 | -define('MARKET_PAWNSHOP' , 6); |
|
748 | -define('MARKET_INFO' , 7); |
|
741 | +define('MARKET_ENTRY', 0); |
|
742 | +define('MARKET_RESOURCES', 1); |
|
743 | +define('MARKET_SCRAPPER', 2); |
|
744 | +define('MARKET_STOCKMAN', 3); |
|
745 | +define('MARKET_EXCHANGE', 4); |
|
746 | +define('MARKET_BANKER', 5); |
|
747 | +define('MARKET_PAWNSHOP', 6); |
|
748 | +define('MARKET_INFO', 7); |
|
749 | 749 | |
750 | 750 | // === Market error statuses |
751 | -define('MARKET_NOTHING' , 0); |
|
752 | -define('MARKET_DEAL' , 1); |
|
753 | -define('MARKET_DEAL_TRADE' , 2); |
|
754 | -define('MARKET_NO_DM' , 3); |
|
755 | -define('MARKET_NO_RESOURCES' , 4); |
|
756 | -define('MARKET_ZERO_DEAL' , 5); |
|
757 | -define('MARKET_NO_SHIPS' , 6); |
|
758 | -define('MARKET_NOT_A_SHIP' , 7); |
|
759 | -define('MARKET_NO_STOCK' , 8); |
|
760 | -define('MARKET_ZERO_RES_STOCK' , 9); |
|
761 | -define('MARKET_NEGATIVE_SHIPS' , 10); |
|
762 | - |
|
763 | -define('MARKET_INFO_PLAYER' , 12); |
|
764 | -define('MARKET_INFO_WRONG' , 11); |
|
751 | +define('MARKET_NOTHING', 0); |
|
752 | +define('MARKET_DEAL', 1); |
|
753 | +define('MARKET_DEAL_TRADE', 2); |
|
754 | +define('MARKET_NO_DM', 3); |
|
755 | +define('MARKET_NO_RESOURCES', 4); |
|
756 | +define('MARKET_ZERO_DEAL', 5); |
|
757 | +define('MARKET_NO_SHIPS', 6); |
|
758 | +define('MARKET_NOT_A_SHIP', 7); |
|
759 | +define('MARKET_NO_STOCK', 8); |
|
760 | +define('MARKET_ZERO_RES_STOCK', 9); |
|
761 | +define('MARKET_NEGATIVE_SHIPS', 10); |
|
762 | + |
|
763 | +define('MARKET_INFO_PLAYER', 12); |
|
764 | +define('MARKET_INFO_WRONG', 11); |
|
765 | 765 | define('MARKET_INFO_PLAYER_NOT_FOUND', 13); |
766 | -define('MARKET_INFO_PLAYER_WRONG' , 14); |
|
767 | -define('MARKET_INFO_PLAYER_SAME' , 15); |
|
766 | +define('MARKET_INFO_PLAYER_WRONG', 14); |
|
767 | +define('MARKET_INFO_PLAYER_SAME', 15); |
|
768 | 768 | |
769 | 769 | |
770 | 770 | |
771 | 771 | |
772 | 772 | // *** Mercenary/talent bonus types |
773 | -define('BONUS_NONE' , 0); // No bonus |
|
774 | -define('BONUS_PERCENT' , 1); // Percent on base value |
|
775 | -define('BONUS_ADD' , 2); // Add |
|
776 | -define('BONUS_ABILITY' , 3); // Some ability |
|
777 | -define('BONUS_MULTIPLY', 4); // Multiply by value |
|
773 | +define('BONUS_NONE', 0); // No bonus |
|
774 | +define('BONUS_PERCENT', 1); // Percent on base value |
|
775 | +define('BONUS_ADD', 2); // Add |
|
776 | +define('BONUS_ABILITY', 3); // Some ability |
|
777 | +define('BONUS_MULTIPLY', 4); // Multiply by value |
|
778 | 778 | //define('BONUS_PERCENT_CUMULATIVE' , 5); // Cumulative percent on base value |
779 | 779 | //define('BONUS_PERCENT_DEGRADED' , 6); // Bonus amount degraded with increase as pow(bonus, level) (?) |
780 | 780 | //define('BONUS_SPEED', 7); // Speed bonus |
781 | 781 | |
782 | 782 | // *** Action constant (build should be replaced with ACTION) |
783 | -define('BUILD_CREATE' , 1); |
|
783 | +define('BUILD_CREATE', 1); |
|
784 | 784 | define('BUILD_DESTROY', -1); |
785 | 785 | define('BUILD_AUTOCONVERT', 2); |
786 | 786 | |
787 | -define('ACTION_SELL' , -1); |
|
788 | -define('ACTION_NOTHING' , 0); |
|
789 | -define('ACTION_BUY' , 1); |
|
790 | -define('ACTION_USE' , 2); |
|
791 | -define('ACTION_DELETE' , 3); |
|
787 | +define('ACTION_SELL', -1); |
|
788 | +define('ACTION_NOTHING', 0); |
|
789 | +define('ACTION_BUY', 1); |
|
790 | +define('ACTION_USE', 2); |
|
791 | +define('ACTION_DELETE', 3); |
|
792 | 792 | |
793 | 793 | // *** Check unit availability codes |
794 | -define('BUILD_ALLOWED' , 0); // HARDCODED! DO NOT CHANGE! |
|
794 | +define('BUILD_ALLOWED', 0); // HARDCODED! DO NOT CHANGE! |
|
795 | 795 | define('BUILD_REQUIRE_NOT_MEET', 1); |
796 | -define('BUILD_AMOUNT_WRONG' , 2); |
|
797 | -define('BUILD_QUE_WRONG' , 3); |
|
798 | -define('BUILD_QUE_UNIT_WRONG' , 4); |
|
799 | -define('BUILD_INDESTRUCTABLE' , 5); |
|
800 | -define('BUILD_NO_RESOURCES' , 6); |
|
801 | -define('BUILD_NO_UNITS' , 7); |
|
802 | -define('BUILD_UNIT_BUSY' , 8); |
|
803 | -define('BUILD_QUE_FULL' , 9); |
|
804 | -define('BUILD_SILO_FULL' ,10); |
|
805 | -define('BUILD_MAX_REACHED' ,11); |
|
806 | -define('BUILD_SECTORS_NONE' ,12); |
|
796 | +define('BUILD_AMOUNT_WRONG', 2); |
|
797 | +define('BUILD_QUE_WRONG', 3); |
|
798 | +define('BUILD_QUE_UNIT_WRONG', 4); |
|
799 | +define('BUILD_INDESTRUCTABLE', 5); |
|
800 | +define('BUILD_NO_RESOURCES', 6); |
|
801 | +define('BUILD_NO_UNITS', 7); |
|
802 | +define('BUILD_UNIT_BUSY', 8); |
|
803 | +define('BUILD_QUE_FULL', 9); |
|
804 | +define('BUILD_SILO_FULL', 10); |
|
805 | +define('BUILD_MAX_REACHED', 11); |
|
806 | +define('BUILD_SECTORS_NONE', 12); |
|
807 | 807 | define('BUILD_AUTOCONVERT_AVAILABLE', 13); |
808 | 808 | |
809 | 809 | |
810 | 810 | // *** Que types |
811 | 811 | define('QUE_STRUCTURES', 1); |
812 | -define('QUE_HANGAR' , 4); |
|
813 | -define('QUE_RESEARCH' , 7); |
|
814 | -define('QUE_MERCENARY' , 600); // UNIT_MERCENARIES |
|
812 | +define('QUE_HANGAR', 4); |
|
813 | +define('QUE_RESEARCH', 7); |
|
814 | +define('QUE_MERCENARY', 600); // UNIT_MERCENARIES |
|
815 | 815 | // *** Subque types |
816 | -define('SUBQUE_PLANET' , 1); |
|
817 | -define('SUBQUE_MOON' , 3); |
|
818 | -define('SUBQUE_FLEET' , 4); |
|
819 | -define('SUBQUE_DEFENSE' , 6); |
|
816 | +define('SUBQUE_PLANET', 1); |
|
817 | +define('SUBQUE_MOON', 3); |
|
818 | +define('SUBQUE_FLEET', 4); |
|
819 | +define('SUBQUE_DEFENSE', 6); |
|
820 | 820 | define('SUBQUE_RESEARCH', 7); |
821 | 821 | |
822 | 822 | // *** Que items |
823 | -define('QI_UNIT_ID' , 0); |
|
824 | -define('QI_AMOUNT' , 1); |
|
825 | -define('QI_TIME' , 2); |
|
826 | -define('QI_MODE' , 3); |
|
827 | -define('QI_QUE_ID' , 4); |
|
828 | -define('QI_QUE_TYPE' , 4); |
|
829 | -define('QI_PLANET_ID' , 5); |
|
823 | +define('QI_UNIT_ID', 0); |
|
824 | +define('QI_AMOUNT', 1); |
|
825 | +define('QI_TIME', 2); |
|
826 | +define('QI_MODE', 3); |
|
827 | +define('QI_QUE_ID', 4); |
|
828 | +define('QI_QUE_TYPE', 4); |
|
829 | +define('QI_PLANET_ID', 5); |
|
830 | 830 | |
831 | 831 | |
832 | 832 | // *** Units |
833 | 833 | |
834 | 834 | // *** Sort options |
835 | -define('SORT_ASCENDING' , 0); |
|
835 | +define('SORT_ASCENDING', 0); |
|
836 | 836 | define('SORT_DESCENDING', 1); |
837 | 837 | |
838 | -define('SORT_ID' , 0); |
|
839 | -define('SORT_LOCATION' , 1); |
|
840 | -define('SORT_NAME' , 2); |
|
841 | -define('SORT_SIZE' , 3); |
|
842 | -define('SORT_EMAIL' , 4); |
|
843 | -define('SORT_IP' , 5); |
|
838 | +define('SORT_ID', 0); |
|
839 | +define('SORT_LOCATION', 1); |
|
840 | +define('SORT_NAME', 2); |
|
841 | +define('SORT_SIZE', 3); |
|
842 | +define('SORT_EMAIL', 4); |
|
843 | +define('SORT_IP', 5); |
|
844 | 844 | define('SORT_TIME_REGISTERED', 6); |
845 | 845 | define('SORT_TIME_LAST_VISIT', 7); |
846 | -define('SORT_TIME_BAN_UNTIL' , 8); |
|
847 | -define('SORT_REFERRAL_COUNT' , 9); |
|
848 | -define('SORT_REFERRAL_DM' , 10); |
|
849 | -define('SORT_VACATION' , 11); |
|
846 | +define('SORT_TIME_BAN_UNTIL', 8); |
|
847 | +define('SORT_REFERRAL_COUNT', 9); |
|
848 | +define('SORT_REFERRAL_DM', 10); |
|
849 | +define('SORT_VACATION', 11); |
|
850 | 850 | |
851 | 851 | |
852 | 852 | define('HULL_SIZE_TINY', 1); |
@@ -1000,10 +1000,10 @@ discard block |
||
1000 | 1000 | |
1001 | 1001 | // === Artifacts |
1002 | 1002 | define('UNIT_ARTIFACTS', 1000); |
1003 | -define('ART_LHC', 1001); // Additional moon chance |
|
1004 | -define('ART_RCD_SMALL', 1002); // Rapid Colony Deployment - Set of buildings up to 10th level - 10/14/ 3/0 - 405 DM |
|
1005 | -define('ART_RCD_MEDIUM', 1003); // Rapid Colony Deployment - Set of buildings up to 15th level - 15/20/ 8/0 - 4704 DM |
|
1006 | -define('ART_RCD_LARGE', 1004); // Rapid Colony Deployment - Set of buildings up to 20th level - 20/25/10/1 - 39790 DM |
|
1003 | +define('ART_LHC', 1001); // Additional moon chance |
|
1004 | +define('ART_RCD_SMALL', 1002); // Rapid Colony Deployment - Set of buildings up to 10th level - 10/14/ 3/0 - 405 DM |
|
1005 | +define('ART_RCD_MEDIUM', 1003); // Rapid Colony Deployment - Set of buildings up to 15th level - 15/20/ 8/0 - 4704 DM |
|
1006 | +define('ART_RCD_LARGE', 1004); // Rapid Colony Deployment - Set of buildings up to 20th level - 20/25/10/1 - 39790 DM |
|
1007 | 1007 | define('ART_HEURISTIC_CHIP', 1005); // Speed up research |
1008 | 1008 | define('ART_NANO_BUILDER', 1006); // Speed up building |
1009 | 1009 | define('ART_NANO_CONSTRUCTOR', 1007); // RESERVED Speed up hangar constructions |
@@ -1077,25 +1077,25 @@ discard block |
||
1077 | 1077 | define('UNIT_AWARD_MEDAL_BLITZ_R0_PLACE1', 2201); // Блиц-сервер, участник 0-го раунда, 1-е место |
1078 | 1078 | define('UNIT_AWARD_MEDAL_BLITZ_R0_PLACE2', 2202); // Блиц-сервер, участник 0-го раунда, 2-е место |
1079 | 1079 | define('UNIT_AWARD_MEDAL_BLITZ_R0_PLACE3', 2203); // Блиц-сервер, участник 0-го раунда, 3-е место |
1080 | -define('UNIT_AWARD_MEDAL_2016_WOMEN_DAY_BEST', 2204); // Медаль Лучшему Кавалеру за максимум потраченной ММ/максимум одаренных женщин Женщине от Мужчины во время ивента 8 марта 2016 года |
|
1081 | -define('UNIT_AWARD_MEDAL_2017_WOMEN_DAY_BEST', 2205); // Медаль Лучшему Кавалеру за максимум потраченной ММ/максимум одаренных женщин Женщине от Мужчины во время ивента 8 марта 2017 года |
|
1082 | -define('UNIT_AWARD_MEDAL_2017_WOMEN_DAY_QUEEN', 2206); // Медаль Королевы Весны за максимум полученной ММ/максимум полученных подарков от Мужчины во время ивента 8 марта 2017 года |
|
1080 | +define('UNIT_AWARD_MEDAL_2016_WOMEN_DAY_BEST', 2204); // Медаль Лучшему Кавалеру за максимум потраченной ММ/максимум одаренных женщин Женщине от Мужчины во время ивента 8 марта 2016 года |
|
1081 | +define('UNIT_AWARD_MEDAL_2017_WOMEN_DAY_BEST', 2205); // Медаль Лучшему Кавалеру за максимум потраченной ММ/максимум одаренных женщин Женщине от Мужчины во время ивента 8 марта 2017 года |
|
1082 | +define('UNIT_AWARD_MEDAL_2017_WOMEN_DAY_QUEEN', 2206); // Медаль Королевы Весны за максимум полученной ММ/максимум полученных подарков от Мужчины во время ивента 8 марта 2017 года |
|
1083 | 1083 | define('UNIT_AWARD_MEDAL_8_MARCH_BEST_CAVALIER_AMOUNT', 2207); // Медаль Лучшему Кавалеру за максимум потраченной ММ Женщине от Мужчины во время ивента 8 марта 2017 года |
1084 | 1084 | define('UNIT_AWARD_MEDAL_8_MARCH_BEST_CAVALIER_COUNT', 2208); // Медаль Лучшему Кавалеру за максимум одаренных женщин Женщине от Мужчины во время ивента 8 марта 2017 года |
1085 | 1085 | define('UNIT_AWARD_MEDAL_8_MARCH_SPRING_QUEEN_AMOUNT', 2209); // Медаль Королевы Весны за максимум полученной ММ от Мужчины во время ивента 8 марта 2017 года |
1086 | 1086 | define('UNIT_AWARD_MEDAL_8_MARCH_SPRING_QUEEN_COUNT', 2210); // Медаль Королевы Весны за максимум полученных подарков от Мужчины во время ивента 8 марта 2017 года |
1087 | 1087 | |
1088 | 1088 | define('UNIT_AWARD_MEMORY', 2300); // Памятные знаки за существование и участие - например "4 года в игре". "Был онлайн в новогоднюю ночь 2013". итд |
1089 | -define('UNIT_AWARD_MEMORY_IMMORTAL', 2301); // Бессмертный |
|
1090 | -define('UNIT_AWARD_MEMORY_2015_WOMEN_DAY', 2302); // Значек за подарок Женщине от Мужчины во время ивента 8 марта 2015 года |
|
1089 | +define('UNIT_AWARD_MEMORY_IMMORTAL', 2301); // Бессмертный |
|
1090 | +define('UNIT_AWARD_MEMORY_2015_WOMEN_DAY', 2302); // Значек за подарок Женщине от Мужчины во время ивента 8 марта 2015 года |
|
1091 | 1091 | define('UNIT_AWARD_MEMORY_BLITZ_R0', 2303); // Блиц-сервер, участник 0-го раунда |
1092 | 1092 | define('UNIT_AWARD_MEMORY_SUPER_BORN_2015_SIMPLE', 2304); // День Рождения СН |
1093 | 1093 | define('UNIT_AWARD_MEMORY_SUPER_BORN_2015_BRONZE', 2305); // День Рождения СН |
1094 | 1094 | define('UNIT_AWARD_MEMORY_SUPER_BORN_2015_SILVER', 2306); // День Рождения СН |
1095 | 1095 | define('UNIT_AWARD_MEMORY_SUPER_BORN_2015_GOLD', 2307); // День Рождения СН |
1096 | 1096 | define('UNIT_AWARD_MEMORY_SUPER_BORN_2015_PLATINUM', 2308); // День Рождения СН |
1097 | -define('UNIT_AWARD_MEMORY_2016_WOMEN_DAY', 2309); // Значек за подарок Женщине от Мужчины во время ивента 8 марта 2016 года |
|
1098 | -define('UNIT_AWARD_MEMORY_2017_WOMEN_DAY', 2310); // Значек за подарок Женщине от Мужчины во время ивента 8 марта 2017 года |
|
1097 | +define('UNIT_AWARD_MEMORY_2016_WOMEN_DAY', 2309); // Значек за подарок Женщине от Мужчины во время ивента 8 марта 2016 года |
|
1098 | +define('UNIT_AWARD_MEMORY_2017_WOMEN_DAY', 2310); // Значек за подарок Женщине от Мужчины во время ивента 8 марта 2017 года |
|
1099 | 1099 | define('UNIT_AWARD_MEMORY_SUPER_BORN_2017_SIMPLE', 2311); // День Рождения СН - 2017 |
1100 | 1100 | define('UNIT_AWARD_MEMORY_SUPER_BORN_2017_BRONZE', 2312); // День Рождения СН - 2017 |
1101 | 1101 | define('UNIT_AWARD_MEMORY_SUPER_BORN_2017_SILVER', 2313); // День Рождения СН - 2017 |
@@ -1117,7 +1117,7 @@ discard block |
||
1117 | 1117 | define('UNIT_AWARD_MEMORY_NEW_YEAR_2018_SIMPLE', 2326); // СуперНовый Год - 2018 |
1118 | 1118 | define('UNIT_AWARD_MEMORY_NEW_YEAR_2018_BRONZE', 2327); // СуперНовый Год - 2018 |
1119 | 1119 | define('UNIT_AWARD_MEMORY_NEW_YEAR_2018_SILVER', 2328); // СуперНовый Год - 2018 |
1120 | -define('UNIT_AWARD_MEMORY_NEW_YEAR_2018_GOLD', 2329); // СуперНовый Год - 2018 |
|
1120 | +define('UNIT_AWARD_MEMORY_NEW_YEAR_2018_GOLD', 2329); // СуперНовый Год - 2018 |
|
1121 | 1121 | define('UNIT_AWARD_MEMORY_NEW_YEAR_2018_PLATINUM', 2330); // СуперНовый Год - 2018 |
1122 | 1122 | define('UNIT_AWARD_MEMORY_NEW_YEAR_2018_DIAMOND', 2331); // СуперНовый Год - 2018 |
1123 | 1123 | |
@@ -1254,7 +1254,7 @@ discard block |
||
1254 | 1254 | define('UNIT_FLEET_PLANET_SPY', 'UNIT_FLEET_PLANET_SPY'); |
1255 | 1255 | |
1256 | 1256 | |
1257 | -define('GROUP_PART', 800000); |
|
1257 | +define('GROUP_PART', 800000); |
|
1258 | 1258 | // Зарезервировано для запчастей: 800.001 - 899.999 |
1259 | 1259 | // define('GROUP_PART_HULL', 801000); // Корпуса - 1000 штук |
1260 | 1260 | // define('GROUP_PART_ARMOR', 802000); // Броня - 1000 штук |
@@ -1582,35 +1582,35 @@ discard block |
||
1582 | 1582 | |
1583 | 1583 | |
1584 | 1584 | // define('NICK_ID', -1); |
1585 | -define('NICK_HTML', 0); |
|
1586 | - |
|
1587 | -define('NICK_FIRST', 1); |
|
1588 | -define('NICK_RACE', 1000); |
|
1589 | -define('NICK_GENDER', 2000); |
|
1590 | -define('NICK_AWARD', 3000); |
|
1591 | -define('NICK_VACATION', 3500); |
|
1592 | -define('NICK_BIRTHDAY', 4000); |
|
1593 | -define('NICK_RANK', 4500); |
|
1594 | -define('NICK_RANK_NO_TEXT', 4750); |
|
1595 | -define('NICK_PREMIUM', 5000); |
|
1596 | -define('NICK_AUTH_LEVEL', 6000); |
|
1597 | - |
|
1598 | -define('NICK_HIGHLIGHT', 6300); |
|
1599 | -define('NICK_CLASS', 6450); |
|
1600 | - |
|
1601 | -define('NICK_NICK_CLASS', 6600); |
|
1602 | -define('NICK_NICK', 7000); |
|
1585 | +define('NICK_HTML', 0); |
|
1586 | + |
|
1587 | +define('NICK_FIRST', 1); |
|
1588 | +define('NICK_RACE', 1000); |
|
1589 | +define('NICK_GENDER', 2000); |
|
1590 | +define('NICK_AWARD', 3000); |
|
1591 | +define('NICK_VACATION', 3500); |
|
1592 | +define('NICK_BIRTHDAY', 4000); |
|
1593 | +define('NICK_RANK', 4500); |
|
1594 | +define('NICK_RANK_NO_TEXT', 4750); |
|
1595 | +define('NICK_PREMIUM', 5000); |
|
1596 | +define('NICK_AUTH_LEVEL', 6000); |
|
1597 | + |
|
1598 | +define('NICK_HIGHLIGHT', 6300); |
|
1599 | +define('NICK_CLASS', 6450); |
|
1600 | + |
|
1601 | +define('NICK_NICK_CLASS', 6600); |
|
1602 | +define('NICK_NICK', 7000); |
|
1603 | 1603 | define('NICK_NICK_CLASS_END', 7300); |
1604 | 1604 | |
1605 | -define('NICK_ALLY_CLASS', 7600); |
|
1606 | -define('NICK_ALLY', 8000); |
|
1605 | +define('NICK_ALLY_CLASS', 7600); |
|
1606 | +define('NICK_ALLY', 8000); |
|
1607 | 1607 | define('NICK_ALLY_CLASS_END', 8300); |
1608 | 1608 | |
1609 | -define('NICK_CLASS_END', 8450); |
|
1610 | -define('NICK_HIGHLIGHT_END', 8600); |
|
1609 | +define('NICK_CLASS_END', 8450); |
|
1610 | +define('NICK_HIGHLIGHT_END', 8600); |
|
1611 | 1611 | |
1612 | -define('NICK_LAST', 9999); |
|
1613 | -define('NICK_SORT', 10000); |
|
1612 | +define('NICK_LAST', 9999); |
|
1613 | +define('NICK_SORT', 10000); |
|
1614 | 1614 | |
1615 | 1615 | // Настройки игрока |
1616 | 1616 | define('PLAYER_OPTION_MENU_SORT', 1); |
@@ -1713,8 +1713,8 @@ discard block |
||
1713 | 1713 | define('LOG_ONLIINE_AGGREGATE_PERIOD_MINUTE_10', 1); |
1714 | 1714 | |
1715 | 1715 | define('BLITZ_REGISTER_DISABLED', 0); |
1716 | -define('BLITZ_REGISTER_OPEN' , 1); |
|
1717 | -define('BLITZ_REGISTER_CLOSED' , 2); |
|
1716 | +define('BLITZ_REGISTER_OPEN', 1); |
|
1717 | +define('BLITZ_REGISTER_CLOSED', 2); |
|
1718 | 1718 | define('BLITZ_REGISTER_SHOW_LOGIN', 3); |
1719 | 1719 | define('BLITZ_REGISTER_DISCLOSURE_NAMES', 4); |
1720 | 1720 | |
@@ -1846,8 +1846,8 @@ discard block |
||
1846 | 1846 | const MODULE_LOAD_ORDER_AUTH_VKONTAKTE = 3; |
1847 | 1847 | const MODULE_LOAD_ORDER_PAYMENT_SECONDARY = 90000; |
1848 | 1848 | const MODULE_LOAD_ORDER_UNIT_RES_METAMATTER = 99999; |
1849 | -const MODULE_LOAD_ORDER_DEFAULT = 100000; // HARDCODE |
|
1850 | -const MODULE_LOAD_ORDER_CORE_SHIP_CONSTRUCTOR = 999999; // RESERVED |
|
1849 | +const MODULE_LOAD_ORDER_DEFAULT = 100000; // HARDCODE |
|
1850 | +const MODULE_LOAD_ORDER_CORE_SHIP_CONSTRUCTOR = 999999; // RESERVED |
|
1851 | 1851 | const MODULE_LOAD_ORDER_MENU_CUSTOMIZE = 200000000; |
1852 | 1852 | const MODULE_LOAD_ORDER_LATEST = 2000000000; // HARDCODE |
1853 | 1853 | const MODULE_LOAD_ORDER_GAME_SKIRMISH = 2000100000; |
@@ -3,7 +3,7 @@ discard block |
||
3 | 3 | use \Core\SnBootstrap; |
4 | 4 | |
5 | 5 | // Защита от двойного инита |
6 | -if(defined('INIT')) { |
|
6 | +if (defined('INIT')) { |
|
7 | 7 | return; |
8 | 8 | } |
9 | 9 | |
@@ -121,47 +121,47 @@ discard block |
||
121 | 121 | // Но нужно, пока у нас есть не MVC-страницы |
122 | 122 | $sn_page_data = $sn_mvc['pages'][$sn_page_name]; |
123 | 123 | $sn_page_name_file = 'includes/pages/' . $sn_page_data['filename'] . DOT_PHP_EX; |
124 | -if($sn_page_name) { |
|
124 | +if ($sn_page_name) { |
|
125 | 125 | // Merging page options to global option pull |
126 | - if(is_array($sn_page_data['options'])) { |
|
126 | + if (is_array($sn_page_data['options'])) { |
|
127 | 127 | SN::$options = array_merge(SN::$options, $sn_page_data['options']); |
128 | 128 | } |
129 | 129 | |
130 | - if(isset($sn_page_data) && file_exists($sn_page_name_file)) { |
|
130 | + if (isset($sn_page_data) && file_exists($sn_page_name_file)) { |
|
131 | 131 | require_once($sn_page_name_file); |
132 | 132 | } |
133 | 133 | } |
134 | 134 | |
135 | -if((defined('IN_AJAX') && IN_AJAX === true) || (defined('IN_ADMIN') && IN_ADMIN === true) || (!empty(SN::$options[PAGE_OPTION_ADMIN]))) { |
|
135 | +if ((defined('IN_AJAX') && IN_AJAX === true) || (defined('IN_ADMIN') && IN_ADMIN === true) || (!empty(SN::$options[PAGE_OPTION_ADMIN]))) { |
|
136 | 136 | SN::$options[PAGE_OPTION_FLEET_UPDATE_SKIP] = true; |
137 | 137 | } |
138 | 138 | |
139 | 139 | |
140 | 140 | // А теперь проверяем - поддерживают ли у нас загруженный код такую страницу |
141 | 141 | // TODO - костыль, что бы работали старые модули. Убрать! |
142 | -if(is_array($sn_data['pages'])) { |
|
142 | +if (is_array($sn_data['pages'])) { |
|
143 | 143 | $sn_mvc['pages'] = array_merge($sn_mvc['pages'], $sn_data['pages']); |
144 | 144 | } |
145 | -if(!isset($sn_mvc['pages'][$sn_page_name])) { |
|
145 | +if (!isset($sn_mvc['pages'][$sn_page_name])) { |
|
146 | 146 | $sn_page_name = ''; |
147 | 147 | } |
148 | 148 | |
149 | 149 | $lang->lng_switch(sys_get_param_str('lang')); |
150 | 150 | |
151 | 151 | |
152 | -if(SN::$config->server_updater_check_auto && SN::$config->server_updater_check_last + SN::$config->server_updater_check_period <= SN_TIME_NOW) { |
|
152 | +if (SN::$config->server_updater_check_auto && SN::$config->server_updater_check_last + SN::$config->server_updater_check_period <= SN_TIME_NOW) { |
|
153 | 153 | \Tools\VersionCheckerDeprecated::performCheckVersion(); |
154 | 154 | } |
155 | 155 | |
156 | -if(SN::$config->user_birthday_gift && SN_TIME_NOW - SN::$config->user_birthday_celebrate > PERIOD_DAY) { |
|
156 | +if (SN::$config->user_birthday_gift && SN_TIME_NOW - SN::$config->user_birthday_celebrate > PERIOD_DAY) { |
|
157 | 157 | require_once(SN_ROOT_PHYSICAL . 'includes/includes/user_birthday_celebrate.php'); |
158 | 158 | sn_user_birthday_celebrate(); |
159 | 159 | } |
160 | 160 | |
161 | -if(!SN::$config->var_online_user_count || SN::$config->var_online_user_time + 30 < SN_TIME_NOW) { |
|
161 | +if (!SN::$config->var_online_user_count || SN::$config->var_online_user_time + 30 < SN_TIME_NOW) { |
|
162 | 162 | SN::$config->db_saveItem('var_online_user_count', db_user_count(true)); |
163 | 163 | SN::$config->db_saveItem('var_online_user_time', SN_TIME_NOW); |
164 | - if(SN::$config->server_log_online) { |
|
164 | + if (SN::$config->server_log_online) { |
|
165 | 165 | doquery("INSERT IGNORE INTO {{log_users_online}} SET online_count = " . SN::$config->var_online_user_count . ";"); |
166 | 166 | } |
167 | 167 | } |
@@ -184,7 +184,7 @@ discard block |
||
184 | 184 | |
185 | 185 | $template_result[F_ACCOUNT_IS_AUTHORIZED] = $sys_user_logged_in = !empty($user) && isset($user['id']) && $user['id']; |
186 | 186 | |
187 | -if(!empty($user['id'])) { |
|
187 | +if (!empty($user['id'])) { |
|
188 | 188 | SN::$user_options->user_change($user['id']); |
189 | 189 | } |
190 | 190 | |
@@ -197,7 +197,7 @@ discard block |
||
197 | 197 | : false |
198 | 198 | ); |
199 | 199 | |
200 | -if($template_result[F_LOGIN_STATUS] == LOGIN_ERROR_USERNAME_RESTRICTED_CHARACTERS) { |
|
200 | +if ($template_result[F_LOGIN_STATUS] == LOGIN_ERROR_USERNAME_RESTRICTED_CHARACTERS) { |
|
201 | 201 | $prohibited_characters = array_map(function($value) { |
202 | 202 | return "'" . htmlentities($value, ENT_QUOTES, 'UTF-8') . "'"; |
203 | 203 | }, str_split(LOGIN_REGISTER_CHARACTERS_PROHIBITED)); |
@@ -205,7 +205,7 @@ discard block |
||
205 | 205 | } |
206 | 206 | |
207 | 207 | |
208 | -if(defined('DEBUG_AUTH') && DEBUG_AUTH && !defined('IN_AJAX')) { |
|
208 | +if (defined('DEBUG_AUTH') && DEBUG_AUTH && !defined('IN_AJAX')) { |
|
209 | 209 | pdump('Отключи отладку перед продакшном!'); |
210 | 210 | } |
211 | 211 | |
@@ -219,17 +219,17 @@ discard block |
||
219 | 219 | |
220 | 220 | StatUpdateLauncher::unlock(); |
221 | 221 | |
222 | -if($template_result[F_GAME_DISABLE] = SN::$config->game_disable) { |
|
222 | +if ($template_result[F_GAME_DISABLE] = SN::$config->game_disable) { |
|
223 | 223 | $template_result[F_GAME_DISABLE_REASON] = HelperString::nl2br( |
224 | 224 | SN::$config->game_disable == GAME_DISABLE_REASON |
225 | 225 | ? SN::$config->game_disable_reason |
226 | 226 | : $lang['sys_game_disable_reason'][SN::$config->game_disable] |
227 | 227 | ); |
228 | - if(defined('IN_API')) { |
|
228 | + if (defined('IN_API')) { |
|
229 | 229 | return; |
230 | 230 | } |
231 | 231 | |
232 | - if( |
|
232 | + if ( |
|
233 | 233 | ($user['authlevel'] < 1 || !(defined('IN_ADMIN') && IN_ADMIN)) |
234 | 234 | && |
235 | 235 | !(defined('INSTALL_MODE') && defined('LOGIN_LOGOUT')) |
@@ -244,8 +244,8 @@ discard block |
||
244 | 244 | |
245 | 245 | // TODO ban |
246 | 246 | // TODO $skip_ban_check |
247 | -if($template_result[F_BANNED_STATUS] && !$skip_ban_check) { |
|
248 | - if(defined('IN_API')) { |
|
247 | +if ($template_result[F_BANNED_STATUS] && !$skip_ban_check) { |
|
248 | + if (defined('IN_API')) { |
|
249 | 249 | return; |
250 | 250 | } |
251 | 251 | |
@@ -259,10 +259,10 @@ discard block |
||
259 | 259 | $allow_anonymous = $allow_anonymous || (isset($sn_page_data['allow_anonymous']) && $sn_page_data['allow_anonymous']); |
260 | 260 | |
261 | 261 | |
262 | -if($sys_user_logged_in && INITIAL_PAGE == 'login') { |
|
262 | +if ($sys_user_logged_in && INITIAL_PAGE == 'login') { |
|
263 | 263 | sys_redirect(SN_ROOT_VIRTUAL . 'overview.php'); |
264 | -} elseif($account_logged_in && !$sys_user_logged_in) { // empty(core_auth::$user['id']) |
|
265 | -} elseif(!$allow_anonymous && !$sys_user_logged_in) { |
|
264 | +} elseif ($account_logged_in && !$sys_user_logged_in) { // empty(core_auth::$user['id']) |
|
265 | +} elseif (!$allow_anonymous && !$sys_user_logged_in) { |
|
266 | 266 | sys_redirect(SN_ROOT_VIRTUAL . 'login.php'); |
267 | 267 | } |
268 | 268 | |
@@ -285,7 +285,7 @@ discard block |
||
285 | 285 | 'fleet_update_last', |
286 | 286 | SN::$config->fleet_update_interval, |
287 | 287 | // Promise |
288 | - function () {SN::$gc->fleetDispatcher->dispatch();}, |
|
288 | + function() {SN::$gc->fleetDispatcher->dispatch(); }, |
|
289 | 289 | WATCHDOG_TIME_SQL, |
290 | 290 | false |
291 | 291 | ); |