Passed
Branch trunk (7dc288)
by SuperNova.WS
06:07
created
admin/adm_user_analyze.php 2 patches
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -39,8 +39,8 @@
 block discarded – undo
39 39
     0 => $row['visit_time'], // start
40 40
     1 => $row['visit_time'], // end
41 41
   )
42
-   //: false
43
-   ;
42
+    //: false
43
+    ;
44 44
 }
45 45
 
46 46
 $session_list = array();
Please login to merge, or discard this patch.
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -19,13 +19,13 @@  discard block
 block discarded – undo
19 19
 // define('SESSION_INTERRUPT', 15*60); // Можно увеличить до 4 часов - никито не может сидеть 2 суток с перерывом менее 4 часов
20 20
 // define('SUSPICIOUS_LONG', 2 * 60*60); // Тогда это увеличиваем до, скажем суток - и там смотрим
21 21
 
22
-define('SESSION_INTERRUPT', 1 * 60*60); // Можно увеличить до 4 часов - никито не может сидеть 2 суток с перерывом менее 4 часов
23
-define('SUSPICIOUS_LONG', 16 * 60*60); // Тогда это увеличиваем до, скажем суток - и там смотрим
22
+define('SESSION_INTERRUPT', 1 * 60 * 60); // Можно увеличить до 4 часов - никито не может сидеть 2 суток с перерывом менее 4 часов
23
+define('SUSPICIOUS_LONG', 16 * 60 * 60); // Тогда это увеличиваем до, скажем суток - и там смотрим
24 24
 
25 25
 
26 26
 function check_suspicious(&$session, &$session_list_last_id, &$row) {
27 27
   $session[2] = $session[1] - $session[0];
28
-  if($session[2] > SUSPICIOUS_LONG)
28
+  if ($session[2] > SUSPICIOUS_LONG)
29 29
   {
30 30
     $session[2] = pretty_time($session[2]);
31 31
     $session[0] = date(FMT_DATE_TIME_SQL, $session[0]);
@@ -46,24 +46,24 @@  discard block
 block discarded – undo
46 46
 $session_list = array();
47 47
 $query = doquery("SELECT `visit_time`, user_id FROM {{counter}} where user_id <> 0 and visit_time > UNIX_TIMESTAMP(DATE_SUB(NOW(), INTERVAL 7 DAY)) order by user_id, visit_time;");
48 48
 $session = array();
49
-if($row = db_fetch($query)) {
49
+if ($row = db_fetch($query)) {
50 50
   $session = array(
51 51
     0 => strtotime($row['visit_time']), // start
52 52
     1 => strtotime($row['visit_time']), // end
53 53
   );
54 54
   $last_id = $row['user_id'];
55 55
 }
56
-while($row = db_fetch($query)) {
56
+while ($row = db_fetch($query)) {
57 57
   $row['visit_time'] = strtotime($row['visit_time']);
58
-  if($last_id == $row['user_id']) {
58
+  if ($last_id == $row['user_id']) {
59 59
     // Тот же юзер
60
-    if($row['visit_time'] - $session[1] <= SESSION_INTERRUPT) { // Та же сессия
60
+    if ($row['visit_time'] - $session[1] <= SESSION_INTERRUPT) { // Та же сессия
61 61
       $session[1] = $row['visit_time'];
62 62
     } else {
63 63
       // Новая сессия
64 64
 //      check_suspicious($session, $session_list[$last_id], $row);
65 65
       $session[2] = $session[1] - $session[0];
66
-      if($session[2] > SUSPICIOUS_LONG)
66
+      if ($session[2] > SUSPICIOUS_LONG)
67 67
       {
68 68
         $session[2] = pretty_time($session[2]);
69 69
         $session[0] = date(FMT_DATE_TIME_SQL, $session[0]);
@@ -78,7 +78,7 @@  discard block
 block discarded – undo
78 78
   } else {
79 79
 //    check_suspicious($session, $session_list[$last_id], $row);
80 80
     $session[2] = $session[1] - $session[0];
81
-      if($session[2] > SUSPICIOUS_LONG)
81
+      if ($session[2] > SUSPICIOUS_LONG)
82 82
       {
83 83
         $session[2] = pretty_time($session[2]);
84 84
         $session[0] = date(FMT_DATE_TIME_SQL, $session[0]);
@@ -93,11 +93,11 @@  discard block
 block discarded – undo
93 93
   }
94 94
 }
95 95
 
96
-if($last_id) {
96
+if ($last_id) {
97 97
   // check_suspicious($session, $session_list[$last_id], $row = array('time' => 0));
98 98
   $session[2] = $session[1] - $session[0];
99 99
 
100
-  if($session[2] > SUSPICIOUS_LONG)
100
+  if ($session[2] > SUSPICIOUS_LONG)
101 101
   {
102 102
     $session[2] = pretty_time($session[2]);
103 103
     $session[0] = date(FMT_DATE_TIME_SQL, $session[0]);
@@ -111,9 +111,9 @@  discard block
 block discarded – undo
111 111
 print("<td>ID</td><td>Username</td><td>Start</td><td>End</td><td>Length</td>");
112 112
 print("<td>Last online</td>");
113 113
 print("</tr>");
114
-foreach($session_list as $user_id => $value) {
114
+foreach ($session_list as $user_id => $value) {
115 115
   $user_record = doquery("SELECT `username`, onlinetime FROM {{users}} WHERE id = {$user_id};", true);
116
-  foreach($value as $interval_data) {
116
+  foreach ($value as $interval_data) {
117 117
     print("<tr>");
118 118
     print("<td>{$user_id}</td><td>{$user_record['username']}</td><td>{$interval_data[0]}</td><td>{$interval_data[1]}</td><td>{$interval_data[2]}</td>");
119 119
     print("<td>" . date(FMT_DATE_TIME_SQL, $user_record['onlinetime']) . "</td>");
Please login to merge, or discard this patch.
banned.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -19,8 +19,8 @@
 block discarded – undo
19 19
 $template = gettemplate('banned_body', true);
20 20
 
21 21
 $query = doquery("SELECT * FROM {{banned}} ORDER BY `ban_id` DESC;");
22
-$i=0;
23
-while($ban_row = db_fetch($query))
22
+$i = 0;
23
+while ($ban_row = db_fetch($query))
24 24
 {
25 25
   $template->assign_block_vars('banlist', array(
26 26
     'USER_NAME'   => $ban_row['ban_user_name'],
Please login to merge, or discard this patch.
buildings.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -21,8 +21,8 @@
 block discarded – undo
21 21
 $mode = sys_get_param_escaped('mode');
22 22
 $mode = (!$mode || $mode == 'buildings') ? QUE_STRUCTURES : ($mode == 'fleet' ? SUBQUE_FLEET : ($mode == 'defense' ? SUBQUE_DEFENSE : ($mode == 'research' ? QUE_RESEARCH : $mode)));
23 23
 
24
-if($building_sort = sys_get_param_id('sort_elements')) {
25
-  if(!empty($lang['player_option_building_sort'][$building_sort])) {
24
+if ($building_sort = sys_get_param_id('sort_elements')) {
25
+  if (!empty($lang['player_option_building_sort'][$building_sort])) {
26 26
     classSupernova::$user_options[array(PLAYER_OPTION_BUILDING_SORT, $mode)] = $building_sort;
27 27
     classSupernova::$user_options[array(PLAYER_OPTION_BUILDING_SORT_INVERSE, $mode)] = sys_get_param_id('sort_elements_inverse', 0);
28 28
   }
Please login to merge, or discard this patch.
time_probe.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -13,11 +13,11 @@  discard block
 block discarded – undo
13 13
 $time_server = $time_local  - $time_diff
14 14
 */
15 15
 
16
-if($font_size = sys_get_param_str('font_size')) {
17
-  if(strpos($font_size, '%') !== false) {
16
+if ($font_size = sys_get_param_str('font_size')) {
17
+  if (strpos($font_size, '%') !== false) {
18 18
     // Размер шрифта в процентах
19 19
     $font_size = min(max(floatval($font_size), FONT_SIZE_PERCENT_MIN), FONT_SIZE_PERCENT_MAX) . '%';
20
-  } elseif(strpos($font_size, 'px') !== false) {
20
+  } elseif (strpos($font_size, 'px') !== false) {
21 21
     // Размер шрифта в пикселях
22 22
     $font_size = min(max(floatval($font_size), FONT_SIZE_PIXELS_MIN), FONT_SIZE_PIXELS_MAX) . 'px';
23 23
   } else {
@@ -29,7 +29,7 @@  discard block
 block discarded – undo
29 29
   classSupernova::$user_options[PLAYER_OPTION_BASE_FONT_SIZE] = $font_size;
30 30
 } else {
31 31
   $user_time_diff = playerTimeDiff::user_time_diff_get();
32
-  if($user_time_diff[PLAYER_OPTION_TIME_DIFF_FORCED]) {
32
+  if ($user_time_diff[PLAYER_OPTION_TIME_DIFF_FORCED]) {
33 33
     $time_diff = intval($user_time_diff[PLAYER_OPTION_TIME_DIFF]);
34 34
   } else {
35 35
     $user_time_diff = playerTimeDiff::user_time_diff_probe();
Please login to merge, or discard this patch.
stat.php 2 patches
Indentation   +30 added lines, -30 removed lines patch added patch discarded remove patch
@@ -50,52 +50,52 @@
 block discarded – undo
50 50
 stat_tpl_assign($template, $who, 'subject', $subject_list, $sn_group_stat_common);
51 51
 
52 52
 $stat_types = array(
53
-   STAT_TOTAL => array(
54
-     'type' => 'total',
55
-   ),
53
+    STAT_TOTAL => array(
54
+      'type' => 'total',
55
+    ),
56 56
 
57
-   STAT_FLEET => array(
58
-     'type' => 'fleet',
59
-   ),
57
+    STAT_FLEET => array(
58
+      'type' => 'fleet',
59
+    ),
60 60
 
61
-   STAT_TECH => array(
62
-     'type' => 'tech',
63
-   ),
61
+    STAT_TECH => array(
62
+      'type' => 'tech',
63
+    ),
64 64
 
65
-   STAT_BUILDING => array(
66
-     'type' => 'build',
67
-   ),
65
+    STAT_BUILDING => array(
66
+      'type' => 'build',
67
+    ),
68 68
 
69
-   STAT_DEFENSE => array(
70
-     'type' => 'defs',
71
-   ),
69
+    STAT_DEFENSE => array(
70
+      'type' => 'defs',
71
+    ),
72 72
 
73
-   STAT_RESOURCE => array(
74
-     'type' => 'res',
75
-   ),
73
+    STAT_RESOURCE => array(
74
+      'type' => 'res',
75
+    ),
76 76
 
77
-   STAT_RAID_TOTAL => array(
78
-     'type' => 'raids',
79
-   ),
77
+    STAT_RAID_TOTAL => array(
78
+      'type' => 'raids',
79
+    ),
80 80
 
81
-   STAT_RAID_WON => array(
82
-     'type' => 'raidswin',
83
-   ),
81
+    STAT_RAID_WON => array(
82
+      'type' => 'raidswin',
83
+    ),
84 84
 
85
-   STAT_RAID_LOST => array(
86
-     'type' => 'raidsloose',
87
-   ),
85
+    STAT_RAID_LOST => array(
86
+      'type' => 'raidsloose',
87
+    ),
88 88
 
89 89
   STAT_LVL_BUILDING => array(
90
-     'type' => 'lvl_minier',
90
+      'type' => 'lvl_minier',
91 91
   ),
92 92
 
93 93
   STAT_LVL_TECH => array(
94
-     'type' => 'player_rpg_tech_level',
94
+      'type' => 'player_rpg_tech_level',
95 95
   ),
96 96
 
97 97
   STAT_LVL_RAID => array(
98
-     'type' => 'lvl_raid',
98
+      'type' => 'lvl_raid',
99 99
   ),
100 100
 );
101 101
 stat_tpl_assign($template, $type, 'type', $stat_types, $sn_group_stat_common);
Please login to merge, or discard this patch.
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -11,8 +11,8 @@  discard block
 block discarded – undo
11 11
   global $who, $lang;
12 12
 
13 13
   // $sn_group_stat_common = sn_get_groups('STAT_COMMON');
14
-  foreach($array as $key => $value) {
15
-    if($array_name == 'type' && $who == 2 && !in_array($key, $sn_group_stat_common)) {
14
+  foreach ($array as $key => $value) {
15
+    if ($array_name == 'type' && $who == 2 && !in_array($key, $sn_group_stat_common)) {
16 16
       continue;
17 17
     }
18 18
 
@@ -44,7 +44,7 @@  discard block
 block discarded – undo
44 44
 $subject_list = array(
45 45
   1 => array('header' => $lang['stat_player']),
46 46
 );
47
-if(!$source) {
47
+if (!$source) {
48 48
   $subject_list[2] = array('header' => $lang['stat_allys']);
49 49
 }
50 50
 stat_tpl_assign($template, $who, 'subject', $subject_list, $sn_group_stat_common);
@@ -111,7 +111,7 @@  discard block
 block discarded – undo
111 111
 
112 112
 $page_count = floor($record_count / 100);
113 113
 $pages = array();
114
-for($i = 0; $i <= $page_count; $i++) {
114
+for ($i = 0; $i <= $page_count; $i++) {
115 115
   $first_element = $i * 100 + 1;
116 116
   $last_element = $first_element + 99;
117 117
   $pages[$first_element] = array(
@@ -130,7 +130,7 @@  discard block
 block discarded – undo
130 130
     'POINTS' => HelperString::numberFloorAndFormat($row['points']),
131 131
   );
132 132
 
133
-  if($who == 1) {
133
+  if ($who == 1) {
134 134
     $row_stat['ALLY_NAME'] = $row['ally_name'];
135 135
     $row_stat['ALLY_ID'] = $row['ally_id'];
136 136
     empty($row['username']) ? $row['username'] = $row['name'] : false;
Please login to merge, or discard this patch.
records.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -11,7 +11,7 @@  discard block
 block discarded – undo
11 11
 
12 12
 include('common.' . substr(strrchr(__FILE__, '.'), 1));
13 13
 
14
-if(HIDE_BUILDING_RECORDS)
14
+if (HIDE_BUILDING_RECORDS)
15 15
 {
16 16
   return;
17 17
 }
@@ -34,7 +34,7 @@  discard block
 block discarded – undo
34 34
 
35 35
 $user_name_cache = array();
36 36
 
37
-foreach($show_groups as $unit_group_id => $mode)
37
+foreach ($show_groups as $unit_group_id => $mode)
38 38
 {
39 39
   $template->assign_block_vars('records', array(
40 40
     'UNIT' => $lang['tech'][$unit_group_id],
@@ -43,15 +43,15 @@  discard block
 block discarded – undo
43 43
   ));
44 44
   $unit_group = get_unit_param('techtree', $unit_group_id); // TODO - REWRITE!!!!
45 45
 
46
-  foreach($unit_group as $unit_id)
46
+  foreach ($unit_group as $unit_id)
47 47
   {
48 48
     $unit_name = &$lang['tech'][$unit_id];
49
-    if($unit_name)
49
+    if ($unit_name)
50 50
     {
51 51
       // TODO - ISUNITSTACKABLE!
52 52
       $data_row = $unit_group_id == UNIT_SHIPS || $unit_group_id == UNIT_DEFENCE ? db_unit_records_sum($unit_id, $user_skip_list_unit) : db_unit_records_plain($unit_id, $user_skip_list_unit);
53 53
 
54
-      if($data_row)
54
+      if ($data_row)
55 55
       {
56 56
         $template->assign_block_vars('records', array(
57 57
           'UNIT' => $unit_name,
Please login to merge, or discard this patch.
language/en/system.mo.php 2 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -27,7 +27,7 @@
 block discarded – undo
27 27
 */
28 28
 
29 29
 if (!defined('INSIDE')) {
30
-	die('Hack attempt!');
30
+  die('Hack attempt!');
31 31
 }
32 32
 
33 33
 global $config;
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -951,7 +951,7 @@
 block discarded – undo
951 951
     REGISTER_ERROR_USERNAME_WRONG => 'Wrong player name',
952 952
     REGISTER_ERROR_ACCOUNT_NAME_EXISTS => 'Account name already registered',
953 953
     REGISTER_ERROR_PASSWORD_INSECURE => 'Insecure or wrong password. Password should be at least ' . PASSWORD_LENGTH_MIN . ' characters long and cannot start or end with spaces',
954
-    REGISTER_ERROR_USERNAME_SHORT => 'Слишком короткое имя. Имя должно состоять минимум из ' . LOGIN_LENGTH_MIN. ' символов',
954
+    REGISTER_ERROR_USERNAME_SHORT => 'Слишком короткое имя. Имя должно состоять минимум из ' . LOGIN_LENGTH_MIN . ' символов',
955 955
     REGISTER_ERROR_PASSWORD_DIFFERENT => 'Password does not match confirmation password',
956 956
     REGISTER_ERROR_EMAIL_EMPTY => 'Е-Мейл не может быть пустым',
957 957
     REGISTER_ERROR_EMAIL_WRONG => 'Введенный Е-Мейл не является адресом электронной почты',
Please login to merge, or discard this patch.
language/en/language.mo.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -28,7 +28,7 @@
 block discarded – undo
28 28
 */
29 29
 if (!defined('INSIDE')) 
30 30
 {
31
-	die('Hack attempt!');
31
+  die('Hack attempt!');
32 32
 }
33 33
 
34 34
 $lang_info = array(
Please login to merge, or discard this patch.
language/ru/system.mo.php 2 patches
Indentation   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -689,15 +689,15 @@  discard block
 block discarded – undo
689 689
   ),
690 690
 
691 691
   'months' => array(
692
-     1 =>'января',
693
-     2 =>'февраля',
694
-     3 =>'марта',
695
-     4 =>'апреля',
696
-     5 =>'мая',
697
-     6 =>'июня',
698
-     7 =>'июля',
699
-     8 =>'августа',
700
-     9 =>'сентября',
692
+      1 =>'января',
693
+      2 =>'февраля',
694
+      3 =>'марта',
695
+      4 =>'апреля',
696
+      5 =>'мая',
697
+      6 =>'июня',
698
+      7 =>'июля',
699
+      8 =>'августа',
700
+      9 =>'сентября',
701 701
     10 =>'октября',
702 702
     11 =>'ноября',
703 703
     12 =>'декабря'
@@ -993,7 +993,7 @@  discard block
 block discarded – undo
993 993
     PASSWORD_RESTORE_ERROR_ACCOUNT_NOT_EXISTS => 'Внутренняя ошибка - при смене пароля аккаунт не найден! Сообщите об этой ошибке Администрации!',
994 994
     AUTH_PASSWORD_RESET_INSIDE_ERROR_NO_ACCOUNT_FOR_CONFIRMATION => 'ВНУТРЕННЯЯ ОШИБКА! Нет аккаунтов для сброса пароля при корректном коде подтверждения! Пожалуйста, сообщите об этой ошибке Администрации Вселенной!',
995 995
     LOGIN_ERROR_NO_ACCOUNT_FOR_COOKIE_SET => 'ВНУТРЕННЯЯ ОШИБКА! СООБЩИТЕ АДМИНИСТРАЦИИ! Не установлен аккаунт при cookie_set()! Пожалуйста, сообщите об этой ошибке Администрации Вселенной!',
996
- ),
996
+  ),
997 997
 
998 998
   'log_reg_email_title' => "Ваша регистрация на сервере %1\$s игры СуперНова",
999 999
   'log_reg_email_text' => "Подтверждение регистрации для %3\$s\r\n\r\n
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -961,7 +961,7 @@
 block discarded – undo
961 961
     REGISTER_ERROR_USERNAME_WRONG => 'Некорректное имя игрока',
962 962
     REGISTER_ERROR_ACCOUNT_NAME_EXISTS => 'Имя учётной записи уже занято. Попробуйте войти с этим именем и вашим паролем или воспользоваться сбросом пароля',
963 963
     REGISTER_ERROR_PASSWORD_INSECURE => 'Неправильный пароль. Пароль должен состоять минимум из ' . PASSWORD_LENGTH_MIN . ' символов',
964
-    REGISTER_ERROR_USERNAME_SHORT => 'Слишком короткое имя. Имя должно состоять минимум из ' . LOGIN_LENGTH_MIN. ' символов',
964
+    REGISTER_ERROR_USERNAME_SHORT => 'Слишком короткое имя. Имя должно состоять минимум из ' . LOGIN_LENGTH_MIN . ' символов',
965 965
     REGISTER_ERROR_PASSWORD_DIFFERENT => 'Пароль и проверочный пароль не совпадают. Проверьте правильность ввода',
966 966
     REGISTER_ERROR_EMAIL_EMPTY => 'Е-Мейл не может быть пустым',
967 967
     REGISTER_ERROR_EMAIL_WRONG => 'Введенный Е-Мейл не является допустимым адресом электронной почты. Проверьте написание Е-Мейла или используйте другой адрес почтового ящика',
Please login to merge, or discard this patch.