Passed
Branch work-fleets (5a7baa)
by SuperNova.WS
06:08
created
includes/functions/int_banner_create.php 1 patch
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -24,8 +24,8 @@  discard block
 block discarded – undo
24 24
       $img_name = classSupernova::$config->int_userbar_background;
25 25
     break;
26 26
   }
27
-  $size = getimagesize(SN_ROOT_PHYSICAL . $img_name);
28
-  $im = imagecreatefrompng(SN_ROOT_PHYSICAL . $img_name);
27
+  $size = getimagesize(SN_ROOT_PHYSICAL.$img_name);
28
+  $im = imagecreatefrompng(SN_ROOT_PHYSICAL.$img_name);
29 29
   $image = imagecreatetruecolor($size[0], $size[1]);
30 30
   imagecopy($image, $im, 0, 0, 0, 0, $size[0], $size[1]);
31 31
   imagedestroy($im);
@@ -37,10 +37,10 @@  discard block
 block discarded – undo
37 37
   $txt_color2 = imagecolorallocatealpha($image, 255, 255, 255, 40);
38 38
 
39 39
   $fonts = array(
40
-    'userbar'  => SN_ROOT_PHYSICAL . "design/fonts/" . classSupernova::$config->int_userbar_font,
41
-    'universe' => SN_ROOT_PHYSICAL . "design/fonts/" . classSupernova::$config->int_banner_fontUniverse,
42
-    'raids'    => SN_ROOT_PHYSICAL . "design/fonts/" . classSupernova::$config->int_banner_fontRaids,
43
-    'info'     => SN_ROOT_PHYSICAL . "design/fonts/" . classSupernova::$config->int_banner_fontInfo,
40
+    'userbar'  => SN_ROOT_PHYSICAL."design/fonts/".classSupernova::$config->int_userbar_font,
41
+    'universe' => SN_ROOT_PHYSICAL."design/fonts/".classSupernova::$config->int_banner_fontUniverse,
42
+    'raids'    => SN_ROOT_PHYSICAL."design/fonts/".classSupernova::$config->int_banner_fontRaids,
43
+    'info'     => SN_ROOT_PHYSICAL."design/fonts/".classSupernova::$config->int_banner_fontInfo,
44 44
   );
45 45
 
46 46
   if ($id) {
@@ -52,8 +52,8 @@  discard block
 block discarded – undo
52 52
     $b_user = $user['username'];
53 53
     $b_ally = $user['ally_name'];
54 54
     $b_planet = $planet_row['name'];
55
-    $b_xyz = "[" . $planet_row['galaxy'] . ":" . $planet_row['system'] . ":" . $planet_row['planet'] . "]";
56
-    $b_lvl = ($user['total_rank'] ? $user['total_rank'] : classSupernova::$config->users_amount) . "/" . classSupernova::$config->users_amount;
55
+    $b_xyz = "[".$planet_row['galaxy'].":".$planet_row['system'].":".$planet_row['planet']."]";
56
+    $b_lvl = ($user['total_rank'] ? $user['total_rank'] : classSupernova::$config->users_amount)."/".classSupernova::$config->users_amount;
57 57
   } else {
58 58
     $b_user = classLocale::$lang['ov_banner_empty_id'];
59 59
     $b_lvl = '';
@@ -88,11 +88,11 @@  discard block
 block discarded – undo
88 88
         imagettftext($image, 9, 0, 410 - $is[2], 35, $txt_color, $fonts['info'], $b_ally);
89 89
 
90 90
         // Player b_planet
91
-        imagettftext($image, 6, 0, 8, 10, $txt_shadow2, $fonts['raids'], $b_planet . " " . $b_xyz);
92
-        imagettftext($image, 6, 0, 6, 9, $txt_color2, $fonts['raids'], $b_planet . " " . $b_xyz);
91
+        imagettftext($image, 6, 0, 8, 10, $txt_shadow2, $fonts['raids'], $b_planet." ".$b_xyz);
92
+        imagettftext($image, 6, 0, 6, 9, $txt_color2, $fonts['raids'], $b_planet." ".$b_xyz);
93 93
 
94 94
         //StatPoint
95
-        $b_points = classLocale::$lang['ov_points'] . ": " . pretty_number(!empty($user['total_points']) ? $user['total_points'] : 0);
95
+        $b_points = classLocale::$lang['ov_points'].": ".pretty_number(!empty($user['total_points']) ? $user['total_points'] : 0);
96 96
         $is = imagettfbbox(8, 0, $fonts['info'], $b_points);
97 97
         imagettftext($image, 8, 0, 412 - $is[2], 11, $txt_shadow, $fonts['info'], $b_points);
98 98
         imagettftext($image, 8, 0, 410 - $is[2], 9, $txt_color, $fonts['info'], $b_points);
@@ -100,21 +100,21 @@  discard block
 block discarded – undo
100 100
         //Raids Total
101 101
         imagettftext($image, 6, 0, 8, 37, $txt_shadow2, $fonts['raids'], classLocale::$lang['NumberOfRaids']);
102 102
         imagettftext($image, 6, 0, 6, 35, $txt_color2, $fonts['raids'], classLocale::$lang['NumberOfRaids']);
103
-        $b_points = ": " . pretty_number(!empty($user['raids']) ? $user['raids'] : 0);
103
+        $b_points = ": ".pretty_number(!empty($user['raids']) ? $user['raids'] : 0);
104 104
         imagettftext($image, 6, 0, 61, 37, $txt_shadow2, $fonts['raids'], $b_points);
105 105
         imagettftext($image, 6, 0, 59, 35, $txt_color2, $fonts['raids'], $b_points);
106 106
 
107 107
         //Raids Won
108 108
         imagettftext($image, 6, 0, 8, 47, $txt_shadow2, $fonts['raids'], classLocale::$lang['RaidsWin']);
109 109
         imagettftext($image, 6, 0, 6, 45, $txt_color2, $fonts['raids'], classLocale::$lang['RaidsWin']);
110
-        $b_points = ": " . pretty_number(!empty($user['raidswin']) ? $user['raidswin'] : 0);
110
+        $b_points = ": ".pretty_number(!empty($user['raidswin']) ? $user['raidswin'] : 0);
111 111
         imagettftext($image, 6, 0, 61, 47, $txt_shadow2, $fonts['raids'], $b_points);
112 112
         imagettftext($image, 6, 0, 59, 45, $txt_color2, $fonts['raids'], $b_points);
113 113
 
114 114
         //Raids Lost
115 115
         imagettftext($image, 6, 0, 8, 57, $txt_shadow2, $fonts['raids'], classLocale::$lang['RaidsLoose']);
116 116
         imagettftext($image, 6, 0, 6, 55, $txt_color2, $fonts['raids'], classLocale::$lang['RaidsLoose']);
117
-        $b_points = ": " . pretty_number(!empty($user['raidsloose']) ? $user['raidsloose'] : 0);
117
+        $b_points = ": ".pretty_number(!empty($user['raidsloose']) ? $user['raidsloose'] : 0);
118 118
         imagettftext($image, 6, 0, 61, 57, $txt_shadow2, $fonts['raids'], $b_points);
119 119
         imagettftext($image, 6, 0, 59, 55, $txt_color2, $fonts['raids'], $b_points);
120 120
       }
Please login to merge, or discard this patch.
includes/functions/qst_quest.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -179,7 +179,7 @@  discard block
 block discarded – undo
179 179
     $template->assign_vars($quest_templatized);
180 180
     if (!empty($quest_templatized['quest_rewards_list'])) {
181 181
       foreach ($quest_templatized['quest_rewards_list'] as $quest_reward) {
182
-        $template->assign_block_vars(($block_name ? $block_name . '.' : '') . 'quest_rewards_list', $quest_reward);
182
+        $template->assign_block_vars(($block_name ? $block_name.'.' : '').'quest_rewards_list', $quest_reward);
183 183
       }
184 184
     }
185 185
   }
@@ -249,10 +249,10 @@  discard block
 block discarded – undo
249 249
 
250 250
         $comment_reward = array();
251 251
         foreach ($reward_list as $unit_id => $unit_amount) {
252
-          $comment_reward[] = $unit_amount . ' ' . classLocale::$lang['tech'][$unit_id];
252
+          $comment_reward[] = $unit_amount.' '.classLocale::$lang['tech'][$unit_id];
253 253
           $total_rewards[$user_id][$planet_id][$unit_id] += $unit_amount;
254 254
         }
255
-        $comment .= " {$classLocale['qst_msg_your_reward']} " . implode(',', $comment_reward);
255
+        $comment .= " {$classLocale['qst_msg_your_reward']} ".implode(',', $comment_reward);
256 256
 
257 257
         msg_send_simple_message($user['id'], 0, SN_TIME_NOW, MSG_TYPE_ADMIN, classLocale::$lang['msg_from_admin'], classLocale::$lang['qst_msg_complete_subject'], $comment);
258 258
 
Please login to merge, or discard this patch.
includes/functions/rpg_points.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -54,7 +54,7 @@
 block discarded – undo
54 54
           $comment = call_user_func_array('sprintf', $comment);
55 55
         }
56 56
 //        mm_points_change($user_id, $change_type, -$metamatter_to_reduce, 'ММ в ТМ: ' . (-$dark_matter) . ' ТМ = ' . $dark_matter_exists . ' ТМ + ' . $metamatter_to_reduce . ' ММ. ' . $comment);
57
-        classSupernova::$auth->account->metamatter_change($change_type, -$metamatter_to_reduce, 'ММ в ТМ: ' . (-$dark_matter) . ' ТМ = ' . $dark_matter_exists . ' ТМ + ' . $metamatter_to_reduce . ' ММ. ' . $comment);
57
+        classSupernova::$auth->account->metamatter_change($change_type, -$metamatter_to_reduce, 'ММ в ТМ: '.(-$dark_matter).' ТМ = '.$dark_matter_exists.' ТМ + '.$metamatter_to_reduce.' ММ. '.$comment);
58 58
         $dark_matter = -$dark_matter_exists;
59 59
       }
60 60
     } else {
Please login to merge, or discard this patch.
includes/includes/eco_bld_structures.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -68,11 +68,11 @@  discard block
 block discarded – undo
68 68
     }
69 69
     $build_unit_list = sn_get_groups('tech');
70 70
     $artifact_id = ART_HEURISTIC_CHIP;
71
-    $page_header = classLocale::$lang['tech'][UNIT_TECHNOLOGIES] . ($user['user_as_ally'] ? " {$classLocale['sys_of_ally']} {$user['username']}" : '');
71
+    $page_header = classLocale::$lang['tech'][UNIT_TECHNOLOGIES].($user['user_as_ally'] ? " {$classLocale['sys_of_ally']} {$user['username']}" : '');
72 72
   } elseif ($que_type == QUE_MERCENARY) {
73 73
     $build_unit_list = sn_get_groups('mercenaries');
74 74
     $artifact_id = 0;
75
-    $page_header = classLocale::$lang['tech'][UNIT_MERCENARIES] . ($user['user_as_ally'] ? " {$classLocale['sys_of_ally']} {$user['username']}" : '');
75
+    $page_header = classLocale::$lang['tech'][UNIT_MERCENARIES].($user['user_as_ally'] ? " {$classLocale['sys_of_ally']} {$user['username']}" : '');
76 76
   } else {
77 77
     if (mrc_get_level($user, $planet, STRUC_FACTORY_HANGAR) == 0) {
78 78
       message(classLocale::$lang['need_hangar'], classLocale::$lang['tech'][STRUC_FACTORY_HANGAR]);
@@ -245,7 +245,7 @@  discard block
 block discarded – undo
245 245
               * ($resource_id == RES_ENERGY ? $config_resource_multiplier_plain : $config_resource_multiplier)
246 246
               * (isset($density_info[$resource_id]) ? $density_info[$resource_id] : 1)))
247 247
           ) {
248
-            $level_production_base['R' . $resource_id] = $resource_income;
248
+            $level_production_base['R'.$resource_id] = $resource_income;
249 249
           }
250 250
         }
251 251
       }
@@ -272,8 +272,8 @@  discard block
 block discarded – undo
272 272
             * ($resource_id == RES_ENERGY ? $config_resource_multiplier_plain : $config_resource_multiplier)
273 273
             * (isset($density_info[$resource_id]) ? $density_info[$resource_id] : 1)))
274 274
           ) {
275
-            $level_production['R' . $resource_id] = $resource_income;
276
-            $level_production['D' . $resource_id] = $resource_income - $level_production_base[$resource_id];
275
+            $level_production['R'.$resource_id] = $resource_income;
276
+            $level_production['D'.$resource_id] = $resource_income - $level_production_base[$resource_id];
277 277
           }
278 278
         }
279 279
         $production['.']['resource'][] = $level_production;
@@ -288,15 +288,15 @@  discard block
 block discarded – undo
288 288
       $level_start = $level_base_and_que > 1 ? $level_effective + $level_in_que - 1 : 1;
289 289
       for ($i = 0; $i < 6; $i++) {
290 290
         $level_production = array('LEVEL' => $level_start + $i);
291
-        $level_production['R' . UNIT_PLAYER_EXPEDITIONS_MAX] = get_player_max_expeditons($user, $level_start + $i);
292
-        $level_production['D' . UNIT_PLAYER_EXPEDITIONS_MAX] = $level_production['R' . UNIT_PLAYER_EXPEDITIONS_MAX] - $level_production_base[UNIT_PLAYER_EXPEDITIONS_MAX];
293
-        $level_production['R' . UNIT_PLAYER_COLONIES_MAX] = get_player_max_colonies($user, $level_start + $i);
294
-        $level_production['D' . UNIT_PLAYER_COLONIES_MAX] = $level_production['R' . UNIT_PLAYER_COLONIES_MAX] - $level_production_base[UNIT_PLAYER_COLONIES_MAX];
291
+        $level_production['R'.UNIT_PLAYER_EXPEDITIONS_MAX] = get_player_max_expeditons($user, $level_start + $i);
292
+        $level_production['D'.UNIT_PLAYER_EXPEDITIONS_MAX] = $level_production['R'.UNIT_PLAYER_EXPEDITIONS_MAX] - $level_production_base[UNIT_PLAYER_EXPEDITIONS_MAX];
293
+        $level_production['R'.UNIT_PLAYER_COLONIES_MAX] = get_player_max_colonies($user, $level_start + $i);
294
+        $level_production['D'.UNIT_PLAYER_COLONIES_MAX] = $level_production['R'.UNIT_PLAYER_COLONIES_MAX] - $level_production_base[UNIT_PLAYER_COLONIES_MAX];
295 295
         $production['.']['resource'][] = $level_production;
296 296
 
297 297
         $level_production_base = array(
298
-          UNIT_PLAYER_EXPEDITIONS_MAX => $level_production['R' . UNIT_PLAYER_EXPEDITIONS_MAX],
299
-          UNIT_PLAYER_COLONIES_MAX    => $level_production['R' . UNIT_PLAYER_COLONIES_MAX],
298
+          UNIT_PLAYER_EXPEDITIONS_MAX => $level_production['R'.UNIT_PLAYER_EXPEDITIONS_MAX],
299
+          UNIT_PLAYER_COLONIES_MAX    => $level_production['R'.UNIT_PLAYER_COLONIES_MAX],
300 300
         );
301 301
       }
302 302
     }
Please login to merge, or discard this patch.
flotenajax.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@
 block discarded – undo
1 1
 <?php
2 2
 
3
-include('common.' . substr(strrchr(__FILE__, '.'), 1));
3
+include('common.'.substr(strrchr(__FILE__, '.'), 1));
4 4
 
5 5
 $template = gettemplate('viewreport', true);
6 6
 $template->assign_var('PAGE_HINT', classLocale::$lang['cr_view_hint']);
Please login to merge, or discard this patch.
includes/constants.php 1 patch
Spacing   +238 added lines, -238 removed lines patch added patch discarded remove patch
@@ -38,8 +38,8 @@  discard block
 block discarded – undo
38 38
 
39 39
 // Game type constants starts with GAME_
40 40
 define('GAME_SUPERNOVA', 0);
41
-define('GAME_OGAME'    , 1);
42
-define('GAME_BLITZ'    , 2);
41
+define('GAME_OGAME', 1);
42
+define('GAME_BLITZ', 2);
43 43
 
44 44
 // Date & time range constants
45 45
 define('DATE_FOREVER', 2000000000);
@@ -52,27 +52,27 @@  discard block
 block discarded – undo
52 52
 define('PERIOD_YEAR', PERIOD_DAY * 365);
53 53
 define('PERIOD_FOREVER', PERIOD_YEAR * 100);
54 54
 
55
-define('PERIOD_MINUTE_2' , PERIOD_MINUTE * 2);
56
-define('PERIOD_MINUTE_3' , PERIOD_MINUTE * 3);
57
-define('PERIOD_MINUTE_5' , PERIOD_MINUTE * 5);
55
+define('PERIOD_MINUTE_2', PERIOD_MINUTE * 2);
56
+define('PERIOD_MINUTE_3', PERIOD_MINUTE * 3);
57
+define('PERIOD_MINUTE_5', PERIOD_MINUTE * 5);
58 58
 define('PERIOD_MINUTE_10', PERIOD_MINUTE * 10);
59
-define('PERIOD_DAY_3'    , PERIOD_DAY * 3);
60
-define('PERIOD_WEEK_2'   , PERIOD_WEEK * 2);
61
-define('PERIOD_MONTH_2'  , PERIOD_MONTH * 2);
62
-define('PERIOD_MONTH_3'  , PERIOD_MONTH * 3);
59
+define('PERIOD_DAY_3', PERIOD_DAY * 3);
60
+define('PERIOD_WEEK_2', PERIOD_WEEK * 2);
61
+define('PERIOD_MONTH_2', PERIOD_MONTH * 2);
62
+define('PERIOD_MONTH_3', PERIOD_MONTH * 3);
63 63
 
64 64
 define('FONT_SIZE_PERCENT_MIN', 56.25);
65 65
 define('FONT_SIZE_PERCENT_DEFAULT', 68.75);
66 66
 define('FONT_SIZE_PERCENT_MAX', 131.25);
67 67
 define('FONT_SIZE_PERCENT_STEP', 12.5);
68
-define('FONT_SIZE_PERCENT_DEFAULT_STRING', FONT_SIZE_PERCENT_DEFAULT . '%');
68
+define('FONT_SIZE_PERCENT_DEFAULT_STRING', FONT_SIZE_PERCENT_DEFAULT.'%');
69 69
 
70 70
 define('FONT_SIZE_PIXELS_BROWSER_BASE', 16);
71 71
 define('FONT_SIZE_PIXELS_MIN', 9);
72 72
 define('FONT_SIZE_PIXELS_DEFAULT', 11);
73 73
 define('FONT_SIZE_PIXELS_MAX', 21);
74 74
 define('FONT_SIZE_PIXELS_STEP', 1);
75
-define('FONT_SIZE_PIXELS_DEFAULT_STRING', FONT_SIZE_PIXELS_DEFAULT . 'px');
75
+define('FONT_SIZE_PIXELS_DEFAULT_STRING', FONT_SIZE_PIXELS_DEFAULT.'px');
76 76
 
77 77
 define('DEFAULT_PICTURE_EXTENSION_DOTTED', '.jpg');
78 78
 
@@ -115,54 +115,54 @@  discard block
 block discarded – undo
115 115
 define('SN_SYS_SEC_CHARS_ALLOWED', 'ABCDEFGHJKLMNPQRSTUVWXYZabcdefghkmnpqrstuvwxyz0123456789');
116 116
 
117 117
 // Mot qui sont interdit a la saisie !
118
-$ListCensure = array ( '/</', '/>/', '/script/i', '/doquery/i', '/http/i', '/javascript/i');
118
+$ListCensure = array('/</', '/>/', '/script/i', '/doquery/i', '/http/i', '/javascript/i');
119 119
 
120 120
 // Confirmation record types
121
-define('CONFIRM_REGISTRATION'  , 1);
121
+define('CONFIRM_REGISTRATION', 1);
122 122
 define('CONFIRM_PASSWORD_RESET', 2);
123
-define('CONFIRM_DELETE'        , 3);
123
+define('CONFIRM_DELETE', 3);
124 124
 
125 125
 define('AFFILIATE_MM_TO_REFERRAL_DM', 2);
126 126
 
127 127
 // Ally diplomacy statuses
128
-define('ALLY_DIPLOMACY_SELF'         , 'self');
129
-define('ALLY_DIPLOMACY_NEUTRAL'      , 'neutral');
130
-define('ALLY_DIPLOMACY_WAR'          , 'war');
131
-define('ALLY_DIPLOMACY_PEACE'        , 'peace');
128
+define('ALLY_DIPLOMACY_SELF', 'self');
129
+define('ALLY_DIPLOMACY_NEUTRAL', 'neutral');
130
+define('ALLY_DIPLOMACY_WAR', 'war');
131
+define('ALLY_DIPLOMACY_PEACE', 'peace');
132 132
 define('ALLY_DIPLOMACY_CONFEDERATION', 'confederation');
133
-define('ALLY_DIPLOMACY_FEDERATION'   , 'federation');
134
-define('ALLY_DIPLOMACY_UNION'        , 'union');
135
-define('ALLY_DIPLOMACY_MASTER'       , 'master');
136
-define('ALLY_DIPLOMACY_SLAVE'        , 'slave');
133
+define('ALLY_DIPLOMACY_FEDERATION', 'federation');
134
+define('ALLY_DIPLOMACY_UNION', 'union');
135
+define('ALLY_DIPLOMACY_MASTER', 'master');
136
+define('ALLY_DIPLOMACY_SLAVE', 'slave');
137 137
 
138 138
 define('ALLY_PROPOSE_SEND', 0);
139 139
 
140 140
 // Quest types
141
-define('QUEST_TYPE_BUILD'   , 1);
141
+define('QUEST_TYPE_BUILD', 1);
142 142
 define('QUEST_TYPE_RESEARCH', 2);
143
-define('QUEST_TYPE_COMBAT'  , 3);
143
+define('QUEST_TYPE_COMBAT', 3);
144 144
 
145
-define('QUEST_STATUS_NOT_STARTED' , 0);
146
-define('QUEST_STATUS_STARTED'     , 1);
147
-define('QUEST_STATUS_COMPLETE'    , 2);
145
+define('QUEST_STATUS_NOT_STARTED', 0);
146
+define('QUEST_STATUS_STARTED', 1);
147
+define('QUEST_STATUS_COMPLETE', 2);
148 148
 
149 149
 // *** Combat-related constants
150 150
 // *** Mission Type constants starts with MT_
151
-define('MT_NONE'     ,  0);
152
-define('MT_EXPLORE'  , 15);
153
-define('MT_COLONIZE' ,  7);
154
-define('MT_RECYCLE'  ,  8);
151
+define('MT_NONE', 0);
152
+define('MT_EXPLORE', 15);
153
+define('MT_COLONIZE', 7);
154
+define('MT_RECYCLE', 8);
155 155
 
156
-define('MT_RELOCATE' ,  4);
156
+define('MT_RELOCATE', 4);
157 157
 
158
-define('MT_TRANSPORT',  3);
159
-define('MT_HOLD'     ,  5);
158
+define('MT_TRANSPORT', 3);
159
+define('MT_HOLD', 5);
160 160
 
161
-define('MT_MISSILE'  , 10);
162
-define('MT_SPY'      ,  6);
163
-define('MT_ATTACK'   ,  1);
164
-define('MT_ACS'      ,  2);
165
-define('MT_DESTROY'  ,  9);
161
+define('MT_MISSILE', 10);
162
+define('MT_SPY', 6);
163
+define('MT_ATTACK', 1);
164
+define('MT_ACS', 2);
165
+define('MT_DESTROY', 9);
166 166
 // 11, 12, 13, 14, 16...
167 167
 
168 168
 // *** Planet Target constants starts with PT_
@@ -170,49 +170,49 @@  discard block
 block discarded – undo
170 170
 define('PT_ALL', 0);
171 171
 define('PT_PLANET', 1);
172 172
 define('PT_DEBRIS', 2);
173
-define('PT_MOON'  , 3);
173
+define('PT_MOON', 3);
174 174
 
175 175
 // *** Unit locations - shows db table where unit belong
176 176
 // Also cache indexes
177
-define('LOC_NONE',    -1);
177
+define('LOC_NONE', -1);
178 178
 define('LOC_UNIVERSE', 0);
179
-define('LOC_PLANET',   1);
180
-define('LOC_DEBRIS',   2); // Translates to `planets` table planet_type = 1, `debris_*` fields
181
-define('LOC_MOON',     3); // Translates to `planets` table planet_type = 3
182
-define('LOC_USER',     4);
183
-define('LOC_FLEET',    5);
184
-define('LOC_ALLY',     6);
185
-define('LOC_UNIT_NUMERIC',     7);
186
-define('LOC_UNIT_LIST',     8);
179
+define('LOC_PLANET', 1);
180
+define('LOC_DEBRIS', 2); // Translates to `planets` table planet_type = 1, `debris_*` fields
181
+define('LOC_MOON', 3); // Translates to `planets` table planet_type = 3
182
+define('LOC_USER', 4);
183
+define('LOC_FLEET', 5);
184
+define('LOC_ALLY', 6);
185
+define('LOC_UNIT_NUMERIC', 7);
186
+define('LOC_UNIT_LIST', 8);
187 187
 
188 188
 // ТОЛЬКО ВНУТРЕНЕЕ!!!
189
-define('LOC_UNIT',    'LOC_UNIT');
190
-define('LOC_QUE',     'LOC_QUE');
191
-define('LOC_LOCATION','LOC_LOCATION');
192
-define('LOC_LOCKS','LOC_LOCKS');
189
+define('LOC_UNIT', 'LOC_UNIT');
190
+define('LOC_QUE', 'LOC_QUE');
191
+define('LOC_LOCATION', 'LOC_LOCATION');
192
+define('LOC_LOCKS', 'LOC_LOCKS');
193 193
 
194 194
 // *** Caching masks
195
-define('CACHE_NOTHING'    ,  0);
196
-define('CACHE_FLEET'      ,  1);
197
-define('CACHE_PLANET'     ,  2);
198
-define('CACHE_USER'       ,  4);
199
-define('CACHE_SOURCE'     ,  8);
195
+define('CACHE_NOTHING', 0);
196
+define('CACHE_FLEET', 1);
197
+define('CACHE_PLANET', 2);
198
+define('CACHE_USER', 4);
199
+define('CACHE_SOURCE', 8);
200 200
 define('CACHE_DESTINATION', 16);
201
-define('CACHE_EVENT'      , 32);
201
+define('CACHE_EVENT', 32);
202 202
 
203
-define('CACHE_USER_SRC'  , CACHE_USER | CACHE_SOURCE);
204
-define('CACHE_USER_DST'  , CACHE_USER | CACHE_DESTINATION);
203
+define('CACHE_USER_SRC', CACHE_USER | CACHE_SOURCE);
204
+define('CACHE_USER_DST', CACHE_USER | CACHE_DESTINATION);
205 205
 define('CACHE_PLANET_SRC', CACHE_PLANET | CACHE_SOURCE);
206 206
 define('CACHE_PLANET_DST', CACHE_PLANET | CACHE_DESTINATION);
207
-define('CACHE_COMBAT'    , CACHE_FLEET | CACHE_PLANET | CACHE_USER | CACHE_SOURCE | CACHE_DESTINATION);
207
+define('CACHE_COMBAT', CACHE_FLEET | CACHE_PLANET | CACHE_USER | CACHE_SOURCE | CACHE_DESTINATION);
208 208
 
209
-define('CACHE_ALL'       , CACHE_FLEET | CACHE_PLANET | CACHE_USER | CACHE_SOURCE | CACHE_DESTINATION | CACHE_EVENT);
209
+define('CACHE_ALL', CACHE_FLEET | CACHE_PLANET | CACHE_USER | CACHE_SOURCE | CACHE_DESTINATION | CACHE_EVENT);
210 210
 
211
-define('CACHE_NONE'      , CACHE_NOTHING); // Alias for me
211
+define('CACHE_NONE', CACHE_NOTHING); // Alias for me
212 212
 
213 213
 // *** Event types
214 214
 define('EVENT_FLEET_ARRIVE', 1);
215
-define('EVENT_FLEET_STAY'  , 2);
215
+define('EVENT_FLEET_STAY', 2);
216 216
 define('EVENT_FLEET_RETURN', 3);
217 217
 
218 218
 // *** Constants for changing DM
@@ -265,10 +265,10 @@  discard block
 block discarded – undo
265 265
 
266 266
 
267 267
 // Operation error status HARDCODE!
268
-define('ERR_NONE'               , 0); // No error
269
-define('ERR_WARNING'            , 1); // There is warning - something altering normal operation process
270
-define('ERR_ERROR'              , 2); // There is error - something permits operation from process
271
-define('ERR_HACK'               , 4); // Operation is qualified as hack attempt
268
+define('ERR_NONE', 0); // No error
269
+define('ERR_WARNING', 1); // There is warning - something altering normal operation process
270
+define('ERR_ERROR', 2); // There is error - something permits operation from process
271
+define('ERR_HACK', 4); // Operation is qualified as hack attempt
272 272
 // New GLOBAL operation results
273 273
 //define('RESULT_DEFAULT' , 0); // Default result - all went OK or result really doesn't matter
274 274
 //define('RESULT_WARNING' , 1);
@@ -288,7 +288,7 @@  discard block
 block discarded – undo
288 288
 define('SN_PAYMENT_REQUEST_OK', 0);
289 289
 define('SN_PAYMENT_REQUEST_ERROR_UNIT_AMOUNT', 1);
290 290
 define('SN_PAYMENT_REQUEST_ERROR_PAYLINK_UNSUPPORTED', 2);
291
-define('SN_PAYMENT_REQUEST_IP_WRONG', 3);  // Неправильный IP входящей системы - обычно хак
291
+define('SN_PAYMENT_REQUEST_IP_WRONG', 3); // Неправильный IP входящей системы - обычно хак
292 292
 define('SN_PAYMENT_REQUEST_COMMAND_UNSUPPORTED', 4); // Неподдерживаемая команда - обычно хак
293 293
 define('SN_PAYMENT_REQUEST_SIGNATURE_INVALID', 5); // Неправильная подпись или не сошлась контрольная сумма - обычно хак
294 294
 define('SN_MODULE_DISABLED', 6); // Модуль отключен // УНИВЕРСАЛЬНЫЙ ОТВЕТ!
@@ -561,16 +561,16 @@  discard block
 block discarded – undo
561 561
 //define('F_DEVICE_ID',     'F_DEVICE_ID');
562 562
 //define('F_DEVICE_CYPHER', 'F_DEVICE_CYPHER');
563 563
 
564
-define('F_PROVIDER_ID',   'F_PROVIDER_ID');
564
+define('F_PROVIDER_ID', 'F_PROVIDER_ID');
565 565
 // define('F_PROVIDER_LIST', 'F_PROVIDER_LIST');
566 566
 
567 567
 define('F_IMPERSONATE_STATUS', 'F_IMPERSONATE_STATUS');
568 568
 define('F_IMPERSONATE_OPERATOR', 'F_IMPERSONATE_OPERATOR');
569 569
 
570
-define('F_LOGIN_STATUS',  'F_LOGIN_STATUS');
570
+define('F_LOGIN_STATUS', 'F_LOGIN_STATUS');
571 571
 define('F_LOGIN_MESSAGE', 'F_LOGIN_MESSAGE');
572 572
 
573
-define('F_PLAYER_REGISTER_STATUS',  'F_PLAYER_REGISTER_STATUS');
573
+define('F_PLAYER_REGISTER_STATUS', 'F_PLAYER_REGISTER_STATUS');
574 574
 define('F_PLAYER_REGISTER_MESSAGE', 'F_PLAYER_REGISTER_MESSAGE');
575 575
 
576 576
 define('F_USER_ID', 'F_USER_ID');
@@ -614,66 +614,66 @@  discard block
 block discarded – undo
614 614
 
615 615
 
616 616
 // Option groups
617
-define('OPT_ALL',      0);
618
-define('OPT_MESSAGE',  1);
617
+define('OPT_ALL', 0);
618
+define('OPT_MESSAGE', 1);
619 619
 define('OPT_UNIVERSE', 2);
620 620
 define('OPT_INTERFACE', 3);
621 621
 
622 622
 // Message classes
623
-define('MSG_TYPE_OUTBOX'   ,  -1);
624
-define('MSG_TYPE_SPY'      ,   0);
625
-define('MSG_TYPE_PLAYER'   ,   1);
626
-define('MSG_TYPE_ALLIANCE' ,   2);
627
-define('MSG_TYPE_COMBAT'   ,   3);
628
-define('MSG_TYPE_RECYCLE'  ,   4);
629
-define('MSG_TYPE_TRANSPORT',   5);
630
-define('MSG_TYPE_ADMIN'    ,   6);
631
-define('MSG_TYPE_EXPLORE'  ,  15);
632
-define('MSG_TYPE_QUE'      ,  99);
633
-define('MSG_TYPE_NEW'      , 100);
623
+define('MSG_TYPE_OUTBOX', -1);
624
+define('MSG_TYPE_SPY', 0);
625
+define('MSG_TYPE_PLAYER', 1);
626
+define('MSG_TYPE_ALLIANCE', 2);
627
+define('MSG_TYPE_COMBAT', 3);
628
+define('MSG_TYPE_RECYCLE', 4);
629
+define('MSG_TYPE_TRANSPORT', 5);
630
+define('MSG_TYPE_ADMIN', 6);
631
+define('MSG_TYPE_EXPLORE', 15);
632
+define('MSG_TYPE_QUE', 99);
633
+define('MSG_TYPE_NEW', 100);
634 634
 
635 635
 // Attack verification statuses
636
-define('FLIGHT_ALLOWED'           ,  0);
637
-define('FLIGHT_VECTOR_NO_TARGET'         ,  1);
638
-define('FLIGHT_PLAYER_OWN'               ,  2);
639
-define('FLIGHT_MISSION_IMPOSSIBLE'     ,  3);
640
-define('FLIGHT_MISSION_HOLD_NO_ALLY_DEPOSIT'   ,  4);
641
-define('FLIGHT_MISSION_RECYCLE_NO_DEBRIS'         ,  5);
642
-define('FLIGHT_PLAYER_VACATION'          ,  6);
643
-define('FLIGHT_PLAYER_SAME_IP'           ,  7);
644
-define('FLIGHT_PLAYER_BUFFING'           ,  8);
645
-define('FLIGHT_PLAYER_ADMIN'             ,  9);
646
-define('FLIGHT_PLAYER_NOOB'              , 10);
647
-define('FLIGHT_PLAYER_VACATION_OWN'      , 11);
648
-define('FLIGHT_MISSION_MISSILE_NO_SILO'           , 12);
649
-define('FLIGHT_MISSION_MISSILE_NO_MISSILES'        , 13);
650
-define('FLIGHT_SHIPS_NO_SHIPS'          , 14);
651
-define('FLIGHT_FLEET_NO_SLOTS'          , 15);
652
-define('FLIGHT_SHIPS_NOT_ENOUGH_OR_RESOURCES'          , 16);
653
-define('FLIGHT_SHIPS_NO_RECYCLERS'      , 17);
654
-define('FLIGHT_MISSION_SPY_NO_SPIES'          , 18);
655
-define('FLIGHT_SHIPS_NO_COLONIZER'      , 19);
656
-define('FLIGHT_MISSION_MISSILE_TOO_FAR'   , 20);
657
-define('FLIGHT_MISSION_MISSILE_WRONG_STRUCTURE'   , 21);
658
-define('FLIGHT_RESOURCES_FUEL_NOT_ENOUGH'           , 22);
659
-define('FLIGHT_RESOURCES_NOT_ENOUGH'      , 23);
660
-define('FLIGHT_MISSION_ACS_NOT_EXISTS'            , 24);
661
-define('FLIGHT_MISSION_ACS_MISSTARGET'    , 25);
662
-define('FLIGHT_FLEET_SPEED_WRONG'       , 26);
663
-define('FLIGHT_MISSION_ACS_TOO_LATE'      , 27);
664
-define('FLIGHT_MISSION_ATTACK_BASHING'           , 28);
665
-define('FLIGHT_MISSION_ATTACK_BASHING_WAR_DELAY' , 29);
666
-define('FLIGHT_MISSION_ACS_WRONG_TARGET'  , 30);
667
-define('FLIGHT_VECTOR_SAME_SOURCE'              , 31);
636
+define('FLIGHT_ALLOWED', 0);
637
+define('FLIGHT_VECTOR_NO_TARGET', 1);
638
+define('FLIGHT_PLAYER_OWN', 2);
639
+define('FLIGHT_MISSION_IMPOSSIBLE', 3);
640
+define('FLIGHT_MISSION_HOLD_NO_ALLY_DEPOSIT', 4);
641
+define('FLIGHT_MISSION_RECYCLE_NO_DEBRIS', 5);
642
+define('FLIGHT_PLAYER_VACATION', 6);
643
+define('FLIGHT_PLAYER_SAME_IP', 7);
644
+define('FLIGHT_PLAYER_BUFFING', 8);
645
+define('FLIGHT_PLAYER_ADMIN', 9);
646
+define('FLIGHT_PLAYER_NOOB', 10);
647
+define('FLIGHT_PLAYER_VACATION_OWN', 11);
648
+define('FLIGHT_MISSION_MISSILE_NO_SILO', 12);
649
+define('FLIGHT_MISSION_MISSILE_NO_MISSILES', 13);
650
+define('FLIGHT_SHIPS_NO_SHIPS', 14);
651
+define('FLIGHT_FLEET_NO_SLOTS', 15);
652
+define('FLIGHT_SHIPS_NOT_ENOUGH_OR_RESOURCES', 16);
653
+define('FLIGHT_SHIPS_NO_RECYCLERS', 17);
654
+define('FLIGHT_MISSION_SPY_NO_SPIES', 18);
655
+define('FLIGHT_SHIPS_NO_COLONIZER', 19);
656
+define('FLIGHT_MISSION_MISSILE_TOO_FAR', 20);
657
+define('FLIGHT_MISSION_MISSILE_WRONG_STRUCTURE', 21);
658
+define('FLIGHT_RESOURCES_FUEL_NOT_ENOUGH', 22);
659
+define('FLIGHT_RESOURCES_NOT_ENOUGH', 23);
660
+define('FLIGHT_MISSION_ACS_NOT_EXISTS', 24);
661
+define('FLIGHT_MISSION_ACS_MISSTARGET', 25);
662
+define('FLIGHT_FLEET_SPEED_WRONG', 26);
663
+define('FLIGHT_MISSION_ACS_TOO_LATE', 27);
664
+define('FLIGHT_MISSION_ATTACK_BASHING', 28);
665
+define('FLIGHT_MISSION_ATTACK_BASHING_WAR_DELAY', 29);
666
+define('FLIGHT_MISSION_ACS_WRONG_TARGET', 30);
667
+define('FLIGHT_VECTOR_SAME_SOURCE', 31);
668 668
 define('FLIGHT_RESOURCES_FORBIDDEN', 32);
669
-define('FLIGHT_MISSION_TRANSPORT_EMPTY_CARGO'   , 33);
670
-define('FLIGHT_SHIPS_NOT_ONLY_SPIES'       , 34);
671
-define('FLIGHT_FLEET_TOO_FAR'           , 35);
672
-define('FLIGHT_FLEET_OVERLOAD'        , 36);
673
-define('FLIGHT_MISSION_UNKNOWN'    , 37);
674
-define('FLIGHT_SHIPS_UNIT_WRONG'        , 38);
675
-define('FLIGHT_SHIPS_UNMOVABLE'        , 39);
676
-define('FLIGHT_SHIPS_NEGATIVE'  , 40);
669
+define('FLIGHT_MISSION_TRANSPORT_EMPTY_CARGO', 33);
670
+define('FLIGHT_SHIPS_NOT_ONLY_SPIES', 34);
671
+define('FLIGHT_FLEET_TOO_FAR', 35);
672
+define('FLIGHT_FLEET_OVERLOAD', 36);
673
+define('FLIGHT_MISSION_UNKNOWN', 37);
674
+define('FLIGHT_SHIPS_UNIT_WRONG', 38);
675
+define('FLIGHT_SHIPS_UNMOVABLE', 39);
676
+define('FLIGHT_SHIPS_NEGATIVE', 40);
677 677
 define('FLIGHT_RESOURCES_NEGATIVE', 41);
678 678
 define('FLIGHT_MISSION_MORATORIUM', 42);
679 679
 define('FLIGHT_PLAYER_CHILD_PROTECTION', 43);
@@ -707,12 +707,12 @@  discard block
 block discarded – undo
707 707
 
708 708
 
709 709
 // *** Races - Homeworlds
710
-define('RACE_NONE'    , 0);
711
-define('RACE_EARTH'   , 1);
712
-define('RACE_MOON'    , 2);
713
-define('RACE_MERCURY' , 3);
714
-define('RACE_VENUS'   , 4);
715
-define('RACE_MARS'    , 5);
710
+define('RACE_NONE', 0);
711
+define('RACE_EARTH', 1);
712
+define('RACE_MOON', 2);
713
+define('RACE_MERCURY', 3);
714
+define('RACE_VENUS', 4);
715
+define('RACE_MARS', 5);
716 716
 define('RACE_ASTEROID', 6);
717 717
 // define('MARKET_INFO'         , 7);
718 718
 
@@ -720,114 +720,114 @@  discard block
 block discarded – undo
720 720
 
721 721
 // *** Market variables
722 722
 // === Market blocks
723
-define('MARKET_ENTRY'        , 0);
724
-define('MARKET_RESOURCES'    , 1);
725
-define('MARKET_SCRAPPER'     , 2);
726
-define('MARKET_STOCKMAN'     , 3);
727
-define('MARKET_EXCHANGE'     , 4);
728
-define('MARKET_BANKER'       , 5);
729
-define('MARKET_PAWNSHOP'     , 6);
730
-define('MARKET_INFO'         , 7);
723
+define('MARKET_ENTRY', 0);
724
+define('MARKET_RESOURCES', 1);
725
+define('MARKET_SCRAPPER', 2);
726
+define('MARKET_STOCKMAN', 3);
727
+define('MARKET_EXCHANGE', 4);
728
+define('MARKET_BANKER', 5);
729
+define('MARKET_PAWNSHOP', 6);
730
+define('MARKET_INFO', 7);
731 731
 
732 732
 // === Market error statuses
733
-define('MARKET_NOTHING'              ,  0);
734
-define('MARKET_DEAL'                 ,  1);
735
-define('MARKET_DEAL_TRADE'           ,  2);
736
-define('MARKET_NO_DM'                ,  3);
737
-define('MARKET_NO_RESOURCES'         ,  4);
738
-define('MARKET_ZERO_DEAL'            ,  5);
739
-define('MARKET_NO_SHIPS'             ,  6);
740
-define('MARKET_NOT_A_SHIP'           ,  7);
741
-define('MARKET_NO_STOCK'             ,  8);
742
-define('MARKET_ZERO_RES_STOCK'       ,  9);
743
-define('MARKET_NEGATIVE_SHIPS'       , 10);
744
-
745
-define('MARKET_INFO_PLAYER'          , 12);
746
-define('MARKET_INFO_WRONG'           , 11);
733
+define('MARKET_NOTHING', 0);
734
+define('MARKET_DEAL', 1);
735
+define('MARKET_DEAL_TRADE', 2);
736
+define('MARKET_NO_DM', 3);
737
+define('MARKET_NO_RESOURCES', 4);
738
+define('MARKET_ZERO_DEAL', 5);
739
+define('MARKET_NO_SHIPS', 6);
740
+define('MARKET_NOT_A_SHIP', 7);
741
+define('MARKET_NO_STOCK', 8);
742
+define('MARKET_ZERO_RES_STOCK', 9);
743
+define('MARKET_NEGATIVE_SHIPS', 10);
744
+
745
+define('MARKET_INFO_PLAYER', 12);
746
+define('MARKET_INFO_WRONG', 11);
747 747
 define('MARKET_INFO_PLAYER_NOT_FOUND', 13);
748
-define('MARKET_INFO_PLAYER_WRONG'    , 14);
749
-define('MARKET_INFO_PLAYER_SAME'     , 15);
748
+define('MARKET_INFO_PLAYER_WRONG', 14);
749
+define('MARKET_INFO_PLAYER_SAME', 15);
750 750
 
751 751
 
752 752
 
753 753
 
754 754
 // *** Mercenary/talent bonus types
755
-define('BONUS_NONE'    ,            0);  // No bonus
756
-define('BONUS_PERCENT' ,            1);  // Percent on base value
757
-define('BONUS_ADD'     ,            2);  // Add
758
-define('BONUS_ABILITY' ,            3);  // Some ability
759
-define('BONUS_MULTIPLY',            4);  // Multiply by value
760
-define('BONUS_PERCENT_CUMULATIVE' , 5);  // Cumulative percent on base value
761
-define('BONUS_PERCENT_DEGRADED' ,   6);  // Bonus amount degraded with increase as pow(bonus, level) (?)
762
-define('BONUS_SPEED',               7);  // Speed bonus
755
+define('BONUS_NONE', 0); // No bonus
756
+define('BONUS_PERCENT', 1); // Percent on base value
757
+define('BONUS_ADD', 2); // Add
758
+define('BONUS_ABILITY', 3); // Some ability
759
+define('BONUS_MULTIPLY', 4); // Multiply by value
760
+define('BONUS_PERCENT_CUMULATIVE', 5); // Cumulative percent on base value
761
+define('BONUS_PERCENT_DEGRADED', 6); // Bonus amount degraded with increase as pow(bonus, level) (?)
762
+define('BONUS_SPEED', 7); // Speed bonus
763 763
 
764 764
 // *** Action constant (build should be replaced with ACTION)
765
-define('BUILD_CREATE' ,  1);
765
+define('BUILD_CREATE', 1);
766 766
 define('BUILD_DESTROY', -1);
767 767
 define('BUILD_AUTOCONVERT', 2);
768 768
 
769
-define('ACTION_SELL'       , -1);
770
-define('ACTION_NOTHING'    ,  0);
771
-define('ACTION_BUY'        ,  1);
772
-define('ACTION_USE'        ,  2);
773
-define('ACTION_DELETE'     ,  3);
769
+define('ACTION_SELL', -1);
770
+define('ACTION_NOTHING', 0);
771
+define('ACTION_BUY', 1);
772
+define('ACTION_USE', 2);
773
+define('ACTION_DELETE', 3);
774 774
 
775 775
 // *** Check unit availability codes
776
-define('BUILD_ALLOWED'         , 0); // HARDCODED! DO NOT CHANGE!
776
+define('BUILD_ALLOWED', 0); // HARDCODED! DO NOT CHANGE!
777 777
 define('BUILD_REQUIRE_NOT_MEET', 1);
778
-define('BUILD_AMOUNT_WRONG'    , 2);
779
-define('BUILD_QUE_WRONG'       , 3);
780
-define('BUILD_QUE_UNIT_WRONG'  , 4);
781
-define('BUILD_INDESTRUCTABLE'  , 5);
782
-define('BUILD_NO_RESOURCES'    , 6);
783
-define('BUILD_NO_UNITS'        , 7);
784
-define('BUILD_UNIT_BUSY'       , 8);
785
-define('BUILD_QUE_FULL'        , 9);
786
-define('BUILD_SILO_FULL'       ,10);
787
-define('BUILD_MAX_REACHED'     ,11);
788
-define('BUILD_SECTORS_NONE'    ,12);
778
+define('BUILD_AMOUNT_WRONG', 2);
779
+define('BUILD_QUE_WRONG', 3);
780
+define('BUILD_QUE_UNIT_WRONG', 4);
781
+define('BUILD_INDESTRUCTABLE', 5);
782
+define('BUILD_NO_RESOURCES', 6);
783
+define('BUILD_NO_UNITS', 7);
784
+define('BUILD_UNIT_BUSY', 8);
785
+define('BUILD_QUE_FULL', 9);
786
+define('BUILD_SILO_FULL', 10);
787
+define('BUILD_MAX_REACHED', 11);
788
+define('BUILD_SECTORS_NONE', 12);
789 789
 define('BUILD_AUTOCONVERT_AVAILABLE', 13);
790 790
 
791 791
 
792 792
 // *** Que types
793 793
 define('QUE_STRUCTURES', 1);
794
-define('QUE_HANGAR'    , 4);
795
-define('QUE_RESEARCH'  , 7);
796
-define('QUE_MERCENARY' , 600); // UNIT_MERCENARIES
794
+define('QUE_HANGAR', 4);
795
+define('QUE_RESEARCH', 7);
796
+define('QUE_MERCENARY', 600); // UNIT_MERCENARIES
797 797
 // *** Subque types
798
-define('SUBQUE_PLANET'  , 1);
799
-define('SUBQUE_MOON'    , 3);
800
-define('SUBQUE_FLEET'   , 4);
801
-define('SUBQUE_DEFENSE' , 6);
798
+define('SUBQUE_PLANET', 1);
799
+define('SUBQUE_MOON', 3);
800
+define('SUBQUE_FLEET', 4);
801
+define('SUBQUE_DEFENSE', 6);
802 802
 define('SUBQUE_RESEARCH', 7);
803 803
 
804 804
 // *** Que items
805
-define('QI_UNIT_ID'   , 0);
806
-define('QI_AMOUNT'    , 1);
807
-define('QI_TIME'      , 2);
808
-define('QI_MODE'      , 3);
809
-define('QI_QUE_ID'    , 4);
810
-define('QI_QUE_TYPE'  , 4);
811
-define('QI_PLANET_ID' , 5);
805
+define('QI_UNIT_ID', 0);
806
+define('QI_AMOUNT', 1);
807
+define('QI_TIME', 2);
808
+define('QI_MODE', 3);
809
+define('QI_QUE_ID', 4);
810
+define('QI_QUE_TYPE', 4);
811
+define('QI_PLANET_ID', 5);
812 812
 
813 813
 
814 814
 // *** Units
815 815
 
816 816
 // *** Sort options
817
-define('SORT_ASCENDING' , 0);
817
+define('SORT_ASCENDING', 0);
818 818
 define('SORT_DESCENDING', 1);
819 819
 
820
-define('SORT_ID'             , 0);
821
-define('SORT_LOCATION'       , 1);
822
-define('SORT_NAME'           , 2);
823
-define('SORT_SIZE'           , 3);
824
-define('SORT_EMAIL'          , 4);
825
-define('SORT_IP'             , 5);
820
+define('SORT_ID', 0);
821
+define('SORT_LOCATION', 1);
822
+define('SORT_NAME', 2);
823
+define('SORT_SIZE', 3);
824
+define('SORT_EMAIL', 4);
825
+define('SORT_IP', 5);
826 826
 define('SORT_TIME_REGISTERED', 6);
827 827
 define('SORT_TIME_LAST_VISIT', 7);
828
-define('SORT_TIME_BAN_UNTIL' , 8);
829
-define('SORT_REFERRAL_COUNT' , 9);
830
-define('SORT_REFERRAL_DM'    , 10);
828
+define('SORT_TIME_BAN_UNTIL', 8);
829
+define('SORT_REFERRAL_COUNT', 9);
830
+define('SORT_REFERRAL_DM', 10);
831 831
 
832 832
 
833 833
 define('HULL_SIZE_TINY', 1);
@@ -970,10 +970,10 @@  discard block
 block discarded – undo
970 970
 
971 971
 // === Artifacts
972 972
 define('UNIT_ARTIFACTS', 1000);
973
-define('ART_LHC', 1001);      // Additional moon chance
974
-define('ART_RCD_SMALL', 1002);   // Rapid Colony Deployment - Set of buildings up to 10th level - 10/14/ 3/0 -   405 DM
975
-define('ART_RCD_MEDIUM', 1003);  // Rapid Colony Deployment - Set of buildings up to 15th level - 15/20/ 8/0 -  4704 DM
976
-define('ART_RCD_LARGE', 1004);   // Rapid Colony Deployment - Set of buildings up to 20th level - 20/25/10/1 - 39790 DM
973
+define('ART_LHC', 1001); // Additional moon chance
974
+define('ART_RCD_SMALL', 1002); // Rapid Colony Deployment - Set of buildings up to 10th level - 10/14/ 3/0 -   405 DM
975
+define('ART_RCD_MEDIUM', 1003); // Rapid Colony Deployment - Set of buildings up to 15th level - 15/20/ 8/0 -  4704 DM
976
+define('ART_RCD_LARGE', 1004); // Rapid Colony Deployment - Set of buildings up to 20th level - 20/25/10/1 - 39790 DM
977 977
 define('ART_HEURISTIC_CHIP', 1005); // Speed up research
978 978
 define('ART_NANO_BUILDER', 1006); // Speed up building
979 979
 define('ART_NANO_CONSTRUCTOR', 1007); // RESERVED Speed up hangar constructions
@@ -1044,18 +1044,18 @@  discard block
 block discarded – undo
1044 1044
 define('UNIT_AWARD_MEDAL_BLITZ_R0_PLACE1', 2201); // Блиц-сервер, участник 0-го раунда, 1-е место
1045 1045
 define('UNIT_AWARD_MEDAL_BLITZ_R0_PLACE2', 2202); // Блиц-сервер, участник 0-го раунда, 2-е место
1046 1046
 define('UNIT_AWARD_MEDAL_BLITZ_R0_PLACE3', 2203); // Блиц-сервер, участник 0-го раунда, 3-е место
1047
-define('UNIT_AWARD_MEDAL_2016_WOMEN_DAY_BEST', 2204);  // Медаль Лучшему Кавалеру за максимум потраченной ММ/максимум одаренных женщин Женщине от Мужчины во время ивента 8 марта 2016 года
1047
+define('UNIT_AWARD_MEDAL_2016_WOMEN_DAY_BEST', 2204); // Медаль Лучшему Кавалеру за максимум потраченной ММ/максимум одаренных женщин Женщине от Мужчины во время ивента 8 марта 2016 года
1048 1048
 
1049 1049
 define('UNIT_AWARD_MEMORY', 2300); // Памятные знаки за существование и участие - например "4 года в игре". "Был онлайн в новогоднюю ночь 2013". итд
1050
-define('UNIT_AWARD_MEMORY_IMMORTAL', 2301);  // Бессмертный
1051
-define('UNIT_AWARD_MEMORY_2015_WOMEN_DAY', 2302);  // Значек за подарок Женщине от Мужчины во время ивента 8 марта 2015 года
1050
+define('UNIT_AWARD_MEMORY_IMMORTAL', 2301); // Бессмертный
1051
+define('UNIT_AWARD_MEMORY_2015_WOMEN_DAY', 2302); // Значек за подарок Женщине от Мужчины во время ивента 8 марта 2015 года
1052 1052
 define('UNIT_AWARD_MEMORY_BLITZ_R0', 2303); // Блиц-сервер, участник 0-го раунда
1053 1053
 define('UNIT_AWARD_MEMORY_SUPER_BORN_2015_SIMPLE', 2304); // День Рождения СН
1054 1054
 define('UNIT_AWARD_MEMORY_SUPER_BORN_2015_BRONZE', 2305); // День Рождения СН
1055 1055
 define('UNIT_AWARD_MEMORY_SUPER_BORN_2015_SILVER', 2306); // День Рождения СН
1056 1056
 define('UNIT_AWARD_MEMORY_SUPER_BORN_2015_GOLD', 2307); // День Рождения СН
1057 1057
 define('UNIT_AWARD_MEMORY_SUPER_BORN_2015_PLATINUM', 2308); // День Рождения СН
1058
-define('UNIT_AWARD_MEMORY_2016_WOMEN_DAY', 2309);  // Значек за подарок Женщине от Мужчины во время ивента 8 марта 2016 года
1058
+define('UNIT_AWARD_MEMORY_2016_WOMEN_DAY', 2309); // Значек за подарок Женщине от Мужчины во время ивента 8 марта 2016 года
1059 1059
 
1060 1060
 define('UNIT_AWARD_PENNANT', 2400); // Переходящий вымпел - индикация статуса на сервере: "Топ-1", "Топ", "Сабтоп", "Самый большой флот" итд
1061 1061
 define('UNIT_AWARD_BADGE', 2600); // Бейджики/значки за ачивки - например, "Построил 1000 кораблей"
@@ -1152,7 +1152,7 @@  discard block
 block discarded – undo
1152 1152
 
1153 1153
 define('UNIT_NEXT', 4000); // !!! Next unit start on 4000 !!!
1154 1154
 
1155
-define('GROUP_PART',         800000);
1155
+define('GROUP_PART', 800000);
1156 1156
 // Зарезервировано для запчастей: 800.001 - 899.999
1157 1157
 // define('GROUP_PART_HULL',    801000); // Корпуса - 1000 штук
1158 1158
 // define('GROUP_PART_ARMOR',   802000); // Броня - 1000 штук
@@ -1409,32 +1409,32 @@  discard block
 block discarded – undo
1409 1409
 
1410 1410
 
1411 1411
 // define('NICK_ID',               -1);
1412
-define('NICK_HTML',              0);
1413
-
1414
-define('NICK_FIRST',             1);
1415
-define('NICK_RACE',           1000);
1416
-define('NICK_GENDER',         2000);
1417
-define('NICK_AWARD',          3000);
1418
-define('NICK_VACATION',       3500);
1419
-define('NICK_BIRTHSDAY',      4000);
1420
-define('NICK_PREMIUM',        5000);
1421
-define('NICK_AUTH_LEVEL',     6000);
1422
-
1423
-define('NICK_HIGHLIGHT',      6300);
1424
-define('NICK_CLASS',          6450);
1425
-
1426
-define('NICK_NICK_CLASS',     6600);
1427
-define('NICK_NICK',           7000);
1412
+define('NICK_HTML', 0);
1413
+
1414
+define('NICK_FIRST', 1);
1415
+define('NICK_RACE', 1000);
1416
+define('NICK_GENDER', 2000);
1417
+define('NICK_AWARD', 3000);
1418
+define('NICK_VACATION', 3500);
1419
+define('NICK_BIRTHSDAY', 4000);
1420
+define('NICK_PREMIUM', 5000);
1421
+define('NICK_AUTH_LEVEL', 6000);
1422
+
1423
+define('NICK_HIGHLIGHT', 6300);
1424
+define('NICK_CLASS', 6450);
1425
+
1426
+define('NICK_NICK_CLASS', 6600);
1427
+define('NICK_NICK', 7000);
1428 1428
 define('NICK_NICK_CLASS_END', 7300);
1429 1429
 
1430
-define('NICK_ALLY_CLASS',     7600);
1431
-define('NICK_ALLY',           8000);
1430
+define('NICK_ALLY_CLASS', 7600);
1431
+define('NICK_ALLY', 8000);
1432 1432
 define('NICK_ALLY_CLASS_END', 8300);
1433 1433
 
1434
-define('NICK_CLASS_END',      8450);
1435
-define('NICK_HIGHLIGHT_END',  8600);
1434
+define('NICK_CLASS_END', 8450);
1435
+define('NICK_HIGHLIGHT_END', 8600);
1436 1436
 
1437
-define('NICK_LAST',           9999);
1437
+define('NICK_LAST', 9999);
1438 1438
 
1439 1439
 // Настройки игрока
1440 1440
 define('PLAYER_OPTION_MENU_SORT', 1);
@@ -1527,8 +1527,8 @@  discard block
 block discarded – undo
1527 1527
 define('LOG_ONLIINE_AGGREGATE_PERIOD_MINUTE_10', 1);
1528 1528
 
1529 1529
 define('BLITZ_REGISTER_DISABLED', 0);
1530
-define('BLITZ_REGISTER_OPEN'    , 1);
1531
-define('BLITZ_REGISTER_CLOSED'  , 2);
1530
+define('BLITZ_REGISTER_OPEN', 1);
1531
+define('BLITZ_REGISTER_CLOSED', 2);
1532 1532
 define('BLITZ_REGISTER_SHOW_LOGIN', 3);
1533 1533
 define('BLITZ_REGISTER_DISCLOSURE_NAMES', 4);
1534 1534
 
Please login to merge, or discard this patch.
admin/ajax_maintenance.php 1 patch
Spacing   +25 added lines, -25 removed lines patch added patch discarded remove patch
@@ -2,9 +2,9 @@  discard block
 block discarded – undo
2 2
 
3 3
 define('IN_ADMIN', true);
4 4
 
5
-require('../includes/init.' . substr(strrchr(__FILE__, '.'), 1));
5
+require('../includes/init.'.substr(strrchr(__FILE__, '.'), 1));
6 6
 
7
-if($user['authlevel'] < 3)
7
+if ($user['authlevel'] < 3)
8 8
 {
9 9
   message(classLocale::$lang['sys_noalloaw'], classLocale::$lang['sys_noaccess']);
10 10
   die();
@@ -20,13 +20,13 @@  discard block
 block discarded – undo
20 20
 // [#] info_best_battles 1b0
21 21
 $best_reports = array();
22 22
 
23
-if(defined('MODULE_INFO_BEST_BATTLES_QUERY')) {
23
+if (defined('MODULE_INFO_BEST_BATTLES_QUERY')) {
24 24
   $query = db_ube_report_get_best_battles();
25
-  while($row = db_fetch($query)) {
25
+  while ($row = db_fetch($query)) {
26 26
     $best_reports[] = $row['ube_report_id'];
27 27
   }
28 28
 }
29
-$best_reports = !empty($best_reports) ? ' AND ube_report_id NOT IN (' . implode(',', $best_reports) . ')' : '';
29
+$best_reports = !empty($best_reports) ? ' AND ube_report_id NOT IN ('.implode(',', $best_reports).')' : '';
30 30
 
31 31
 
32 32
 $ques = array(
@@ -90,14 +90,14 @@  discard block
 block discarded – undo
90 90
   // Удаляем юниты без планет
91 91
   'DELETE un FROM {{unit}} AS un
92 92
     LEFT JOIN {{planets}} AS pl ON pl.id = un.unit_location_id
93
-  WHERE unit_location_type = ' . LOC_PLANET . ' AND pl.id IS NULL;',
93
+  WHERE unit_location_type = ' . LOC_PLANET.' AND pl.id IS NULL;',
94 94
   // Удаляем пустые юниты с 0 уровнем (кроме Капитана)
95
-  'DELETE FROM {{unit}} WHERE unit_location_type = ' . LOC_PLANET . ' AND unit_level = 0 AND unit_type <> ' . UNIT_CAPTAIN,
95
+  'DELETE FROM {{unit}} WHERE unit_location_type = '.LOC_PLANET.' AND unit_level = 0 AND unit_type <> '.UNIT_CAPTAIN,
96 96
   // Удаляем очереди на ничьих планетах
97 97
   'DELETE q FROM {{que}} AS q
98 98
     LEFT JOIN {{planets}} AS p ON p.id = q.que_planet_id
99 99
   WHERE
100
-    que_type IN (' . QUE_STRUCTURES . ', ' . QUE_HANGAR . ', ' . SUBQUE_FLEET . ', ' . SUBQUE_DEFENSE . ')
100
+    que_type IN (' . QUE_STRUCTURES.', '.QUE_HANGAR.', '.SUBQUE_FLEET.', '.SUBQUE_DEFENSE.')
101 101
     AND
102 102
     (p.id_owner = 0 OR p.id_owner IS NULL);',
103 103
 
@@ -112,12 +112,12 @@  discard block
 block discarded – undo
112 112
   // Удаляются сообщения, старше  4 недель, кроме личных и Альянсовских
113 113
   'DELETE FROM {{messages}} WHERE
114 114
     UNIX_TIMESTAMP() - message_time > 4*7 * 24 * 60 * 60 AND
115
-    message_type NOT IN (' . MSG_TYPE_PLAYER . ', ' . MSG_TYPE_ALLIANCE . ');',
115
+    message_type NOT IN (' . MSG_TYPE_PLAYER.', '.MSG_TYPE_ALLIANCE.');',
116 116
   // Удаляются сообщения у пользователей, которые неактивны больше 4 недель - кроме личных и Альянсовских
117 117
   'DELETE m FROM `{{users}}` AS u
118 118
   JOIN {{messages}} AS m ON m.message_owner = u.id
119 119
   WHERE
120
-    message_type NOT IN (' . MSG_TYPE_PLAYER . ', ' . MSG_TYPE_ALLIANCE . ') AND
120
+    message_type NOT IN (' . MSG_TYPE_PLAYER.', '.MSG_TYPE_ALLIANCE.') AND
121 121
     authlevel = 0 AND  user_as_ally IS NULL AND /* Не админы, Не Альянсы */
122 122
     UNIX_TIMESTAMP() - onlinetime > 4*7 *86400;',
123 123
 
@@ -137,7 +137,7 @@  discard block
 block discarded – undo
137 137
       (log_dark_matter_timestamp, log_dark_matter_username, log_dark_matter_reason, log_dark_matter_amount,
138 138
       log_dark_matter_comment, log_dark_matter_page, log_dark_matter_sender)
139 139
     SELECT
140
-      '{$pack_until}', IF(u.username IS NULL, ldm.log_dark_matter_username, u.username), " . RPG_CUMULATIVE . ", sum(ldm.log_dark_matter_amount),
140
+      '{$pack_until}', IF(u.username IS NULL, ldm.log_dark_matter_username, u.username), ".RPG_CUMULATIVE.", sum(ldm.log_dark_matter_amount),
141 141
       'Баланс на {$pack_until}', 'admin/ajax_maintenance.php', ldm.log_dark_matter_sender
142 142
     FROM
143 143
       {{log_dark_matter}} AS ldm
@@ -155,22 +155,22 @@  discard block
 block discarded – undo
155 155
     "REPLACE INTO `{{log_users_online}}`
156 156
       (online_timestamp, online_count, online_aggregated)
157 157
     SELECT
158
-      FROM_UNIXTIME((UNIX_TIMESTAMP(online_timestamp) DIV " . PERIOD_MINUTE_10 . ") * (" . PERIOD_MINUTE_10 . ")), ceil(avg(online_count)), " . LOG_ONLIINE_AGGREGATE_PERIOD_MINUTE_10 . "
158
+      FROM_UNIXTIME((UNIX_TIMESTAMP(online_timestamp) DIV " . PERIOD_MINUTE_10.") * (".PERIOD_MINUTE_10.")), ceil(avg(online_count)), ".LOG_ONLIINE_AGGREGATE_PERIOD_MINUTE_10."
159 159
     FROM
160 160
       `{{log_users_online}}`
161 161
     WHERE
162
-      online_timestamp < '{$pack_until}' AND online_aggregated = " . LOG_ONLIINE_AGGREGATE_NONE . "
162
+      online_timestamp < '{$pack_until}' AND online_aggregated = ".LOG_ONLIINE_AGGREGATE_NONE."
163 163
     GROUP BY
164
-      (UNIX_TIMESTAMP(online_timestamp) DIV " . PERIOD_MINUTE_10 . ") * (" . PERIOD_MINUTE_10 . ");",
164
+      (UNIX_TIMESTAMP(online_timestamp) DIV " . PERIOD_MINUTE_10.") * (".PERIOD_MINUTE_10.");",
165 165
 
166
-    "DELETE FROM {{log_users_online}} WHERE online_timestamp < '{$pack_until}' AND online_aggregated = " . LOG_ONLIINE_AGGREGATE_NONE,
166
+    "DELETE FROM {{log_users_online}} WHERE online_timestamp < '{$pack_until}' AND online_aggregated = ".LOG_ONLIINE_AGGREGATE_NONE,
167 167
   ),
168 168
 
169 169
   // Удаляем старые записи из логов
170 170
   "DELETE FROM `{{logs}}` WHERE log_timestamp < '{$pack_until}';",
171 171
   // Удаляем записи о маинтенансе, апдейте и пересчете статистики более чем недельной давности - они нам уже не нужны
172 172
   'DELETE FROM `{{logs}}` WHERE
173
-    `log_code` IN (' . LOG_INFO_DB_CHANGE . ', ' . LOG_INFO_MAINTENANCE . ', ' . LOG_INFO_STAT_START . ', ' . LOG_INFO_STAT_PROCESS . ', ' . LOG_INFO_STAT_FINISH . ')
173
+    `log_code` IN (' . LOG_INFO_DB_CHANGE.', '.LOG_INFO_MAINTENANCE.', '.LOG_INFO_STAT_START.', '.LOG_INFO_STAT_PROCESS.', '.LOG_INFO_STAT_FINISH.')
174 174
     AND `log_timestamp` < DATE_SUB(NOW(),INTERVAL 7 DAY);',
175 175
 
176 176
 
@@ -189,13 +189,13 @@  discard block
 block discarded – undo
189 189
 $old_server_status == GAME_DISABLE_NONE ? classSupernova::$config->db_saveItem('game_disable', GAME_DISABLE_MAINTENANCE) : false;
190 190
 sn_db_transaction_commit();
191 191
 
192
-foreach($ques as $que_transaction) {
192
+foreach ($ques as $que_transaction) {
193 193
   sn_db_transaction_start();
194 194
 
195 195
   !is_array($que_transaction) ? $que_transaction = array($que_transaction) : false;
196
-  foreach($que_transaction as $que) {
196
+  foreach ($que_transaction as $que) {
197 197
     set_time_limit(120);
198
-    if(is_callable($que)) {
198
+    if (is_callable($que)) {
199 199
       $QryResult = call_user_func($que);
200 200
     } else {
201 201
       $QryResult = doquery($que);
@@ -206,12 +206,12 @@  discard block
 block discarded – undo
206 206
     //$que = str_replace('}}', '', $que);
207 207
 
208 208
     $msg .=
209
-      '<li>' . htmlspecialchars($que) .
210
-        ' --- <span style="' . ($QryResult ? 'ok">OK' : 'error">FAILED!') . '</span> ' .
211
-      classSupernova::$db->db_affected_rows() . ' ' . classLocale::$lang['adm_records'] .
209
+      '<li>'.htmlspecialchars($que).
210
+        ' --- <span style="'.($QryResult ? 'ok">OK' : 'error">FAILED!').'</span> '.
211
+      classSupernova::$db->db_affected_rows().' '.classLocale::$lang['adm_records'].
212 212
       "</li>";
213 213
 
214
-    classSupernova::$debug->warning($que . ' --- ' . ($QryResult ? 'OK' : 'FAILED!') . ' ' . classSupernova::$db->db_affected_rows() . ' ' . classLocale::$lang['adm_records'], 'System maintenance', LOG_INFO_MAINTENANCE);
214
+    classSupernova::$debug->warning($que.' --- '.($QryResult ? 'OK' : 'FAILED!').' '.classSupernova::$db->db_affected_rows().' '.classLocale::$lang['adm_records'], 'System maintenance', LOG_INFO_MAINTENANCE);
215 215
   }
216 216
 
217 217
   sn_db_transaction_commit();
@@ -239,5 +239,5 @@  discard block
 block discarded – undo
239 239
 
240 240
 $adm_stat_title = classLocale::$lang['adm_stat_title'];
241 241
 $result = $result ? "<li>{$adm_stat_title} - {$result}</li>" : '';
242
-$result = '<div align="left"><ul>' . $msg . $result . '</ul></div>';
243
-echo json_encode($result . ' ' . $totaltime);
242
+$result = '<div align="left"><ul>'.$msg.$result.'</ul></div>';
243
+echo json_encode($result.' '.$totaltime);
Please login to merge, or discard this patch.
common.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -12,24 +12,24 @@  discard block
 block discarded – undo
12 12
 global $template_result, $user;
13 13
 
14 14
 // Напоминание для Администрации, что игра отключена
15
-if($template_result[F_GAME_DISABLE]) {
15
+if ($template_result[F_GAME_DISABLE]) {
16 16
   echo '<div class="global_admin_warning">', $template_result[F_GAME_DISABLE_REASON], '</div>';
17 17
 }
18 18
 unset($disable_reason);
19 19
 
20 20
 
21
-if(defined('IN_ADMIN') && IN_ADMIN === true) {
21
+if (defined('IN_ADMIN') && IN_ADMIN === true) {
22 22
   lng_include('admin');
23
-} elseif($sys_user_logged_in) {
23
+} elseif ($sys_user_logged_in) {
24 24
   sys_user_vacation($user);
25 25
 
26 26
   $planet_id = SetSelectedPlanet($user);
27 27
 
28 28
   // TODO НЕ НУЖНО АЛЬЯНС КАЖДЫЙ РАЗ ОБНОВЛЯТЬ!!!
29
-  if($user['ally_id']) {
29
+  if ($user['ally_id']) {
30 30
     sn_db_transaction_start();
31 31
     sn_ali_fill_user_ally($user);
32
-    if(!$user['ally']['player']['id']) {
32
+    if (!$user['ally']['player']['id']) {
33 33
       // sn_sys_logout(false, true);
34 34
       // core_auth::logout(false);
35 35
       classSupernova::$auth->logout(false);
@@ -37,7 +37,7 @@  discard block
 block discarded – undo
37 37
     }
38 38
     // TODO UNCOMMENT
39 39
     que_process($user['ally']['player']);
40
-    DBStaticUser::db_user_set_by_id($user['ally']['player']['id'], '`onlinetime` = ' . SN_TIME_NOW);
40
+    DBStaticUser::db_user_set_by_id($user['ally']['player']['id'], '`onlinetime` = '.SN_TIME_NOW);
41 41
     sn_db_transaction_commit();
42 42
   }
43 43
 
@@ -48,7 +48,7 @@  discard block
 block discarded – undo
48 48
   sn_db_transaction_commit();
49 49
 
50 50
   $planetrow = $global_data['planet'];
51
-  if(!($planetrow && isset($planetrow['id']) && $planetrow['id'])) {
51
+  if (!($planetrow && isset($planetrow['id']) && $planetrow['id'])) {
52 52
     // sn_sys_logout(false, true);
53 53
     // core_auth::logout(false);
54 54
     classSupernova::$auth->logout(false);
Please login to merge, or discard this patch.
admin/admin_user.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -3,22 +3,22 @@  discard block
 block discarded – undo
3 3
 define('INSIDE', true);
4 4
 define('INSTALL', false);
5 5
 define('IN_ADMIN', true);
6
-require('../common.' . substr(strrchr(__FILE__, '.'), 1));
6
+require('../common.'.substr(strrchr(__FILE__, '.'), 1));
7 7
 
8
-if($user['authlevel'] < 3) {
8
+if ($user['authlevel'] < 3) {
9 9
   AdminMessage(classLocale::$lang['adm_err_denied']);
10 10
 }
11 11
 
12 12
 lng_include('admin');
13 13
 
14 14
 $user_id = sys_get_param_id('uid');
15
-if(!($user_row = DBStaticUser::db_user_by_id($user_id))) {
15
+if (!($user_row = DBStaticUser::db_user_by_id($user_id))) {
16 16
   AdminMessage(sprintf(classLocale::$lang['adm_dm_user_none'], $user_id));
17 17
 }
18 18
 
19 19
 $template = gettemplate('admin/admin_user', true);
20 20
 
21
-if(!empty($user_row['user_last_browser_id'])) {
21
+if (!empty($user_row['user_last_browser_id'])) {
22 22
   $user_row['browser_user_agent'] = db_browser_agent_get_by_id($user_row['user_last_browser_id']);
23 23
 }
24 24
 
@@ -54,10 +54,10 @@  discard block
 block discarded – undo
54 54
     'raidsloose',
55 55
     'raidswin',
56 56
     'total_rank',
57
-    'total_points',  ),
57
+    'total_points',),
58 58
 );
59
-foreach($formats as $callable => $field_list) {
60
-  foreach($field_list as $field_name) {
59
+foreach ($formats as $callable => $field_list) {
60
+  foreach ($field_list as $field_name) {
61 61
     $user_row[$field_name] = call_user_func($callable, $user_row[$field_name]);
62 62
   }
63 63
 }
Please login to merge, or discard this patch.