Completed
Branch trunk (230097)
by SuperNova.WS
32:07
created
resources.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -46,11 +46,11 @@  discard block
 block discarded – undo
46 46
   ));
47 47
 };
48 48
 
49
-$ValidList['percent'] = array (  0,  10,  20,  30,  40,  50,  60,  70,  80,  90, 100 );
49
+$ValidList['percent'] = array(0, 10, 20, 30, 40, 50, 60, 70, 80, 90, 100);
50 50
 $template = gettemplate('resources', true);
51 51
 
52 52
 $transmutation_result = sn_sys_planet_core_transmute($user, $planetrow);
53
-if(!empty($transmutation_result))
53
+if (!empty($transmutation_result))
54 54
 {
55 55
   $template->assign_block_vars('result', $transmutation_result); // array('STATUS' => $transmutation_result['STATUS'], 'MESSAGE' => $transmutation_result['MESSAGE']));
56 56
 }
@@ -59,20 +59,20 @@  discard block
 block discarded – undo
59 59
 $production = $_POST['production'];
60 60
 //$SubQry     = '';
61 61
 $SubQry     = array();
62
-if(is_array($production)) {
63
-  foreach($production as $prod_id => $percent) {
64
-    if($percent > 100 || $percent < 0) {
62
+if (is_array($production)) {
63
+  foreach ($production as $prod_id => $percent) {
64
+    if ($percent > 100 || $percent < 0) {
65 65
       $debug->warning('Supplying wrong production percent (less then 0 or greater then 100)', 'Hack attempt', 302, array('base_dump' => true));
66 66
       die();
67 67
     }
68 68
 
69 69
     $prod_id = intval($prod_id);
70
-    if(in_array($prod_id, $sn_group_factories) && get_unit_param($prod_id, P_MINING_IS_MANAGED)) {
70
+    if (in_array($prod_id, $sn_group_factories) && get_unit_param($prod_id, P_MINING_IS_MANAGED)) {
71 71
       $field_name              = pname_factory_production_field_name($prod_id);
72 72
       $percent                 = floor($percent / 10);
73 73
       $planetrow[$field_name]  = $percent;
74 74
       //$SubQry                 .= "`{$field_name}` = '{$percent}',";
75
-      $SubQry[]                 = "`{$field_name}` = '{$percent}'";
75
+      $SubQry[] = "`{$field_name}` = '{$percent}'";
76 76
     } else {
77 77
       $debug->warning('Supplying wrong ID in production array - attempt to change some field - ID' . $prod_id, 'Resource Page', 301);
78 78
       continue;
@@ -108,9 +108,9 @@  discard block
 block discarded – undo
108 108
   'ENERGY_TYPE'    => pretty_number($caps_real['production'][RES_ENERGY][0], true, true),
109 109
 ));
110 110
 
111
-foreach($sn_group_factories as $unit_id)
111
+foreach ($sn_group_factories as $unit_id)
112 112
 {
113
-  if(mrc_get_level($user, $planetrow, $unit_id) > 0 && get_unit_param($unit_id))
113
+  if (mrc_get_level($user, $planetrow, $unit_id) > 0 && get_unit_param($unit_id))
114 114
   {
115 115
     $level_plain = mrc_get_level($user, $planetrow, $unit_id, false, true);
116 116
     $template->assign_block_vars('production', array(
Please login to merge, or discard this patch.
admin/adm_user_analyze.php 1 patch
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -12,20 +12,20 @@  discard block
 block discarded – undo
12 12
 
13 13
 require('../common.' . substr(strrchr(__FILE__, '.'), 1));
14 14
 
15
-if($user['authlevel'] < 3) {
15
+if ($user['authlevel'] < 3) {
16 16
   AdminMessage($lang['adm_err_denied']);
17 17
 }
18 18
 
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.
admin/banned.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -27,9 +27,9 @@  discard block
 block discarded – undo
27 27
 $action = sys_get_param_str('action');
28 28
 
29 29
 $player_banned_row = db_user_by_username($name_unsafe);
30
-if($mode == 'banit' && $action)
30
+if ($mode == 'banit' && $action)
31 31
 {
32
-  if($player_banned_row)
32
+  if ($player_banned_row)
33 33
   {
34 34
     $reas = $_POST['why'];
35 35
     $days = $_POST['days'];
@@ -48,7 +48,7 @@  discard block
 block discarded – undo
48 48
 
49 49
     $DoneMessage = "{$lang['adm_bn_thpl']} {$name_output} {$lang['adm_bn_isbn']}";
50 50
 
51
-    if($is_vacation)
51
+    if ($is_vacation)
52 52
     {
53 53
       $DoneMessage .= $lang['adm_bn_vctn'];
54 54
     }
@@ -62,7 +62,7 @@  discard block
 block discarded – undo
62 62
 
63 63
   AdminMessage($DoneMessage, $lang['adm_ban_title']);
64 64
 }
65
-elseif($mode == 'unbanit' && $action)
65
+elseif ($mode == 'unbanit' && $action)
66 66
 {
67 67
   sys_admin_player_ban_unset($user, $player_banned_row, ($reason = sys_get_param_str('why')) ? $reason : $lang['sys_unbanned']);
68 68
 
Please login to merge, or discard this patch.
admin/add_moon.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -14,14 +14,14 @@
 block discarded – undo
14 14
 require('../common.' . substr(strrchr(__FILE__, '.'), 1));
15 15
 
16 16
 // if ($user['authlevel'] < 2)
17
-if($user['authlevel'] < 3)
17
+if ($user['authlevel'] < 3)
18 18
 {
19 19
   AdminMessage($lang['adm_err_denied']);
20 20
 }
21 21
 
22 22
 $template = gettemplate("admin/add_moon", true);
23 23
 
24
-if(sys_get_param_str('mode') == 'addit')
24
+if (sys_get_param_str('mode') == 'addit')
25 25
 {
26 26
   $PlanetID = sys_get_param_id('user');
27 27
   $MoonName = sys_get_param_str('name');
Please login to merge, or discard this patch.
admin/adm_planet_list.php 1 patch
Spacing   +5 added lines, -6 removed lines patch added patch discarded remove patch
@@ -1,7 +1,7 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 
3
-define('INSIDE'  , true);
4
-define('INSTALL' , false);
3
+define('INSIDE', true);
4
+define('INSTALL', false);
5 5
 define('IN_ADMIN', true);
6 6
 
7 7
 require('../common.' . substr(strrchr(__FILE__, '.'), 1));
@@ -9,12 +9,12 @@  discard block
 block discarded – undo
9 9
 global $config, $lang, $user;
10 10
 
11 11
 // if($user['authlevel'] < 1)
12
-if($user['authlevel'] < 3) {
12
+if ($user['authlevel'] < 3) {
13 13
   AdminMessage($lang['adm_err_denied']);
14 14
 }
15 15
 
16 16
 $planet_active = sys_get_param_int('planet_active');
17
-if(!$planet_active) {
17
+if (!$planet_active) {
18 18
   $planet_type = sys_get_param_int('planet_type', 1);
19 19
   $planet_type = $planet_type == 3 ? 3 : 1;
20 20
 } else {
@@ -43,8 +43,7 @@  discard block
 block discarded – undo
43 43
 
44 44
 $page_title = 
45 45
   $lang['adm_planet_list_title'] . ': ' . 
46
-  ($planet_active ? $lang['adm_planet_active'] :
47
-    ($planet_type ? ($planet_type == 3 ? $lang['sys_moons'] : $lang['sys_planets']) : '')
46
+  ($planet_active ? $lang['adm_planet_active'] : ($planet_type ? ($planet_type == 3 ? $lang['sys_moons'] : $lang['sys_planets']) : '')
48 47
   );
49 48
 $template->assign_vars(array(
50 49
   'PAGE_TITLE' => $page_title,
Please login to merge, or discard this patch.
admin/adm_log_main.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -19,26 +19,26 @@  discard block
 block discarded – undo
19 19
   AdminMessage($lang['adm_err_denied']);
20 20
 }
21 21
 
22
-if($delete = sys_get_param_id('delete'))
22
+if ($delete = sys_get_param_id('delete'))
23 23
 {
24 24
   doquery("DELETE FROM `{{logs}}` WHERE `log_id` = {$delete} LIMIT 1;");
25 25
 }
26
-elseif(sys_get_param_str('delete_update_info'))
26
+elseif (sys_get_param_str('delete_update_info'))
27 27
 {
28 28
   doquery("DELETE FROM `{{logs}}` WHERE `log_code` in (103, 180, 191);");
29 29
 }
30
-elseif(sys_get_param_str('deleteall') == 'yes')
30
+elseif (sys_get_param_str('deleteall') == 'yes')
31 31
 {
32 32
 //  doquery("TRUNCATE TABLE `{{logs}}`");
33 33
 }
34 34
 
35
-if($detail = sys_get_param_id('detail'))
35
+if ($detail = sys_get_param_id('detail'))
36 36
 {
37 37
   $template = gettemplate('admin/adm_log_main_detail', true);
38 38
 
39 39
   $errorInfo = doquery("SELECT * FROM `{{logs}}` WHERE `log_id` = {$detail} LIMIT 1;", true);
40 40
   $error_dump = unserialize($errorInfo['log_dump']);
41
-  if(is_array($error_dump))
41
+  if (is_array($error_dump))
42 42
   {
43 43
     foreach ($error_dump as $key => $value)
44 44
     {
@@ -58,11 +58,11 @@  discard block
 block discarded – undo
58 58
 
59 59
   $i = 0;
60 60
   $query = doquery("SELECT * FROM `{{logs}}` ORDER BY log_id DESC LIMIT 100;");
61
-  while($u = db_fetch($query))
61
+  while ($u = db_fetch($query))
62 62
   {
63 63
     $i++;
64 64
     $v = array();
65
-    foreach($u as $key => $value)
65
+    foreach ($u as $key => $value)
66 66
     {
67 67
       $v[strtoupper($key)] = $value;
68 68
     }
Please login to merge, or discard this patch.
admin/adm_payment.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -14,18 +14,18 @@  discard block
 block discarded – undo
14 14
 
15 15
 require('../common.' . substr(strrchr(__FILE__, '.'), 1));
16 16
 
17
-if($user['authlevel'] < 3)
17
+if ($user['authlevel'] < 3)
18 18
 {
19 19
   AdminMessage($lang['adm_err_denied']);
20 20
 }
21 21
 
22
-$template  = gettemplate('admin/adm_payment', true);
22
+$template = gettemplate('admin/adm_payment', true);
23 23
 
24 24
 $payer_list = array(
25 25
   -1 => $lang['adm_pay_filter_all'],
26 26
 );
27 27
 $query = doquery("SELECT payment_user_id, payment_user_name FROM {{payment}} GROUP BY payment_user_id ORDER BY payment_user_name");
28
-while($row = db_fetch($query)) {
28
+while ($row = db_fetch($query)) {
29 29
   $payer_list[$row['payment_user_id']] = '[' . $row['payment_user_id'] . '] ' . $row['payment_user_name'];
30 30
 }
31 31
 tpl_assign_select($template, 'payer', $payer_list);
@@ -34,7 +34,7 @@  discard block
 block discarded – undo
34 34
   '' => $lang['adm_pay_filter_all'],
35 35
 );
36 36
 $query = doquery("SELECT distinct payment_module_name FROM {{payment}} ORDER BY payment_module_name");
37
-while($row = db_fetch($query)) {
37
+while ($row = db_fetch($query)) {
38 38
   $module_list[$row['payment_module_name']] = $row['payment_module_name'];
39 39
 }
40 40
 tpl_assign_select($template, 'module', $module_list);
@@ -54,9 +54,9 @@  discard block
 block discarded – undo
54 54
 ($flt_module ? "AND payment_module_name = '{$flt_module}' " : '') .
55 55
 "ORDER BY payment_id desc");
56 56
 
57
-while($row = db_fetch($query)) {
57
+while ($row = db_fetch($query)) {
58 58
   $row2 = array();
59
-  foreach($row as $key => $value) {
59
+  foreach ($row as $key => $value) {
60 60
     $row2[strtoupper($key)] = $value;
61 61
   }
62 62
   $template->assign_block_vars('payment', $row2);
Please login to merge, or discard this patch.
admin/adm_message_list.php 1 patch
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -8,13 +8,13 @@  discard block
 block discarded – undo
8 8
  *
9 9
  */
10 10
 
11
-define('INSIDE'  , true);
12
-define('INSTALL' , false);
11
+define('INSIDE', true);
12
+define('INSTALL', false);
13 13
 define('IN_ADMIN', true);
14 14
 
15 15
 require('../common.' . substr(strrchr(__FILE__, '.'), 1));
16 16
 
17
-if($user['authlevel'] < 3)
17
+if ($user['authlevel'] < 3)
18 18
 {
19 19
   AdminMessage($lang['adm_err_denied']);
20 20
 }
@@ -29,9 +29,9 @@  discard block
 block discarded – undo
29 29
   ),
30 30
 );
31 31
 $template->assign_block_vars('int_type_selected', $allowed_types[-1]);
32
-foreach($sn_message_class_list as $key => $value)
32
+foreach ($sn_message_class_list as $key => $value)
33 33
 {
34
-  if($key == MSG_TYPE_NEW || $key == MSG_TYPE_OUTBOX)
34
+  if ($key == MSG_TYPE_NEW || $key == MSG_TYPE_OUTBOX)
35 35
   {
36 36
     continue;
37 37
   }
@@ -44,19 +44,19 @@  discard block
 block discarded – undo
44 44
 
45 45
 
46 46
 $message_delete = sys_get_param_id('msg_del');
47
-if(sys_get_param('str_delete_selected') && is_array($message_delete = sys_get_param('selected')) && !empty($message_delete))
47
+if (sys_get_param('str_delete_selected') && is_array($message_delete = sys_get_param('selected')) && !empty($message_delete))
48 48
 {
49 49
   $message_delete = implode(', ', $message_delete);
50 50
 }
51 51
 
52
-if($message_delete)
52
+if ($message_delete)
53 53
 {
54 54
   doquery("DELETE FROM {{messages}} WHERE `message_id` in ({$message_delete});");
55 55
   $template->assign_block_vars('result', array('MESSAGE' => sprintf($lang['mlst_messages_deleted'], $message_delete)));
56 56
 }
57 57
 
58 58
 
59
-if(sys_get_param('str_delete_date') && checkdate($month = sys_get_param_id('delete_month'), $day = sys_get_param_id('delete_day'), $year = sys_get_param_id('delete_year')))
59
+if (sys_get_param('str_delete_date') && checkdate($month = sys_get_param_id('delete_month'), $day = sys_get_param_id('delete_day'), $year = sys_get_param_id('delete_year')))
60 60
 {
61 61
   $delete_date = "{$year}-{$month}-{$day}";
62 62
   doquery("DELETE FROM {{messages}} WHERE message_time <= UNIX_TIMESTAMP('{$delete_date}')" . ($int_type_selected >= 0 ? " AND `message_type` = {$int_type_selected}" : ''));
@@ -69,16 +69,16 @@  discard block
 block discarded – undo
69 69
 
70 70
 $int_page_current = min(sys_get_param_id('int_page_current', 1), $page_max);
71 71
 
72
-if(sys_get_param('page_prev') && $int_page_current > 1)
72
+if (sys_get_param('page_prev') && $int_page_current > 1)
73 73
 {
74 74
   $int_page_current--;
75 75
 }
76
-elseif(sys_get_param('page_next') && $int_page_current < $page_max)
76
+elseif (sys_get_param('page_next') && $int_page_current < $page_max)
77 77
 {
78 78
   $int_page_current++;
79 79
 }
80 80
 
81
-for($i = 1; $i <= $page_max; $i++)
81
+for ($i = 1; $i <= $page_max; $i++)
82 82
 {
83 83
   $template->assign_block_vars('page', array('NUMBER' => $i));
84 84
 }
@@ -148,7 +148,7 @@  discard block
 block discarded – undo
148 148
 $StartRec = ($int_page_current - 1) * 25;
149 149
 
150 150
 $Messages = db_message_list_admin_by_type($int_type_selected, $StartRec);
151
-while($row = db_fetch($Messages))
151
+while ($row = db_fetch($Messages))
152 152
 {
153 153
   $row['FROM'] = htmlentities($row['FROM'], ENT_COMPAT, 'UTF-8');
154 154
   $row['OWNER_NAME'] = htmlentities($row['OWNER_NAME'], ENT_COMPAT, 'UTF-8');
Please login to merge, or discard this patch.
admin/adm_quest.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -7,13 +7,13 @@
 block discarded – undo
7 7
  *
8 8
  */
9 9
 
10
-define('INSIDE'  , true);
11
-define('INSTALL' , false);
12
-define('IN_ADMIN'  , true);
10
+define('INSIDE', true);
11
+define('INSTALL', false);
12
+define('IN_ADMIN', true);
13 13
 
14 14
 require('../common.' . substr(strrchr(__FILE__, '.'), 1));
15 15
 
16
-if($user['authlevel'] < 2)
16
+if ($user['authlevel'] < 2)
17 17
 {
18 18
   AdminMessage($lang['adm_err_denied']);
19 19
 }
Please login to merge, or discard this patch.