Completed
Push — trunk ( 8c8cf8...dc0cf2 )
by SuperNova.WS
04:27
created
includes/template.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -288,7 +288,7 @@  discard block
 block discarded – undo
288 288
     renderFooter();
289 289
   }
290 290
 
291
-  $user['authlevel'] >= 3 && $config->debug ? $debug->echo_log() : false;;
291
+  $user['authlevel'] >= 3 && $config->debug ? $debug->echo_log() : false; ;
292 292
 
293 293
   sn_db_disconnect();
294 294
 
@@ -670,7 +670,7 @@  discard block
 block discarded – undo
670 670
     'QUE_ID'   => QUE_RESEARCH,
671 671
     'QUE_HTML' => 'topnav',
672 672
 
673
-    'RESEARCH_ONGOING' => (boolean)$user['que'],
673
+    'RESEARCH_ONGOING' => (boolean) $user['que'],
674 674
 
675 675
     'TIME_TEXT'       => sprintf($str_date_format, $time_now_parsed['year'], $lang['months'][$time_now_parsed['mon']], $time_now_parsed['mday'],
676 676
       $time_now_parsed['hours'], $time_now_parsed['minutes'], $time_now_parsed['seconds']
@@ -963,7 +963,7 @@  discard block
 block discarded – undo
963 963
     'LANG'     => $language ? $language : '',
964 964
     'referral' => $id_ref ? '&id_ref=' . $id_ref : '',
965 965
 
966
-    'REQUEST_PARAMS' => !empty($url_params) ? '?' . implode('&', $url_params) : '',// "?lang={$language}" . ($id_ref ? "&id_ref={$id_ref}" : ''),
966
+    'REQUEST_PARAMS' => !empty($url_params) ? '?' . implode('&', $url_params) : '', // "?lang={$language}" . ($id_ref ? "&id_ref={$id_ref}" : ''),
967 967
     'FILENAME'       => basename($_SERVER['PHP_SELF']),
968 968
   ));
969 969
 
Please login to merge, or discard this patch.
classes/Meta/Economic/BuildDataStatic.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -64,7 +64,7 @@
 block discarded – undo
64 64
    */
65 65
   public static function getCapitalTimeDivisor($user, $planet, $unit_id) {
66 66
     static $capitalUnitGroups;
67
-    if(empty($capitalUnitGroups)) {
67
+    if (empty($capitalUnitGroups)) {
68 68
       $capitalUnitGroups = sn_get_groups(sn_get_groups(GROUP_CAPITAL_BUILDING_BONUS_GROUPS));
69 69
     }
70 70
 
Please login to merge, or discard this patch.
classes/Fleet/FleetStatic.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -18,7 +18,7 @@
 block discarded – undo
18 18
    * @return DbMysqliResultIterator|EmptyCountableIterator
19 19
    */
20 20
   public static function dbFleetsOnHoldOnPlanetsByIds($planetIds, $time = SN_TIME_NOW) {
21
-    if(empty($planetIds) || !is_array($planetIds)) {
21
+    if (empty($planetIds) || !is_array($planetIds)) {
22 22
       return new EmptyCountableIterator();
23 23
     }
24 24
 
Please login to merge, or discard this patch.
includes/functions/eco_queue.php 1 patch
Spacing   +91 added lines, -91 removed lines patch added patch discarded remove patch
@@ -7,8 +7,8 @@  discard block
 block discarded – undo
7 7
 
8 8
 function que_get_unit_que($unit_id) {
9 9
   $que_type = false;
10
-  foreach(sn_get_groups('ques') as $que_id => $que_data) {
11
-    if(in_array($unit_id, $que_data['unit_list'])) {
10
+  foreach (sn_get_groups('ques') as $que_id => $que_data) {
11
+    if (in_array($unit_id, $que_data['unit_list'])) {
12 12
       $que_type = $que_id;
13 13
       break;
14 14
     }
@@ -21,14 +21,14 @@  discard block
 block discarded – undo
21 21
 function que_get_max_que_length($user, $planet, $que_id, $que_data = null) {
22 22
   global $config;
23 23
 
24
-  if(empty($que_data)) {
24
+  if (empty($que_data)) {
25 25
     $que_data = sn_get_groups('ques');
26 26
     $que_data = $que_data[$que_id];
27 27
   }
28 28
 
29 29
 
30 30
   $que_length = 1;
31
-  switch($que_id) {
31
+  switch ($que_id) {
32 32
     case QUE_RESEARCH:
33 33
       $que_length = $config->server_que_length_research + mrc_get_level($user, '', UNIT_PREMIUM); // TODO - вынести в модуль
34 34
     break;
@@ -42,8 +42,8 @@  discard block
 block discarded – undo
42 42
 
43 43
 function eco_que_str2arr($que_str) {
44 44
   $que_arr = explode(';', $que_str);
45
-  foreach($que_arr as $que_index => &$que_item) {
46
-    if($que_item) {
45
+  foreach ($que_arr as $que_index => &$que_item) {
46
+    if ($que_item) {
47 47
       $que_item = explode(',', $que_item);
48 48
     } else {
49 49
       unset($que_arr[$que_index]);
@@ -53,7 +53,7 @@  discard block
 block discarded – undo
53 53
 }
54 54
 
55 55
 function eco_que_arr2str($que_arr) {
56
-  foreach($que_arr as &$que_item) {
56
+  foreach ($que_arr as &$que_item) {
57 57
     $que_item = implode(',', $que_item);
58 58
   }
59 59
   return implode(';', $que_arr);
@@ -64,14 +64,14 @@  discard block
 block discarded – undo
64 64
   global $lang, $config;
65 65
 
66 66
   $is_autoconvert = false;
67
-  if($build_mode == BUILD_AUTOCONVERT || sys_get_param_int('auto_convert')) {
67
+  if ($build_mode == BUILD_AUTOCONVERT || sys_get_param_int('auto_convert')) {
68 68
     $build_mode = BUILD_CREATE;
69 69
     $is_autoconvert = true;
70 70
   }
71 71
 
72 72
   $unit_amount_qued = 0;
73 73
   try {
74
-    if(!$user['id']) {
74
+    if (!$user['id']) {
75 75
       throw new exception('{Нет идентификатора пользователя - сообщите Администрации}', ERR_ERROR); // TODO EXCEPTION
76 76
     }
77 77
 
@@ -82,16 +82,16 @@  discard block
 block discarded – undo
82 82
       foreach($unit_list as $unit_id => $unit_amount) if($unit_amount) break;
83 83
     }
84 84
     */
85
-    if(!$unit_id) {
85
+    if (!$unit_id) {
86 86
       throw new exception('{Нет идентификатора юнита - сообщите Администрации}', ERR_ERROR); // TODO EXCEPTION
87 87
     }
88 88
 
89 89
     $que_id = que_get_unit_que($unit_id);
90
-    if(!$que_id) {
90
+    if (!$que_id) {
91 91
       throw new exception('{Неправильный тип очереди - сообщите Администрации}', ERR_ERROR); // TODO EXCEPTION
92 92
     }
93 93
 
94
-    if($build_mode == BUILD_DESTROY && $que_id != QUE_STRUCTURES) {
94
+    if ($build_mode == BUILD_DESTROY && $que_id != QUE_STRUCTURES) {
95 95
       throw new exception('{Уничтожать можно только здания на планете}', ERR_ERROR); // TODO EXCEPTION
96 96
     }
97 97
 
@@ -99,11 +99,11 @@  discard block
 block discarded – undo
99 99
     $que_data = $que_data[$que_id];
100 100
 
101 101
     // TODO Переделать под подочереди
102
-    if($que_id == QUE_STRUCTURES) {
102
+    if ($que_id == QUE_STRUCTURES) {
103 103
       $sn_groups_build_allow = sn_get_groups('build_allow');
104 104
       $que_data['unit_list'] = $sn_groups_build_allow[$planet['planet_type']];
105 105
 
106
-      if(!isset($que_data['unit_list'][$unit_id])) {
106
+      if (!isset($que_data['unit_list'][$unit_id])) {
107 107
         throw new exception('{Это здание нельзя строить на ' . ($planet['planet_type'] == PT_PLANET ? 'планете' : 'луне'), ERR_ERROR); // TODO EXCEPTION
108 108
       }
109 109
     }
@@ -124,7 +124,7 @@  discard block
 block discarded – undo
124 124
     // Это нужно, что бы заблокировать пользователя и работу с очередями
125 125
     $user = db_user_by_id($user['id']);
126 126
     // Это нужно, что бы заблокировать планету от списания ресурсов
127
-    if(isset($planet['id']) && $planet['id']) {
127
+    if (isset($planet['id']) && $planet['id']) {
128 128
       $planet = DBStaticPlanet::db_planet_by_id($planet['id'], true);
129 129
     } else {
130 130
       $planet['id'] = 0;
@@ -136,17 +136,17 @@  discard block
 block discarded – undo
136 136
     $in_que = &$que['in_que'][$que_id][$user['id']][$planet_id];
137 137
     $que_max_length = que_get_max_que_length($user, $planet, $que_id, $que_data);
138 138
     // TODO Добавить вызовы функций проверок текущей и максимальной длин очередей
139
-    if(count($in_que) >= $que_max_length) {
139
+    if (count($in_que) >= $que_max_length) {
140 140
       throw new exception('{Все слоты очереди заняты}', ERR_ERROR); // TODO EXCEPTION
141 141
     }
142 142
 
143 143
     // TODO Отдельно посмотреть на уничтожение зданий - что бы можно было уничтожать их без планов
144
-    switch(eco_can_build_unit($user, $planet, $unit_id)) {
144
+    switch (eco_can_build_unit($user, $planet, $unit_id)) {
145 145
       case BUILD_ALLOWED: break;
146 146
       case BUILD_UNIT_BUSY: throw new exception('{Строение занято}', ERR_ERROR); break; // TODO EXCEPTION eco_bld_msg_err_laboratory_upgrading
147 147
       // case BUILD_REQUIRE_NOT_MEET:
148 148
       default:
149
-        if($build_mode == BUILD_CREATE) {
149
+        if ($build_mode == BUILD_CREATE) {
150 150
           throw new exception('{Требования не удовлетворены}', ERR_ERROR);
151 151
         }
152 152
         break; // TODO EXCEPTION eco_bld_msg_err_requirements_not_meet
@@ -156,14 +156,14 @@  discard block
 block discarded – undo
156 156
     $unit_amount_qued = $unit_amount;
157 157
     $units_qued = isset($in_que[$unit_id]) ? $in_que[$unit_id] : 0;
158 158
     $unit_level = mrc_get_level($user, $planet, $unit_id, true, true) + $units_qued;
159
-    if($unit_max = get_unit_param($unit_id, P_MAX_STACK)) {
160
-      if($unit_level >= $unit_max) {
159
+    if ($unit_max = get_unit_param($unit_id, P_MAX_STACK)) {
160
+      if ($unit_level >= $unit_max) {
161 161
         throw new exception('{Максимальное количество юнитов данного типа уже достигнуто или будет достигнуто по окончанию очереди}', ERR_ERROR); // TODO EXCEPTION
162 162
       }
163 163
       $unit_amount = max(0, min($unit_amount, $unit_max - $unit_level));
164 164
     }
165 165
 
166
-    if($unit_amount < 1) {
166
+    if ($unit_amount < 1) {
167 167
       throw new exception('{Неправильное количество юнитов - сообщите Администрации}', ERR_ERROR); // TODO EXCEPTION
168 168
     }
169 169
 
@@ -179,21 +179,21 @@  discard block
 block discarded – undo
179 179
     //  {
180 180
     //    die('Unit busy'); // TODO EXCEPTION
181 181
     //  }
182
-    if(get_unit_param($unit_id, P_STACKABLE)) {
182
+    if (get_unit_param($unit_id, P_STACKABLE)) {
183 183
       // TODO Поле 'max_Lot_size' для ограничения размера стэка в очереди - то ли в юниты, то ли в очередь
184
-      if(in_array($unit_id, $group_missile = sn_get_groups('missile'))) {
184
+      if (in_array($unit_id, $group_missile = sn_get_groups('missile'))) {
185 185
         // TODO Поле 'container' - указывает на родительску структуру, в которой хранится данный юнит и по вместительности которой нужно применять размер юнита
186 186
         $used_silo = 0;
187
-        foreach($group_missile as $missile_id) {
187
+        foreach ($group_missile as $missile_id) {
188 188
           $missile_qued = isset($in_que[$missile_id]) ? $in_que[$missile_id] : 0;
189 189
           $used_silo += (mrc_get_level($user, $planet, $missile_id, true, true) + $missile_qued) * get_unit_param($missile_id, P_UNIT_SIZE);
190 190
         }
191 191
         $free_silo = mrc_get_level($user, $planet, STRUC_SILO) * get_unit_param(STRUC_SILO, P_CAPACITY) - $used_silo;
192
-        if($free_silo <= 0) {
192
+        if ($free_silo <= 0) {
193 193
           throw new exception('{Ракетная шахта уже заполнена или будет заполнена по окончанию очереди}', ERR_ERROR); // TODO EXCEPTION
194 194
         }
195 195
         $unit_size = get_unit_param($unit_id, P_UNIT_SIZE);
196
-        if($free_silo < $unit_size) {
196
+        if ($free_silo < $unit_size) {
197 197
           throw new exception("{В ракетной шахте нет места для {$lang['tech'][$unit_id]}}", ERR_ERROR); // TODO EXCEPTION
198 198
         }
199 199
         $unit_amount = max(0, min($unit_amount, floor($free_silo / $unit_size)));
@@ -201,10 +201,10 @@  discard block
 block discarded – undo
201 201
       $unit_level = $new_unit_level = 0;
202 202
     } else {
203 203
       $unit_amount = 1;
204
-      if($que_id == QUE_STRUCTURES) {
204
+      if ($que_id == QUE_STRUCTURES) {
205 205
         // if($build_mode == BUILD_CREATE && eco_planet_fields_max($planet) - $planet['field_current'] - $que['sectors'][$planet['id']] <= 0)
206 206
         $sectors_qued = is_array($in_que) ? array_sum($in_que) : 0;
207
-        if($build_mode == BUILD_CREATE && eco_planet_fields_max($planet) - $planet['field_current'] - $sectors_qued <= 0)
207
+        if ($build_mode == BUILD_CREATE && eco_planet_fields_max($planet) - $planet['field_current'] - $sectors_qued <= 0)
208 208
         {
209 209
           throw new exception('{Не хватает секторов на планете}', ERR_ERROR); // TODO EXCEPTION
210 210
         }
@@ -222,9 +222,9 @@  discard block
 block discarded – undo
222 222
 
223 223
     $exchange = array();
224 224
     $market_get_autoconvert_cost = market_get_autoconvert_cost();
225
-    if($is_autoconvert && $build_data[BUILD_AUTOCONVERT]) {
225
+    if ($is_autoconvert && $build_data[BUILD_AUTOCONVERT]) {
226 226
       $dark_matter = mrc_get_level($user, null, RES_DARK_MATTER);
227
-      if(mrc_get_level($user, null, RES_DARK_MATTER) < $market_get_autoconvert_cost) {
227
+      if (mrc_get_level($user, null, RES_DARK_MATTER) < $market_get_autoconvert_cost) {
228 228
         throw new exception("{Нет хватает " . ($market_get_autoconvert_cost - $dark_matter) . "ТМ на постройки с автоконвертацией ресурсов}", ERR_ERROR); // TODO EXCEPTION
229 229
       }
230 230
 
@@ -234,7 +234,7 @@  discard block
 block discarded – undo
234 234
       $resource_exchange_rates = array();
235 235
       $resource_diff = array();
236 236
       $all_positive = true;
237
-      foreach($resources_loot as $resource_id) {
237
+      foreach ($resources_loot as $resource_id) {
238 238
         $resource_db_name = pname_resource_name($resource_id);
239 239
         $resource_got[$resource_id] = floor(mrc_get_level($user, $planet, $resource_id));
240 240
         $resource_exchange_rates[$resource_id] = $config->__get("rpg_exchange_{$resource_db_name}");
@@ -242,15 +242,15 @@  discard block
 block discarded – undo
242 242
         $all_positive = $all_positive && ($resource_diff[$resource_id] > 0);
243 243
       }
244 244
       // Нужна автоконвертация
245
-      if($all_positive) {
245
+      if ($all_positive) {
246 246
         $is_autoconvert = false;
247 247
       } else {
248
-        foreach($resource_diff as $resource_diff_id => &$resource_diff_amount) {
249
-          if($resource_diff_amount >= 0) {
248
+        foreach ($resource_diff as $resource_diff_id => &$resource_diff_amount) {
249
+          if ($resource_diff_amount >= 0) {
250 250
             continue;
251 251
           }
252
-          foreach($resource_diff as $resource_got_id => &$resource_got_amount) {
253
-            if($resource_got_amount <= 0) {
252
+          foreach ($resource_diff as $resource_got_id => &$resource_got_amount) {
253
+            if ($resource_got_amount <= 0) {
254 254
               continue;
255 255
             }
256 256
             $current_exchange = $resource_exchange_rates[$resource_got_id] / $resource_exchange_rates[$resource_diff_id];
@@ -266,14 +266,14 @@  discard block
 block discarded – undo
266 266
         }
267 267
 
268 268
         $is_autoconvert_ok = true;
269
-        foreach($resource_diff as $resource_diff_amount2) {
270
-          if($resource_diff_amount2 < 0) {
269
+        foreach ($resource_diff as $resource_diff_amount2) {
270
+          if ($resource_diff_amount2 < 0) {
271 271
             $is_autoconvert_ok = false;
272 272
             break;
273 273
           }
274 274
         }
275 275
 
276
-        if($is_autoconvert_ok) {
276
+        if ($is_autoconvert_ok) {
277 277
           $build_data['RESULT'][$build_mode] = BUILD_ALLOWED;
278 278
           $build_data['CAN'][$build_mode] = $unit_amount;
279 279
         } else {
@@ -282,19 +282,19 @@  discard block
 block discarded – undo
282 282
       }
283 283
     }
284 284
     $unit_amount = min($build_data['CAN'][$build_mode], $unit_amount);
285
-    if($unit_amount <= 0) {
285
+    if ($unit_amount <= 0) {
286 286
       throw new exception('{Не хватает ресурсов}', ERR_ERROR); // TODO EXCEPTION
287 287
     }
288 288
 
289
-    if($new_unit_level < 0) {
289
+    if ($new_unit_level < 0) {
290 290
       throw new exception('{Нельзя уничтожить больше юнитов, чем есть}', ERR_ERROR); // TODO EXCEPTION
291 291
     }
292 292
 
293
-    if($build_data['RESULT'][$build_mode] != BUILD_ALLOWED) {
293
+    if ($build_data['RESULT'][$build_mode] != BUILD_ALLOWED) {
294 294
       throw new exception('{Строительство блокировано}', ERR_ERROR); // TODO EXCEPTION
295 295
     }
296 296
 
297
-    if($is_autoconvert) {
297
+    if ($is_autoconvert) {
298 298
       ksort($exchange);
299 299
       ksort($resource_got);
300 300
       db_change_units($user, $planet, array(
@@ -309,13 +309,13 @@  discard block
 block discarded – undo
309 309
     }
310 310
 
311 311
     $unit_amount_qued = 0;
312
-    while($unit_amount > 0 && count($que['ques'][$que_id][$user['id']][$planet_id]) < $que_max_length) {
312
+    while ($unit_amount > 0 && count($que['ques'][$que_id][$user['id']][$planet_id]) < $que_max_length) {
313 313
       $place = min($unit_amount, MAX_FLEET_OR_DEFS_PER_ROW);
314 314
 //      $sqlBlock = QueUnitStatic::que_unit_make_sql($unit_id, $user, $planet, $build_data, $new_unit_level, $place, $build_mode);
315 315
       $sqlBlock = SN::$gc->pimp->que_unit_make_sql($unit_id, $user, $planet, $build_data, $new_unit_level, $place, $build_mode);
316 316
 
317
-      array_walk($sqlBlock, function (&$value, $field) {
318
-        if($value === null) {
317
+      array_walk($sqlBlock, function(&$value, $field) {
318
+        if ($value === null) {
319 319
           $value = 'NULL';
320 320
         } elseif (is_string($value)) {
321 321
           $value = "'{$value}'";
@@ -346,7 +346,7 @@  discard block
 block discarded – undo
346 346
 
347 347
     sn_db_transaction_commit();
348 348
 
349
-    if($redirect) {
349
+    if ($redirect) {
350 350
       sys_redirect("{$_SERVER['PHP_SELF']}?mode=" . sys_get_param_str('mode') . "&ally_id=" . sys_get_param_id('ally_id'));
351 351
     }
352 352
 
@@ -354,7 +354,7 @@  discard block
 block discarded – undo
354 354
       'STATUS'  => ERR_NONE,
355 355
       'MESSAGE' => '{Строительство начато}',
356 356
     );
357
-  } catch(exception $e) {
357
+  } catch (exception $e) {
358 358
     sn_db_transaction_rollback();
359 359
     $operation_result = array(
360 360
       'STATUS'  => in_array($e->getCode(), array(ERR_NONE, ERR_WARNING, ERR_ERROR)) ? $e->getCode() : ERR_ERROR,
@@ -362,7 +362,7 @@  discard block
 block discarded – undo
362 362
     );
363 363
   }
364 364
 
365
-  if(!empty($operation_result['MESSAGE'])) {
365
+  if (!empty($operation_result['MESSAGE'])) {
366 366
     $operation_result['MESSAGE'] .= ' ' . ($unit_amount_qued ? $unit_amount_qued : $unit_amount) . 'x[' . $lang['tech'][$unit_id] . ']';
367 367
   }
368 368
 
@@ -376,11 +376,11 @@  discard block
 block discarded – undo
376 376
 function que_recalculate($old_que) {
377 377
   $new_que = array();
378 378
 
379
-  if(!is_array($old_que['items'])) {
379
+  if (!is_array($old_que['items'])) {
380 380
     return $new_que;
381 381
   }
382
-  foreach($old_que['items'] as $row) {
383
-    if(!isset($row) || !$row || $row['que_unit_amount'] <= 0) {
382
+  foreach ($old_que['items'] as $row) {
383
+    if (!isset($row) || !$row || $row['que_unit_amount'] <= 0) {
384 384
       continue;
385 385
     }
386 386
 
@@ -391,9 +391,9 @@  discard block
 block discarded – undo
391 391
 
392 392
     $last_id = count($new_que['items']) - 1;
393 393
 
394
-    if($row['que_planet_id']) {
394
+    if ($row['que_planet_id']) {
395 395
       $new_que['planets'][$row['que_planet_id']][$row['que_type']][] = &$new_que['items'][$last_id];
396
-    } elseif($row['que_type'] == QUE_RESEARCH) {
396
+    } elseif ($row['que_type'] == QUE_RESEARCH) {
397 397
       $new_que['players'][$row['que_player_id']][$row['que_type']][] = &$new_que['items'][$last_id];
398 398
     }
399 399
     $new_que['ques'][$row['que_type']][$row['que_player_id']][intval($row['que_planet_id'])][] = &$new_que['items'][$last_id];
@@ -418,17 +418,17 @@  discard block
 block discarded – undo
418 418
   $planet['id'] = $planet['id'] && $que_type !== QUE_RESEARCH ? $planet['id'] : 0;
419 419
   $global_que = que_get($user['id'], $planet['id'], $que_type, true);
420 420
 
421
-  if(!empty($global_que['ques'][$que_type][$user['id']][$planet['id']])) {
421
+  if (!empty($global_que['ques'][$que_type][$user['id']][$planet['id']])) {
422 422
     $que = array_reverse($global_que['ques'][$que_type][$user['id']][$planet['id']]);
423 423
 
424
-    foreach($que as $que_item) {
424
+    foreach ($que as $que_item) {
425 425
       DBStaticQue::db_que_delete_by_id($que_item['que_id']);
426 426
 
427
-      if($que_item['que_planet_id_origin']) {
427
+      if ($que_item['que_planet_id_origin']) {
428 428
         $planet['id'] = $que_item['que_planet_id_origin'];
429 429
       }
430 430
 
431
-      if(!isset($planets_locked[$planet['id']])) {
431
+      if (!isset($planets_locked[$planet['id']])) {
432 432
         $planets_locked[$planet['id']] = $planet['id'] ? DBStaticPlanet::db_planet_by_id($planet['id'], true) : $planet;
433 433
       }
434 434
 
@@ -440,15 +440,15 @@  discard block
 block discarded – undo
440 440
         RES_DEUTERIUM => $build_data[RES_DEUTERIUM] * $que_item['que_unit_amount'],
441 441
       ));
442 442
 
443
-      if(!$clear) {
443
+      if (!$clear) {
444 444
         break;
445 445
       }
446 446
     }
447 447
 
448
-    if(is_numeric($planet['id'])) {
448
+    if (is_numeric($planet['id'])) {
449 449
       DBStaticPlanet::db_planet_set_by_id($planet['id'], "`que_processed` = UNIX_TIMESTAMP(NOW())");
450 450
     }
451
-    elseif(is_numeric($user['id'])) {
451
+    elseif (is_numeric($user['id'])) {
452 452
       db_user_set_by_id($user['id'], '`que_processed` = UNIX_TIMESTAMP(NOW())');
453 453
     }
454 454
 
@@ -493,21 +493,21 @@  discard block
 block discarded – undo
493 493
   // TODO: Переделать для $que_type === false
494 494
   $planet['id'] = $planet['id'] ? $planet['id'] : 0;
495 495
 
496
-  if(!is_array($que)) {
496
+  if (!is_array($que)) {
497 497
     $que = que_get($user['id'], $planet['id'], $que_type);
498 498
   }
499 499
 
500
-  if(is_array($que) && isset($que['items'])) {
500
+  if (is_array($que) && isset($que['items'])) {
501 501
     $que = $que['ques'][$que_type][$user['id']][$planet['id']];
502 502
   }
503 503
 
504
-  if($que) {
505
-    foreach($que as $que_element) {
504
+  if ($que) {
505
+    foreach ($que as $que_element) {
506 506
       $template->assign_block_vars('que', que_tpl_parse_element($que_element, $short_names));
507 507
     }
508 508
   }
509 509
 
510
-  if($que_type == QUE_RESEARCH) {
510
+  if ($que_type == QUE_RESEARCH) {
511 511
     // TODO Исправить
512 512
 //    $template->assign_var('RESEARCH_ONGOING', count($global_que[QUE_RESEARCH][0]) >= $config->server_que_length_research);
513 513
   }
@@ -535,7 +535,7 @@  discard block
 block discarded – undo
535 535
   $user = db_user_by_id($user['id'], true);
536 536
 
537 537
   $time_left[$user['id']][0] = max(0, $on_time - $user['que_processed']);
538
-  if($planet === null && !$time_left[$user['id']][0]) {
538
+  if ($planet === null && !$time_left[$user['id']][0]) {
539 539
     // TODO
540 540
     return $que;
541 541
   }
@@ -544,12 +544,12 @@  discard block
 block discarded – undo
544 544
   $que_type_id = $planet === null ? QUE_RESEARCH : false;
545 545
   $planet = intval(is_array($planet) ? $planet['id'] : $planet); // В $planet у нас теперь только её ID или шаблон null/0/false
546 546
   $que = que_get($user['id'], $planet, $que_type_id, true);
547
-  if(empty($que['items'])) {
547
+  if (empty($que['items'])) {
548 548
     return $que;
549 549
   }
550 550
 
551 551
   $planet_list = array();
552
-  if($planet !== null) {
552
+  if ($planet !== null) {
553 553
     // Если нужно изменять данные на планетах - блокируем планеты и получаем данные о них
554 554
     // TODO - от них не надо ничего, кроме ID и que_processed
555 555
     $planet_row = DBStaticPlanet::db_planet_list_by_user_or_planet($user['id'], $planet);
@@ -558,21 +558,21 @@  discard block
 block discarded – undo
558 558
   }
559 559
 
560 560
   // Теперь в $time_left лежит время обсчета всех очередей по каждой из планеты
561
-  if(array_sum($time_left[$user['id']]) == 0) {
561
+  if (array_sum($time_left[$user['id']]) == 0) {
562 562
     return $que;
563 563
   }
564 564
 
565 565
   $db_changeset = array();
566 566
   $unit_changes = array();
567
-  foreach($que['items'] as &$que_item) {
567
+  foreach ($que['items'] as &$que_item) {
568 568
     $que_player_id = &$que_item['que_player_id'];
569 569
     $que_planet_id = intval($que_item['que_planet_id']);
570 570
 
571 571
     $que_time_left = &$que['time_left'][$que_player_id][$que_planet_id][$que_item['que_type']];
572
-    if(!isset($que_time_left)) {
572
+    if (!isset($que_time_left)) {
573 573
       $que_time_left = $time_left[$que_player_id][$que_planet_id];
574 574
     }
575
-    if($que_time_left <= 0 || $que_item['que_unit_amount'] <= 0) {
575
+    if ($que_time_left <= 0 || $que_item['que_unit_amount'] <= 0) {
576 576
       continue;
577 577
     }
578 578
     // Дальше мы идем, если только осталось время в очереди И юниты к постройке
@@ -585,7 +585,7 @@  discard block
 block discarded – undo
585 585
     // Теперь работаем с остатком времени на юните. Оно не может быть равно или меньше нуля
586 586
 
587 587
     // Если времени в очереди осталось не меньше, чем время текущего юнита - значит мы достроили юнит
588
-    if($que_time_left >= $que_item['que_time_left']) {
588
+    if ($que_time_left >= $que_item['que_time_left']) {
589 589
       // Увеличиваем количество отстроенных юнитов
590 590
       $unit_processed++;
591 591
       // Вычитаем из времени очереди потраченное на постройку время
@@ -598,12 +598,12 @@  discard block
 block discarded – undo
598 598
     $que_item['que_unit_amount'] -= $unit_processed;
599 599
 
600 600
     // Если еще остались юниты - значит ВСЁ оставшееся время приходится на достройку следующего юнита
601
-    if($que_item['que_unit_amount'] > 0) {
601
+    if ($que_item['que_unit_amount'] > 0) {
602 602
       $que_item['que_time_left'] = $que_item['que_time_left'] - $que_time_left;
603 603
       $que_time_left = 0;
604 604
     }
605 605
 
606
-    if($que_item['que_unit_amount'] <= 0) {
606
+    if ($que_item['que_unit_amount'] <= 0) {
607 607
       $db_changeset['que'][] = array(
608 608
         'action' => SQL_OP_DELETE,
609 609
         P_VERSION => 1,
@@ -629,14 +629,14 @@  discard block
 block discarded – undo
629 629
       );
630 630
     }
631 631
 
632
-    if($unit_processed) {
632
+    if ($unit_processed) {
633 633
       $unit_processed_delta = $unit_processed * ($que_item['que_unit_mode'] == BUILD_CREATE ? 1 : -1);
634 634
       $unit_changes[$que_player_id][$que_planet_id][$que_item['que_unit_id']] += $unit_processed_delta;
635 635
     }
636 636
   }
637 637
 
638
-  foreach($time_left as $player_id => $planet_data) {
639
-    foreach($planet_data as $planet_id => $time_on_planet) {
638
+  foreach ($time_left as $player_id => $planet_data) {
639
+    foreach ($planet_data as $planet_id => $time_on_planet) {
640 640
       $table = $planet_id ? 'planets' : 'users';
641 641
       $id = $planet_id ? $planet_id : $player_id;
642 642
       $db_changeset[$table][] = array(
@@ -652,8 +652,8 @@  discard block
 block discarded – undo
652 652
         ),
653 653
       );
654 654
 
655
-      if(is_array($unit_changes[$player_id][$planet_id])) {
656
-        foreach($unit_changes[$player_id][$planet_id] as $unit_id => $unit_amount) {
655
+      if (is_array($unit_changes[$player_id][$planet_id])) {
656
+        foreach ($unit_changes[$player_id][$planet_id] as $unit_id => $unit_amount) {
657 657
           $db_changeset['unit'][] = OldDbChangeSet::db_changeset_prepare_unit($unit_id, $unit_amount, $user, $planet_id ? $planet_id : null);
658 658
         }
659 659
       }
@@ -663,7 +663,7 @@  discard block
 block discarded – undo
663 663
   $que = que_recalculate($que);
664 664
 
665 665
   // TODO: Re-enable quests for Alliances
666
-  if(!empty($unit_changes) && !$user['user_as_ally']) {
666
+  if (!empty($unit_changes) && !$user['user_as_ally']) {
667 667
     $quest_list = qst_get_quests($user['id'], QUEST_STATUS_ALL);
668 668
     $quest_triggers = qst_active_triggers($quest_list);
669 669
     $quest_rewards = array();
@@ -671,26 +671,26 @@  discard block
 block discarded – undo
671 671
 
672 672
 
673 673
     $xp_incoming = array();
674
-    foreach($unit_changes as $user_id => $planet_changes) {
675
-      foreach($planet_changes as $planet_id => $changes) {
674
+    foreach ($unit_changes as $user_id => $planet_changes) {
675
+      foreach ($planet_changes as $planet_id => $changes) {
676 676
         $planet_this = $planet_id ? SN::db_get_record_by_id(LOC_PLANET, $planet_id) : array();
677
-        foreach($changes as $unit_id => $unit_value) {
677
+        foreach ($changes as $unit_id => $unit_value) {
678 678
           $que_id = que_get_unit_que($unit_id);
679 679
           $unit_level_new = mrc_get_level($user, $planet_this, $unit_id, false, true) + $unit_value;
680
-          if($que_id == QUE_STRUCTURES || $que_id == QUE_RESEARCH) {
680
+          if ($que_id == QUE_STRUCTURES || $que_id == QUE_RESEARCH) {
681 681
             $build_data = eco_get_build_data($user, $planet_this, $unit_id, $unit_level_new - 1);
682 682
             $build_data = $build_data[BUILD_CREATE];
683
-            foreach(sn_get_groups('resources_loot') as $resource_id) {
683
+            foreach (sn_get_groups('resources_loot') as $resource_id) {
684 684
               $xp_incoming[$que_id] += $build_data[$resource_id]; // TODO - добавить конверсию рейтов обмена
685 685
             }
686 686
           }
687 687
 
688
-          if(is_array($quest_triggers)) {
688
+          if (is_array($quest_triggers)) {
689 689
             // TODO: Check mutiply condition quests
690 690
             $quest_trigger_list = array_keys($quest_triggers, $unit_id);
691 691
 
692
-            if(is_array($quest_trigger_list)) {
693
-              foreach($quest_trigger_list as $quest_id) {
692
+            if (is_array($quest_trigger_list)) {
693
+              foreach ($quest_trigger_list as $quest_id) {
694 694
                 if ($quest_list[$quest_id]['quest_status_status'] != QUEST_STATUS_COMPLETE) {
695 695
                   if ($quest_list[$quest_id]['quest_unit_amount'] <= $unit_level_new) {
696 696
                     $quest_rewards[$quest_id][$user_id][$planet_id] = $quest_list[$quest_id]['quest_rewards_list'];
@@ -708,7 +708,7 @@  discard block
 block discarded – undo
708 708
     // TODO: Изменить начисление награды за квесты на ту планету, на которой происходил ресеч
709 709
     qst_reward($user, $quest_rewards, $quest_list, $quest_statuses);
710 710
 
711
-    foreach($xp_incoming as $que_id => $xp) {
711
+    foreach ($xp_incoming as $que_id => $xp) {
712 712
       rpg_level_up($user, $que_id == QUE_RESEARCH ? RPG_TECH : RPG_STRUCTURE, $xp / 1000);
713 713
     }
714 714
   }
Please login to merge, or discard this patch.
includes/functions/eco_get_build_data.php 2 patches
Spacing   +30 added lines, -30 removed lines patch added patch discarded remove patch
@@ -16,13 +16,13 @@  discard block
 block discarded – undo
16 16
  */
17 17
 function eco_get_lab_max_effective_level(&$user, $lab_require)
18 18
 {
19
-  if(!$user['user_as_ally'] && !isset($user['laboratories_active']))
19
+  if (!$user['user_as_ally'] && !isset($user['laboratories_active']))
20 20
   {
21 21
     $user['laboratories_active'] = array();
22 22
     $query = DBStaticUnit::db_unit_list_laboratories($user['id']);
23
-    while($row = db_fetch($query))
23
+    while ($row = db_fetch($query))
24 24
     {
25
-      if(!eco_unit_busy($user, $row, UNIT_TECHNOLOGIES))
25
+      if (!eco_unit_busy($user, $row, UNIT_TECHNOLOGIES))
26 26
       {
27 27
         $row += array(
28 28
           STRUC_LABORATORY => $level_lab = mrc_get_level($user, $row, STRUC_LABORATORY),
@@ -36,9 +36,9 @@  discard block
 block discarded – undo
36 36
     uasort($user['laboratories_active'], 'eco_lab_sort_effectivness');
37 37
   }
38 38
 
39
-  if(!isset($user['research_effective_level'][$lab_require]))
39
+  if (!isset($user['research_effective_level'][$lab_require]))
40 40
   {
41
-    if($user['user_as_ally'])
41
+    if ($user['user_as_ally'])
42 42
     {
43 43
       $lab_level = doquery("SELECT ally_members AS effective_level FROM {{alliance}} WHERE id = {$user['user_as_ally']} LIMIT 1", true);
44 44
     }
@@ -47,13 +47,13 @@  discard block
 block discarded – undo
47 47
       $tech_intergalactic = mrc_get_level($user, false, TECH_RESEARCH) + 1;
48 48
       $lab_level['effective_level'] = 0;
49 49
 
50
-      foreach($user['laboratories_active'] as $data)
50
+      foreach ($user['laboratories_active'] as $data)
51 51
       {
52
-        if($tech_intergalactic <= 0)
52
+        if ($tech_intergalactic <= 0)
53 53
         {
54 54
           break;
55 55
         }
56
-        if($data[STRUC_LABORATORY] >= $lab_require)
56
+        if ($data[STRUC_LABORATORY] >= $lab_require)
57 57
         {
58 58
           $lab_level['effective_level'] += $data['laboratory_effective_level'];
59 59
           $tech_intergalactic--;
@@ -93,8 +93,8 @@  discard block
 block discarded – undo
93 93
   $cost[P_OPTIONS][P_TIME_RAW] = 0;
94 94
   $only_dark_matter = 0;
95 95
   $cost_in_metal = 0;
96
-  foreach($unit_data[P_COST] as $resource_id => $resource_amount) {
97
-    if($resource_id === P_FACTOR || !($resource_cost = $resource_amount * $price_increase)) {
96
+  foreach ($unit_data[P_COST] as $resource_id => $resource_amount) {
97
+    if ($resource_id === P_FACTOR || !($resource_cost = $resource_amount * $price_increase)) {
98 98
       continue;
99 99
     }
100 100
 
@@ -105,12 +105,12 @@  discard block
 block discarded – undo
105 105
 
106 106
     $cost_in_metal += $cost[BUILD_CREATE][$resource_id] * $currentResourceExchange;
107 107
 
108
-    if(in_array($resource_id, $resources_loot)) {
108
+    if (in_array($resource_id, $resources_loot)) {
109 109
       $cost[P_OPTIONS][P_TIME_RAW] += $resource_cost * $currentResourceExchange / $rpg_exchange_deuterium;
110 110
       $resource_got = mrc_get_level($user, $planet, $resource_id);
111
-    } elseif($resource_id == RES_DARK_MATTER) {
111
+    } elseif ($resource_id == RES_DARK_MATTER) {
112 112
       $resource_got = mrc_get_level($user, null, $resource_id);
113
-    } elseif($resource_id == RES_ENERGY) {
113
+    } elseif ($resource_id == RES_ENERGY) {
114 114
       $resource_got = max(0, $planet['energy_max'] - $planet['energy_used']);
115 115
     } else {
116 116
       $resource_got = 0;
@@ -122,7 +122,7 @@  discard block
 block discarded – undo
122 122
   }
123 123
 
124 124
   $resources_normalized = 0;
125
-  foreach($resources_loot as $resource_id) {
125
+  foreach ($resources_loot as $resource_id) {
126 126
     $resources_normalized += floor(mrc_get_level($user, $planet, $resource_id)) * $config->__get('rpg_exchange_' . pname_resource_name($resource_id));
127 127
   }
128 128
 
@@ -138,7 +138,7 @@  discard block
 block discarded – undo
138 138
   $cost[P_OPTIONS][P_TIME_RAW] = $cost[P_OPTIONS][P_TIME_RAW] * 60 * 60 / get_game_speed() / 2500;
139 139
 
140 140
   // TODO - Вынести в отдельную процедуру расчёт стоимости
141
-  if($only_cost) {
141
+  if ($only_cost) {
142 142
     return $cost;
143 143
   }
144 144
 
@@ -164,7 +164,7 @@  discard block
 block discarded – undo
164 164
         : BUILD_NO_UNITS;
165 165
   }
166 166
 
167
-  if(in_array($unit_id, sn_get_groups('governors')) || $only_dark_matter) {
167
+  if (in_array($unit_id, sn_get_groups('governors')) || $only_dark_matter) {
168 168
     $cost[RES_TIME][BUILD_CREATE] = $cost[RES_TIME][BUILD_DESTROY] = 0;
169 169
   } else {
170 170
     $cost[RES_TIME][BUILD_CREATE]  = $cost[RES_TIME][BUILD_CREATE] > 1 ? ceil($cost[RES_TIME][BUILD_CREATE]) : 1;
@@ -174,7 +174,7 @@  discard block
 block discarded – undo
174 174
   return $cost;
175 175
 }
176 176
 
177
-function eco_can_build_unit($user, $planet, $unit_id){$result = null;return sn_function_call('eco_can_build_unit', array($user, $planet, $unit_id, &$result));}
177
+function eco_can_build_unit($user, $planet, $unit_id) {$result = null; return sn_function_call('eco_can_build_unit', array($user, $planet, $unit_id, &$result)); }
178 178
 function sn_eco_can_build_unit($user, $planet, $unit_id, &$result) {
179 179
   global $config;
180 180
 
@@ -182,11 +182,11 @@  discard block
 block discarded – undo
182 182
   $result = $result == BUILD_ALLOWED && eco_unit_busy($user, $planet, $unit_id) ? BUILD_UNIT_BUSY : $result;
183 183
 
184 184
   $unit_param = get_unit_param($unit_id);
185
-  if($unit_param[P_UNIT_TYPE] != UNIT_MERCENARIES || !$config->empire_mercenary_temporary) {
185
+  if ($unit_param[P_UNIT_TYPE] != UNIT_MERCENARIES || !$config->empire_mercenary_temporary) {
186 186
     $requirement = &$unit_param[P_REQUIRE];
187
-    if($result == BUILD_ALLOWED && $requirement) {
188
-      foreach($requirement as $require_id => $require_level) {
189
-        if(mrc_get_level($user, $planet, $require_id) < $require_level) {
187
+    if ($result == BUILD_ALLOWED && $requirement) {
188
+      foreach ($requirement as $require_id => $require_level) {
189
+        if (mrc_get_level($user, $planet, $require_id) < $require_level) {
190 190
           $result = BUILD_REQUIRE_NOT_MEET;
191 191
           break;
192 192
         }
@@ -203,12 +203,12 @@  discard block
 block discarded – undo
203 203
 
204 204
   $unit_list = is_array($unit_list) ? $unit_list : array($unit_list => $unit_list);
205 205
   $planet_que = explode(';', $planet_que);
206
-  foreach($planet_que as $planet_que_item)
206
+  foreach ($planet_que as $planet_que_item)
207 207
   {
208
-    if($planet_que_item)
208
+    if ($planet_que_item)
209 209
     {
210 210
       list($planet_que_item) = explode(',', $planet_que_item);
211
-      if(in_array($planet_que_item, $unit_list))
211
+      if (in_array($planet_que_item, $unit_list))
212 212
       {
213 213
         $eco_is_builds_in_que = true;
214 214
         break;
@@ -219,21 +219,21 @@  discard block
 block discarded – undo
219 219
   return $eco_is_builds_in_que;
220 220
 }
221 221
 
222
-function eco_unit_busy(&$user, &$planet, $unit_id){$result = null;return sn_function_call('eco_unit_busy', [&$user, &$planet, $unit_id, &$result]);}
222
+function eco_unit_busy(&$user, &$planet, $unit_id) {$result = null; return sn_function_call('eco_unit_busy', [&$user, &$planet, $unit_id, &$result]); }
223 223
 function sn_eco_unit_busy(&$user, &$planet, $unit_id, &$result)
224 224
 {
225 225
   global $config;
226 226
 
227 227
   $result = isset($result) ? $result : false;
228
-  if(!$result)
228
+  if (!$result)
229 229
   {
230
-    if(($unit_id == STRUC_LABORATORY || $unit_id == STRUC_LABORATORY_NANO) && !$config->BuildLabWhileRun)
230
+    if (($unit_id == STRUC_LABORATORY || $unit_id == STRUC_LABORATORY_NANO) && !$config->BuildLabWhileRun)
231 231
     {
232 232
       $global_que = que_get($user['id'], $planet['id'], QUE_RESEARCH, false);
233
-      if(is_array($global_que['ques'][QUE_RESEARCH][$user['id']]))
233
+      if (is_array($global_que['ques'][QUE_RESEARCH][$user['id']]))
234 234
       {
235 235
         $first_element = reset($global_que['ques'][QUE_RESEARCH][$user['id']]);
236
-        if(is_array($first_element))
236
+        if (is_array($first_element))
237 237
         {
238 238
           $result = true;
239 239
         }
@@ -243,7 +243,7 @@  discard block
 block discarded – undo
243 243
       //  $result = true;
244 244
       //}
245 245
     }
246
-    elseif(($unit_id == UNIT_TECHNOLOGIES || in_array($unit_id, sn_get_groups('tech'))) && !$config->BuildLabWhileRun && $planet['que'])
246
+    elseif (($unit_id == UNIT_TECHNOLOGIES || in_array($unit_id, sn_get_groups('tech'))) && !$config->BuildLabWhileRun && $planet['que'])
247 247
     {
248 248
       $result = eco_is_builds_in_que($planet['que'], array(STRUC_LABORATORY, STRUC_LABORATORY_NANO));
249 249
     }
Please login to merge, or discard this patch.
Braces   +6 added lines, -12 removed lines patch added patch discarded remove patch
@@ -3,8 +3,7 @@  discard block
 block discarded – undo
3 3
 use Meta\Economic\BuildDataStatic;
4 4
 use Unit\DBStaticUnit;
5 5
 
6
-function eco_lab_sort_effectivness($a, $b)
7
-{
6
+function eco_lab_sort_effectivness($a, $b) {
8 7
   return $a['laboratory_effective_level'] > $b['laboratory_effective_level'] ? -1 : ($a['laboratory_effective_level'] < $b['laboratory_effective_level'] ? 1 : 0);
9 8
 }
10 9
 
@@ -14,8 +13,7 @@  discard block
 block discarded – undo
14 13
  * 1.0 - copyright (c) 2010 by Gorlum for http://supernova.ws
15 14
  * @version 1.0
16 15
  */
17
-function eco_get_lab_max_effective_level(&$user, $lab_require)
18
-{
16
+function eco_get_lab_max_effective_level(&$user, $lab_require) {
19 17
   if(!$user['user_as_ally'] && !isset($user['laboratories_active']))
20 18
   {
21 19
     $user['laboratories_active'] = array();
@@ -41,8 +39,7 @@  discard block
 block discarded – undo
41 39
     if($user['user_as_ally'])
42 40
     {
43 41
       $lab_level = doquery("SELECT ally_members AS effective_level FROM {{alliance}} WHERE id = {$user['user_as_ally']} LIMIT 1", true);
44
-    }
45
-    else
42
+    } else
46 43
     {
47 44
       $tech_intergalactic = mrc_get_level($user, false, TECH_RESEARCH) + 1;
48 45
       $lab_level['effective_level'] = 0;
@@ -197,8 +194,7 @@  discard block
 block discarded – undo
197 194
   return $result;
198 195
 }
199 196
 
200
-function eco_is_builds_in_que($planet_que, $unit_list)
201
-{
197
+function eco_is_builds_in_que($planet_que, $unit_list) {
202 198
   $eco_is_builds_in_que = false;
203 199
 
204 200
   $unit_list = is_array($unit_list) ? $unit_list : array($unit_list => $unit_list);
@@ -220,8 +216,7 @@  discard block
 block discarded – undo
220 216
 }
221 217
 
222 218
 function eco_unit_busy(&$user, &$planet, $unit_id){$result = null;return sn_function_call('eco_unit_busy', [&$user, &$planet, $unit_id, &$result]);}
223
-function sn_eco_unit_busy(&$user, &$planet, $unit_id, &$result)
224
-{
219
+function sn_eco_unit_busy(&$user, &$planet, $unit_id, &$result) {
225 220
   global $config;
226 221
 
227 222
   $result = isset($result) ? $result : false;
@@ -242,8 +237,7 @@  discard block
 block discarded – undo
242 237
       //{
243 238
       //  $result = true;
244 239
       //}
245
-    }
246
-    elseif(($unit_id == UNIT_TECHNOLOGIES || in_array($unit_id, sn_get_groups('tech'))) && !$config->BuildLabWhileRun && $planet['que'])
240
+    } elseif(($unit_id == UNIT_TECHNOLOGIES || in_array($unit_id, sn_get_groups('tech'))) && !$config->BuildLabWhileRun && $planet['que'])
247 241
     {
248 242
       $result = eco_is_builds_in_que($planet['que'], array(STRUC_LABORATORY, STRUC_LABORATORY_NANO));
249 243
     }
Please login to merge, or discard this patch.
includes/constants.php 1 patch
Spacing   +249 added lines, -249 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 
3
-if(defined('__SN_CONSTANTS_DEFINED') && __SN_CONSTANTS_DEFINED === true) {
3
+if (defined('__SN_CONSTANTS_DEFINED') && __SN_CONSTANTS_DEFINED === true) {
4 4
   return;
5 5
 }
6 6
 
@@ -42,7 +42,7 @@  discard block
 block discarded – undo
42 42
 define('SN_ROOT_VIRTUAL', 'http' . (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on' ? 's' : '') . '://' . $_server_http_host . SN_ROOT_RELATIVE);
43 43
 
44 44
 $_server_server_name = isset($_SERVER['SERVER_NAME']) ? $_SERVER['SERVER_NAME'] : '';
45
-if(strpos(strtolower($_server_server_name), 'google.') !== false) {
45
+if (strpos(strtolower($_server_server_name), 'google.') !== false) {
46 46
   define('SN_GOOGLE', true);
47 47
 }
48 48
 define('SN_ROOT_VIRTUAL_PARENT', str_replace('//google.', '//', SN_ROOT_VIRTUAL));
@@ -63,8 +63,8 @@  discard block
 block discarded – undo
63 63
 
64 64
 // Game type constants starts with GAME_
65 65
 define('GAME_SUPERNOVA', 0);
66
-define('GAME_OGAME'    , 1);
67
-define('GAME_BLITZ'    , 2);
66
+define('GAME_OGAME', 1);
67
+define('GAME_BLITZ', 2);
68 68
 
69 69
 // Date & time range constants
70 70
 define('DATE_FOREVER', 2000000000);
@@ -77,16 +77,16 @@  discard block
 block discarded – undo
77 77
 define('PERIOD_YEAR', PERIOD_DAY * 365);
78 78
 define('PERIOD_FOREVER', PERIOD_YEAR * 100);
79 79
 
80
-define('PERIOD_MINUTE_2' , PERIOD_MINUTE * 2);
81
-define('PERIOD_MINUTE_3' , PERIOD_MINUTE * 3);
82
-define('PERIOD_MINUTE_5' , PERIOD_MINUTE * 5);
80
+define('PERIOD_MINUTE_2', PERIOD_MINUTE * 2);
81
+define('PERIOD_MINUTE_3', PERIOD_MINUTE * 3);
82
+define('PERIOD_MINUTE_5', PERIOD_MINUTE * 5);
83 83
 define('PERIOD_MINUTE_10', PERIOD_MINUTE * 10);
84 84
 define('PERIOD_MINUTE_15', PERIOD_MINUTE * 15);
85
-define('PERIOD_DAY_3'    , PERIOD_DAY * 3);
86
-define('PERIOD_WEEK_2'   , PERIOD_WEEK * 2);
87
-define('PERIOD_WEEK_4'   , PERIOD_WEEK * 4);
88
-define('PERIOD_MONTH_2'  , PERIOD_MONTH * 2);
89
-define('PERIOD_MONTH_3'  , PERIOD_MONTH * 3);
85
+define('PERIOD_DAY_3', PERIOD_DAY * 3);
86
+define('PERIOD_WEEK_2', PERIOD_WEEK * 2);
87
+define('PERIOD_WEEK_4', PERIOD_WEEK * 4);
88
+define('PERIOD_MONTH_2', PERIOD_MONTH * 2);
89
+define('PERIOD_MONTH_3', PERIOD_MONTH * 3);
90 90
 
91 91
 define('FONT_SIZE_PERCENT_MIN', 56.25);
92 92
 define('FONT_SIZE_PERCENT_DEFAULT', 68.75);
@@ -141,38 +141,38 @@  discard block
 block discarded – undo
141 141
 
142 142
 // Mot qui sont interdit a la saisie !
143 143
 global $ListCensure;
144
-$ListCensure = array ( '/</', '/>/', '/script/i', '/doquery/i', '/http/i', '/javascript/i');
144
+$ListCensure = array('/</', '/>/', '/script/i', '/doquery/i', '/http/i', '/javascript/i');
145 145
 
146 146
 // Confirmation record types
147
-define('CONFIRM_REGISTRATION'  , 1);
147
+define('CONFIRM_REGISTRATION', 1);
148 148
 define('CONFIRM_PASSWORD_RESET', 2);
149
-define('CONFIRM_DELETE'        , 3);
149
+define('CONFIRM_DELETE', 3);
150 150
 
151 151
 define('AFFILIATE_MM_TO_REFERRAL_DM', 2);
152 152
 
153 153
 // Ally diplomacy statuses
154
-define('ALLY_DIPLOMACY_SELF'         , 'self');
155
-define('ALLY_DIPLOMACY_NEUTRAL'      , 'neutral');
156
-define('ALLY_DIPLOMACY_WAR'          , 'war');
157
-define('ALLY_DIPLOMACY_PEACE'        , 'peace');
154
+define('ALLY_DIPLOMACY_SELF', 'self');
155
+define('ALLY_DIPLOMACY_NEUTRAL', 'neutral');
156
+define('ALLY_DIPLOMACY_WAR', 'war');
157
+define('ALLY_DIPLOMACY_PEACE', 'peace');
158 158
 define('ALLY_DIPLOMACY_CONFEDERATION', 'confederation');
159
-define('ALLY_DIPLOMACY_FEDERATION'   , 'federation');
160
-define('ALLY_DIPLOMACY_UNION'        , 'union');
161
-define('ALLY_DIPLOMACY_MASTER'       , 'master');
162
-define('ALLY_DIPLOMACY_SLAVE'        , 'slave');
159
+define('ALLY_DIPLOMACY_FEDERATION', 'federation');
160
+define('ALLY_DIPLOMACY_UNION', 'union');
161
+define('ALLY_DIPLOMACY_MASTER', 'master');
162
+define('ALLY_DIPLOMACY_SLAVE', 'slave');
163 163
 
164 164
 define('ALLY_PROPOSE_SEND', 0);
165 165
 
166 166
 // Quest types
167
-define('QUEST_TYPE_BUILD'   , 1);
167
+define('QUEST_TYPE_BUILD', 1);
168 168
 define('QUEST_TYPE_RESEARCH', 2);
169
-define('QUEST_TYPE_COMBAT'  , 3);
169
+define('QUEST_TYPE_COMBAT', 3);
170 170
 
171
-define('QUEST_STATUS_EXCEPT_COMPLETE' , -2);
172
-define('QUEST_STATUS_ALL' , -1);
173
-define('QUEST_STATUS_NOT_STARTED' , 0);
174
-define('QUEST_STATUS_STARTED'     , 1);
175
-define('QUEST_STATUS_COMPLETE'    , 2);
171
+define('QUEST_STATUS_EXCEPT_COMPLETE', -2);
172
+define('QUEST_STATUS_ALL', -1);
173
+define('QUEST_STATUS_NOT_STARTED', 0);
174
+define('QUEST_STATUS_STARTED', 1);
175
+define('QUEST_STATUS_COMPLETE', 2);
176 176
 
177 177
 define('TYPE_EMPTY', '');
178 178
 define('TYPE_INTEGER', 'integer');
@@ -185,69 +185,69 @@  discard block
 block discarded – undo
185 185
 
186 186
 // *** Combat-related constants
187 187
 // *** Mission Type constants starts with MT_
188
-define('MT_NONE'     ,  0);
189
-define('MT_ATTACK'   ,  1);
190
-define('MT_AKS'      ,  2);
191
-define('MT_TRANSPORT',  3);
192
-define('MT_RELOCATE' ,  4);
193
-define('MT_HOLD'     ,  5);
194
-define('MT_SPY'      ,  6);
195
-define('MT_COLONIZE' ,  7);
196
-define('MT_RECYCLE'  ,  8);
197
-define('MT_DESTROY'  ,  9);
198
-define('MT_MISSILE'  , 10);
199
-define('MT_EXPLORE'  , 15);
188
+define('MT_NONE', 0);
189
+define('MT_ATTACK', 1);
190
+define('MT_AKS', 2);
191
+define('MT_TRANSPORT', 3);
192
+define('MT_RELOCATE', 4);
193
+define('MT_HOLD', 5);
194
+define('MT_SPY', 6);
195
+define('MT_COLONIZE', 7);
196
+define('MT_RECYCLE', 8);
197
+define('MT_DESTROY', 9);
198
+define('MT_MISSILE', 10);
199
+define('MT_EXPLORE', 15);
200 200
 
201 201
 // *** Planet Target constants starts with PT_
202 202
 define('PT_NONE', 0);
203 203
 define('PT_ALL', 0);
204 204
 define('PT_PLANET', 1);
205 205
 define('PT_DEBRIS', 2);
206
-define('PT_MOON'  , 3);
206
+define('PT_MOON', 3);
207 207
 
208 208
 // *** Unit locations - shows db table where unit belong
209 209
 // Also cache indexes
210 210
 define('LOC_AUTODETECT', -2);
211
-define('LOC_NONE',    -1); // Deprecated
211
+define('LOC_NONE', -1); // Deprecated
212 212
 define('LOC_UNIVERSE', 0);
213
-define('LOC_PLANET',   1);
214
-define('LOC_DEBRIS',   2); // Translates to `planets` table planet_type = 1, `debris_*` fields
215
-define('LOC_MOON',     3); // Translates to `planets` table planet_type = 3
216
-define('LOC_PLAYER',   4);
217
-define('LOC_USER',     LOC_PLAYER); // Deprecated alias for LOC_PLAYER
218
-define('LOC_FLEET',    5);
219
-define('LOC_ALLY',     6);
220
-define('LOC_SERVER',   7); // Located on server
213
+define('LOC_PLANET', 1);
214
+define('LOC_DEBRIS', 2); // Translates to `planets` table planet_type = 1, `debris_*` fields
215
+define('LOC_MOON', 3); // Translates to `planets` table planet_type = 3
216
+define('LOC_PLAYER', 4);
217
+define('LOC_USER', LOC_PLAYER); // Deprecated alias for LOC_PLAYER
218
+define('LOC_FLEET', 5);
219
+define('LOC_ALLY', 6);
220
+define('LOC_SERVER', 7); // Located on server
221 221
 
222 222
 // ТОЛЬКО ВНУТРЕНЕЕ!!!
223
-define('LOC_UNIT',    'LOC_UNIT');
224
-define('LOC_QUE',     'LOC_QUE');
225
-define('LOC_LOCATION','LOC_LOCATION');
226
-define('LOC_LOCKS','LOC_LOCKS');
223
+define('LOC_UNIT', 'LOC_UNIT');
224
+define('LOC_QUE', 'LOC_QUE');
225
+define('LOC_LOCATION', 'LOC_LOCATION');
226
+define('LOC_LOCKS', 'LOC_LOCKS');
227 227
 
228 228
 // *** Caching masks
229
-define('CACHE_NOTHING'    ,  0);
230
-define('CACHE_FLEET'      ,  1);
231
-define('CACHE_PLANET'     ,  2);
232
-define('CACHE_USER'       ,  4);
233
-define('CACHE_SOURCE'     ,  8);
229
+define('CACHE_NOTHING', 0);
230
+define('CACHE_FLEET', 1);
231
+define('CACHE_PLANET', 2);
232
+define('CACHE_USER', 4);
233
+define('CACHE_SOURCE', 8);
234 234
 define('CACHE_DESTINATION', 16);
235
-define('CACHE_EVENT'      , 32);
235
+define('CACHE_EVENT', 32);
236 236
 
237
-define('CACHE_USER_SRC'  , CACHE_USER | CACHE_SOURCE);
238
-define('CACHE_USER_DST'  , CACHE_USER | CACHE_DESTINATION);
237
+define('CACHE_USER_SRC', CACHE_USER | CACHE_SOURCE);
238
+define('CACHE_USER_DST', CACHE_USER | CACHE_DESTINATION);
239 239
 define('CACHE_PLANET_SRC', CACHE_PLANET | CACHE_SOURCE);
240 240
 define('CACHE_PLANET_DST', CACHE_PLANET | CACHE_DESTINATION);
241
-define('CACHE_COMBAT'    , CACHE_FLEET | CACHE_PLANET | CACHE_USER | CACHE_SOURCE | CACHE_DESTINATION);
241
+define('CACHE_COMBAT', CACHE_FLEET | CACHE_PLANET | CACHE_USER | CACHE_SOURCE | CACHE_DESTINATION);
242 242
 
243
-define('CACHE_ALL'       , CACHE_FLEET | CACHE_PLANET | CACHE_USER | CACHE_SOURCE | CACHE_DESTINATION | CACHE_EVENT);
243
+define('CACHE_ALL', CACHE_FLEET | CACHE_PLANET | CACHE_USER | CACHE_SOURCE | CACHE_DESTINATION | CACHE_EVENT);
244 244
 
245
-define('CACHE_NONE'      , CACHE_NOTHING); // Alias for me
245
+define('CACHE_NONE', CACHE_NOTHING); // Alias for me
246 246
 
247 247
 // *** Event types
248 248
 define('EVENT_FLEET_NONE', 0);
249 249
 define('EVENT_FLEET_ARRIVE', 1);
250
-define('EVENT_FLEET_STAY'  , 2);
250
+define('EVENT_FLEET_STAY', 2);
251 251
 define('EVENT_FLEET_RETURN', 3);
252 252
 
253 253
 // *** Constants for changing DM
@@ -306,11 +306,11 @@  discard block
 block discarded – undo
306 306
 
307 307
 
308 308
 // Operation error status HARDCODE!
309
-define('ERR_NONE'               , 0); // No error
310
-define('ERR_WARNING'            , 1); // There is warning - something altering normal operation process
311
-define('ERR_ERROR'              , 2); // There is error - something permits operation from process
312
-define('ERR_HACK'               , 4); // Operation is qualified as hack attempt
313
-define('ERR_NOTICE'             , 8); // There is notice - nothing really critical but operator should know
309
+define('ERR_NONE', 0); // No error
310
+define('ERR_WARNING', 1); // There is warning - something altering normal operation process
311
+define('ERR_ERROR', 2); // There is error - something permits operation from process
312
+define('ERR_HACK', 4); // Operation is qualified as hack attempt
313
+define('ERR_NOTICE', 8); // There is notice - nothing really critical but operator should know
314 314
 // New GLOBAL operation results
315 315
 //define('RESULT_DEFAULT' , 0); // Default result - all went OK or result really doesn't matter
316 316
 //define('RESULT_WARNING' , 1);
@@ -330,7 +330,7 @@  discard block
 block discarded – undo
330 330
 define('SN_PAYMENT_REQUEST_OK', 0);
331 331
 define('SN_PAYMENT_REQUEST_ERROR_UNIT_AMOUNT', 1);
332 332
 define('SN_PAYMENT_REQUEST_ERROR_PAYLINK_UNSUPPORTED', 2);
333
-define('SN_PAYMENT_REQUEST_IP_WRONG', 3);  // Неправильный IP входящей системы - обычно хак
333
+define('SN_PAYMENT_REQUEST_IP_WRONG', 3); // Неправильный IP входящей системы - обычно хак
334 334
 define('SN_PAYMENT_REQUEST_COMMAND_UNSUPPORTED', 4); // Неподдерживаемая команда - обычно хак
335 335
 define('SN_PAYMENT_REQUEST_SIGNATURE_INVALID', 5); // Неправильная подпись или не сошлась контрольная сумма - обычно хак
336 336
 define('SN_MODULE_DISABLED', 6); // Модуль отключен // УНИВЕРСАЛЬНЫЙ ОТВЕТ!
@@ -606,16 +606,16 @@  discard block
 block discarded – undo
606 606
 //define('F_DEVICE_ID',     'F_DEVICE_ID');
607 607
 //define('F_DEVICE_CYPHER', 'F_DEVICE_CYPHER');
608 608
 
609
-define('F_PROVIDER_ID',   'F_PROVIDER_ID');
609
+define('F_PROVIDER_ID', 'F_PROVIDER_ID');
610 610
 // define('F_PROVIDER_LIST', 'F_PROVIDER_LIST');
611 611
 
612 612
 define('F_IMPERSONATE_STATUS', 'F_IMPERSONATE_STATUS');
613 613
 define('F_IMPERSONATE_OPERATOR', 'F_IMPERSONATE_OPERATOR');
614 614
 
615
-define('F_LOGIN_STATUS',  'F_LOGIN_STATUS');
615
+define('F_LOGIN_STATUS', 'F_LOGIN_STATUS');
616 616
 define('F_LOGIN_MESSAGE', 'F_LOGIN_MESSAGE');
617 617
 
618
-define('F_PLAYER_REGISTER_STATUS',  'F_PLAYER_REGISTER_STATUS');
618
+define('F_PLAYER_REGISTER_STATUS', 'F_PLAYER_REGISTER_STATUS');
619 619
 define('F_PLAYER_REGISTER_MESSAGE', 'F_PLAYER_REGISTER_MESSAGE');
620 620
 
621 621
 define('F_USER_ID', 'F_USER_ID');
@@ -659,78 +659,78 @@  discard block
 block discarded – undo
659 659
 
660 660
 
661 661
 // Option groups
662
-define('OPT_ALL',      0);
663
-define('OPT_MESSAGE',  1);
662
+define('OPT_ALL', 0);
663
+define('OPT_MESSAGE', 1);
664 664
 define('OPT_UNIVERSE', 2);
665 665
 define('OPT_INTERFACE', 3);
666 666
 
667 667
 // Message classes
668
-define('MSG_TYPE_OUTBOX'   ,  -1);
669
-define('MSG_TYPE_SPY'      ,   0);
670
-define('MSG_TYPE_PLAYER'   ,   1);
671
-define('MSG_TYPE_ALLIANCE' ,   2);
672
-define('MSG_TYPE_COMBAT'   ,   3);
673
-define('MSG_TYPE_RECYCLE'  ,   4);
674
-define('MSG_TYPE_TRANSPORT',   5);
675
-define('MSG_TYPE_ADMIN'    ,   6);
676
-define('MSG_TYPE_EXPLORE'  ,  15);
677
-define('MSG_TYPE_QUE'      ,  99);
678
-define('MSG_TYPE_NEW'      , 100);
668
+define('MSG_TYPE_OUTBOX', -1);
669
+define('MSG_TYPE_SPY', 0);
670
+define('MSG_TYPE_PLAYER', 1);
671
+define('MSG_TYPE_ALLIANCE', 2);
672
+define('MSG_TYPE_COMBAT', 3);
673
+define('MSG_TYPE_RECYCLE', 4);
674
+define('MSG_TYPE_TRANSPORT', 5);
675
+define('MSG_TYPE_ADMIN', 6);
676
+define('MSG_TYPE_EXPLORE', 15);
677
+define('MSG_TYPE_QUE', 99);
678
+define('MSG_TYPE_NEW', 100);
679 679
 
680 680
 // Attack verification statuses
681
-define('ATTACK_ALLOWED'           ,  0);
682
-define('ATTACK_NO_TARGET'         ,  1);
683
-define('ATTACK_OWN'               ,  2);
684
-define('ATTACK_WRONG_MISSION'     ,  3);
685
-define('ATTACK_NO_ALLY_DEPOSIT'   ,  4);
686
-define('ATTACK_NO_DEBRIS'         ,  5);
687
-define('ATTACK_VACATION'          ,  6);
688
-define('ATTACK_SAME_IP'           ,  7);
689
-define('ATTACK_BUFFING'           ,  8);
690
-define('ATTACK_ADMIN'             ,  9);
691
-define('ATTACK_NOOB'              , 10);
692
-define('ATTACK_OWN_VACATION'      , 11);
693
-define('ATTACK_NO_SILO'           , 12);
694
-define('ATTACK_NO_MISSILE'        , 13);
695
-define('ATTACK_NO_FLEET'          , 14);
696
-define('ATTACK_NO_SLOTS'          , 15);
697
-define('ATTACK_NO_SHIPS'          , 16);
698
-define('ATTACK_NO_RECYCLERS'      , 17);
699
-define('ATTACK_NO_SPIES'          , 18);
700
-define('ATTACK_NO_COLONIZER'      , 19);
701
-define('ATTACK_MISSILE_TOO_FAR'   , 20);
702
-define('ATTACK_WRONG_STRUCTURE'   , 21);
703
-define('ATTACK_NO_FUEL'           , 22);
704
-define('ATTACK_NO_RESOURCES'      , 23);
705
-define('ATTACK_NO_ACS'            , 24);
706
-define('ATTACK_ACS_MISSTARGET'    , 25);
707
-define('ATTACK_WRONG_SPEED'       , 26);
708
-define('ATTACK_ACS_TOO_LATE'      , 27);
709
-define('ATTACK_BASHING'           , 28);
710
-define('ATTACK_BASHING_WAR_DELAY' , 29);
711
-define('ATTACK_ACS_WRONG_TARGET'  , 30);
712
-define('ATTACK_SAME'              , 31);
681
+define('ATTACK_ALLOWED', 0);
682
+define('ATTACK_NO_TARGET', 1);
683
+define('ATTACK_OWN', 2);
684
+define('ATTACK_WRONG_MISSION', 3);
685
+define('ATTACK_NO_ALLY_DEPOSIT', 4);
686
+define('ATTACK_NO_DEBRIS', 5);
687
+define('ATTACK_VACATION', 6);
688
+define('ATTACK_SAME_IP', 7);
689
+define('ATTACK_BUFFING', 8);
690
+define('ATTACK_ADMIN', 9);
691
+define('ATTACK_NOOB', 10);
692
+define('ATTACK_OWN_VACATION', 11);
693
+define('ATTACK_NO_SILO', 12);
694
+define('ATTACK_NO_MISSILE', 13);
695
+define('ATTACK_NO_FLEET', 14);
696
+define('ATTACK_NO_SLOTS', 15);
697
+define('ATTACK_NO_SHIPS', 16);
698
+define('ATTACK_NO_RECYCLERS', 17);
699
+define('ATTACK_NO_SPIES', 18);
700
+define('ATTACK_NO_COLONIZER', 19);
701
+define('ATTACK_MISSILE_TOO_FAR', 20);
702
+define('ATTACK_WRONG_STRUCTURE', 21);
703
+define('ATTACK_NO_FUEL', 22);
704
+define('ATTACK_NO_RESOURCES', 23);
705
+define('ATTACK_NO_ACS', 24);
706
+define('ATTACK_ACS_MISSTARGET', 25);
707
+define('ATTACK_WRONG_SPEED', 26);
708
+define('ATTACK_ACS_TOO_LATE', 27);
709
+define('ATTACK_BASHING', 28);
710
+define('ATTACK_BASHING_WAR_DELAY', 29);
711
+define('ATTACK_ACS_WRONG_TARGET', 30);
712
+define('ATTACK_SAME', 31);
713 713
 define('ATTACK_RESOURCE_FORBIDDEN', 32);
714
-define('ATTACK_TRANSPORT_EMPTY'   , 33);
715
-define('ATTACK_SPIES_LONLY'       , 34);
716
-define('ATTACK_TOO_FAR'           , 35);
717
-define('ATTACK_OVERLOADED'        , 36);
718
-define('ATTACK_MISSION_ABSENT'    , 37);
719
-define('ATTACK_WRONG_UNIT'        , 38);
720
-define('ATTACK_ZERO_SPEED'        , 39);
721
-define('ATTACK_SHIP_COUNT_WRONG'  , 40);
714
+define('ATTACK_TRANSPORT_EMPTY', 33);
715
+define('ATTACK_SPIES_LONLY', 34);
716
+define('ATTACK_TOO_FAR', 35);
717
+define('ATTACK_OVERLOADED', 36);
718
+define('ATTACK_MISSION_ABSENT', 37);
719
+define('ATTACK_WRONG_UNIT', 38);
720
+define('ATTACK_ZERO_SPEED', 39);
721
+define('ATTACK_SHIP_COUNT_WRONG', 40);
722 722
 define('ATTACK_RESOURCE_COUNT_WRONG', 41);
723 723
 define('ATTACK_MORATORIUM', 42);
724 724
 define('ATTACK_CHILD_PROTECTION', 43);
725 725
 
726 726
 
727 727
 // *** Races - Homeworlds
728
-define('RACE_NONE'    , 0);
729
-define('RACE_EARTH'   , 1);
730
-define('RACE_MOON'    , 2);
731
-define('RACE_MERCURY' , 3);
732
-define('RACE_VENUS'   , 4);
733
-define('RACE_MARS'    , 5);
728
+define('RACE_NONE', 0);
729
+define('RACE_EARTH', 1);
730
+define('RACE_MOON', 2);
731
+define('RACE_MERCURY', 3);
732
+define('RACE_VENUS', 4);
733
+define('RACE_MARS', 5);
734 734
 define('RACE_ASTEROID', 6);
735 735
 // define('MARKET_INFO'         , 7);
736 736
 
@@ -738,115 +738,115 @@  discard block
 block discarded – undo
738 738
 
739 739
 // *** Market variables
740 740
 // === Market blocks
741
-define('MARKET_ENTRY'        , 0);
742
-define('MARKET_RESOURCES'    , 1);
743
-define('MARKET_SCRAPPER'     , 2);
744
-define('MARKET_STOCKMAN'     , 3);
745
-define('MARKET_EXCHANGE'     , 4);
746
-define('MARKET_BANKER'       , 5);
747
-define('MARKET_PAWNSHOP'     , 6);
748
-define('MARKET_INFO'         , 7);
741
+define('MARKET_ENTRY', 0);
742
+define('MARKET_RESOURCES', 1);
743
+define('MARKET_SCRAPPER', 2);
744
+define('MARKET_STOCKMAN', 3);
745
+define('MARKET_EXCHANGE', 4);
746
+define('MARKET_BANKER', 5);
747
+define('MARKET_PAWNSHOP', 6);
748
+define('MARKET_INFO', 7);
749 749
 
750 750
 // === Market error statuses
751
-define('MARKET_NOTHING'              ,  0);
752
-define('MARKET_DEAL'                 ,  1);
753
-define('MARKET_DEAL_TRADE'           ,  2);
754
-define('MARKET_NO_DM'                ,  3);
755
-define('MARKET_NO_RESOURCES'         ,  4);
756
-define('MARKET_ZERO_DEAL'            ,  5);
757
-define('MARKET_NO_SHIPS'             ,  6);
758
-define('MARKET_NOT_A_SHIP'           ,  7);
759
-define('MARKET_NO_STOCK'             ,  8);
760
-define('MARKET_ZERO_RES_STOCK'       ,  9);
761
-define('MARKET_NEGATIVE_SHIPS'       , 10);
762
-
763
-define('MARKET_INFO_PLAYER'          , 12);
764
-define('MARKET_INFO_WRONG'           , 11);
751
+define('MARKET_NOTHING', 0);
752
+define('MARKET_DEAL', 1);
753
+define('MARKET_DEAL_TRADE', 2);
754
+define('MARKET_NO_DM', 3);
755
+define('MARKET_NO_RESOURCES', 4);
756
+define('MARKET_ZERO_DEAL', 5);
757
+define('MARKET_NO_SHIPS', 6);
758
+define('MARKET_NOT_A_SHIP', 7);
759
+define('MARKET_NO_STOCK', 8);
760
+define('MARKET_ZERO_RES_STOCK', 9);
761
+define('MARKET_NEGATIVE_SHIPS', 10);
762
+
763
+define('MARKET_INFO_PLAYER', 12);
764
+define('MARKET_INFO_WRONG', 11);
765 765
 define('MARKET_INFO_PLAYER_NOT_FOUND', 13);
766
-define('MARKET_INFO_PLAYER_WRONG'    , 14);
767
-define('MARKET_INFO_PLAYER_SAME'     , 15);
766
+define('MARKET_INFO_PLAYER_WRONG', 14);
767
+define('MARKET_INFO_PLAYER_SAME', 15);
768 768
 
769 769
 
770 770
 
771 771
 
772 772
 // *** Mercenary/talent bonus types
773
-define('BONUS_NONE'    ,            0);  // No bonus
774
-define('BONUS_PERCENT' ,            1);  // Percent on base value
775
-define('BONUS_ADD'     ,            2);  // Add
776
-define('BONUS_ABILITY' ,            3);  // Some ability
777
-define('BONUS_MULTIPLY',            4);  // Multiply by value
773
+define('BONUS_NONE', 0); // No bonus
774
+define('BONUS_PERCENT', 1); // Percent on base value
775
+define('BONUS_ADD', 2); // Add
776
+define('BONUS_ABILITY', 3); // Some ability
777
+define('BONUS_MULTIPLY', 4); // Multiply by value
778 778
 //define('BONUS_PERCENT_CUMULATIVE' , 5);  // Cumulative percent on base value
779 779
 //define('BONUS_PERCENT_DEGRADED' ,   6);  // Bonus amount degraded with increase as pow(bonus, level) (?)
780 780
 //define('BONUS_SPEED',               7);  // Speed bonus
781 781
 
782 782
 // *** Action constant (build should be replaced with ACTION)
783
-define('BUILD_CREATE' ,  1);
783
+define('BUILD_CREATE', 1);
784 784
 define('BUILD_DESTROY', -1);
785 785
 define('BUILD_AUTOCONVERT', 2);
786 786
 
787
-define('ACTION_SELL'       , -1);
788
-define('ACTION_NOTHING'    ,  0);
789
-define('ACTION_BUY'        ,  1);
790
-define('ACTION_USE'        ,  2);
791
-define('ACTION_DELETE'     ,  3);
787
+define('ACTION_SELL', -1);
788
+define('ACTION_NOTHING', 0);
789
+define('ACTION_BUY', 1);
790
+define('ACTION_USE', 2);
791
+define('ACTION_DELETE', 3);
792 792
 
793 793
 // *** Check unit availability codes
794
-define('BUILD_ALLOWED'         , 0); // HARDCODED! DO NOT CHANGE!
794
+define('BUILD_ALLOWED', 0); // HARDCODED! DO NOT CHANGE!
795 795
 define('BUILD_REQUIRE_NOT_MEET', 1);
796
-define('BUILD_AMOUNT_WRONG'    , 2);
797
-define('BUILD_QUE_WRONG'       , 3);
798
-define('BUILD_QUE_UNIT_WRONG'  , 4);
799
-define('BUILD_INDESTRUCTABLE'  , 5);
800
-define('BUILD_NO_RESOURCES'    , 6);
801
-define('BUILD_NO_UNITS'        , 7);
802
-define('BUILD_UNIT_BUSY'       , 8);
803
-define('BUILD_QUE_FULL'        , 9);
804
-define('BUILD_SILO_FULL'       ,10);
805
-define('BUILD_MAX_REACHED'     ,11);
806
-define('BUILD_SECTORS_NONE'    ,12);
796
+define('BUILD_AMOUNT_WRONG', 2);
797
+define('BUILD_QUE_WRONG', 3);
798
+define('BUILD_QUE_UNIT_WRONG', 4);
799
+define('BUILD_INDESTRUCTABLE', 5);
800
+define('BUILD_NO_RESOURCES', 6);
801
+define('BUILD_NO_UNITS', 7);
802
+define('BUILD_UNIT_BUSY', 8);
803
+define('BUILD_QUE_FULL', 9);
804
+define('BUILD_SILO_FULL', 10);
805
+define('BUILD_MAX_REACHED', 11);
806
+define('BUILD_SECTORS_NONE', 12);
807 807
 define('BUILD_AUTOCONVERT_AVAILABLE', 13);
808 808
 
809 809
 
810 810
 // *** Que types
811 811
 define('QUE_STRUCTURES', 1);
812
-define('QUE_HANGAR'    , 4);
813
-define('QUE_RESEARCH'  , 7);
814
-define('QUE_MERCENARY' , 600); // UNIT_MERCENARIES
812
+define('QUE_HANGAR', 4);
813
+define('QUE_RESEARCH', 7);
814
+define('QUE_MERCENARY', 600); // UNIT_MERCENARIES
815 815
 // *** Subque types
816
-define('SUBQUE_PLANET'  , 1);
817
-define('SUBQUE_MOON'    , 3);
818
-define('SUBQUE_FLEET'   , 4);
819
-define('SUBQUE_DEFENSE' , 6);
816
+define('SUBQUE_PLANET', 1);
817
+define('SUBQUE_MOON', 3);
818
+define('SUBQUE_FLEET', 4);
819
+define('SUBQUE_DEFENSE', 6);
820 820
 define('SUBQUE_RESEARCH', 7);
821 821
 
822 822
 // *** Que items
823
-define('QI_UNIT_ID'   , 0);
824
-define('QI_AMOUNT'    , 1);
825
-define('QI_TIME'      , 2);
826
-define('QI_MODE'      , 3);
827
-define('QI_QUE_ID'    , 4);
828
-define('QI_QUE_TYPE'  , 4);
829
-define('QI_PLANET_ID' , 5);
823
+define('QI_UNIT_ID', 0);
824
+define('QI_AMOUNT', 1);
825
+define('QI_TIME', 2);
826
+define('QI_MODE', 3);
827
+define('QI_QUE_ID', 4);
828
+define('QI_QUE_TYPE', 4);
829
+define('QI_PLANET_ID', 5);
830 830
 
831 831
 
832 832
 // *** Units
833 833
 
834 834
 // *** Sort options
835
-define('SORT_ASCENDING' , 0);
835
+define('SORT_ASCENDING', 0);
836 836
 define('SORT_DESCENDING', 1);
837 837
 
838
-define('SORT_ID'             , 0);
839
-define('SORT_LOCATION'       , 1);
840
-define('SORT_NAME'           , 2);
841
-define('SORT_SIZE'           , 3);
842
-define('SORT_EMAIL'          , 4);
843
-define('SORT_IP'             , 5);
838
+define('SORT_ID', 0);
839
+define('SORT_LOCATION', 1);
840
+define('SORT_NAME', 2);
841
+define('SORT_SIZE', 3);
842
+define('SORT_EMAIL', 4);
843
+define('SORT_IP', 5);
844 844
 define('SORT_TIME_REGISTERED', 6);
845 845
 define('SORT_TIME_LAST_VISIT', 7);
846
-define('SORT_TIME_BAN_UNTIL' , 8);
847
-define('SORT_REFERRAL_COUNT' , 9);
848
-define('SORT_REFERRAL_DM'    , 10);
849
-define('SORT_VACATION'       , 11);
846
+define('SORT_TIME_BAN_UNTIL', 8);
847
+define('SORT_REFERRAL_COUNT', 9);
848
+define('SORT_REFERRAL_DM', 10);
849
+define('SORT_VACATION', 11);
850 850
 
851 851
 
852 852
 define('HULL_SIZE_TINY', 1);
@@ -1007,10 +1007,10 @@  discard block
 block discarded – undo
1007 1007
 
1008 1008
 // === Artifacts
1009 1009
 define('UNIT_ARTIFACTS', 1000);
1010
-define('ART_LHC', 1001);      // Additional moon chance
1011
-define('ART_RCD_SMALL', 1002);   // Rapid Colony Deployment - Set of buildings up to 10th level - 10/14/ 3/0 -   405 DM
1012
-define('ART_RCD_MEDIUM', 1003);  // Rapid Colony Deployment - Set of buildings up to 15th level - 15/20/ 8/0 -  4704 DM
1013
-define('ART_RCD_LARGE', 1004);   // Rapid Colony Deployment - Set of buildings up to 20th level - 20/25/10/1 - 39790 DM
1010
+define('ART_LHC', 1001); // Additional moon chance
1011
+define('ART_RCD_SMALL', 1002); // Rapid Colony Deployment - Set of buildings up to 10th level - 10/14/ 3/0 -   405 DM
1012
+define('ART_RCD_MEDIUM', 1003); // Rapid Colony Deployment - Set of buildings up to 15th level - 15/20/ 8/0 -  4704 DM
1013
+define('ART_RCD_LARGE', 1004); // Rapid Colony Deployment - Set of buildings up to 20th level - 20/25/10/1 - 39790 DM
1014 1014
 define('ART_HEURISTIC_CHIP', 1005); // Speed up research
1015 1015
 define('ART_NANO_BUILDER', 1006); // Speed up building
1016 1016
 define('ART_NANO_CONSTRUCTOR', 1007); // RESERVED Speed up hangar constructions
@@ -1084,25 +1084,25 @@  discard block
 block discarded – undo
1084 1084
 define('UNIT_AWARD_MEDAL_BLITZ_R0_PLACE1', 2201); // Блиц-сервер, участник 0-го раунда, 1-е место
1085 1085
 define('UNIT_AWARD_MEDAL_BLITZ_R0_PLACE2', 2202); // Блиц-сервер, участник 0-го раунда, 2-е место
1086 1086
 define('UNIT_AWARD_MEDAL_BLITZ_R0_PLACE3', 2203); // Блиц-сервер, участник 0-го раунда, 3-е место
1087
-define('UNIT_AWARD_MEDAL_2016_WOMEN_DAY_BEST', 2204);  // Медаль Лучшему Кавалеру за максимум потраченной ММ/максимум одаренных женщин Женщине от Мужчины во время ивента 8 марта 2016 года
1088
-define('UNIT_AWARD_MEDAL_2017_WOMEN_DAY_BEST', 2205);  // Медаль Лучшему Кавалеру за максимум потраченной ММ/максимум одаренных женщин Женщине от Мужчины во время ивента 8 марта 2017 года
1089
-define('UNIT_AWARD_MEDAL_2017_WOMEN_DAY_QUEEN', 2206);  // Медаль Королевы Весны за максимум полученной ММ/максимум полученных подарков от Мужчины во время ивента 8 марта 2017 года
1087
+define('UNIT_AWARD_MEDAL_2016_WOMEN_DAY_BEST', 2204); // Медаль Лучшему Кавалеру за максимум потраченной ММ/максимум одаренных женщин Женщине от Мужчины во время ивента 8 марта 2016 года
1088
+define('UNIT_AWARD_MEDAL_2017_WOMEN_DAY_BEST', 2205); // Медаль Лучшему Кавалеру за максимум потраченной ММ/максимум одаренных женщин Женщине от Мужчины во время ивента 8 марта 2017 года
1089
+define('UNIT_AWARD_MEDAL_2017_WOMEN_DAY_QUEEN', 2206); // Медаль Королевы Весны за максимум полученной ММ/максимум полученных подарков от Мужчины во время ивента 8 марта 2017 года
1090 1090
 define('UNIT_AWARD_MEDAL_8_MARCH_BEST_CAVALIER_AMOUNT', 2207); // Медаль Лучшему Кавалеру за максимум потраченной ММ Женщине от Мужчины во время ивента 8 марта 2017 года
1091 1091
 define('UNIT_AWARD_MEDAL_8_MARCH_BEST_CAVALIER_COUNT', 2208); // Медаль Лучшему Кавалеру за максимум одаренных женщин Женщине от Мужчины во время ивента 8 марта 2017 года
1092 1092
 define('UNIT_AWARD_MEDAL_8_MARCH_SPRING_QUEEN_AMOUNT', 2209); // Медаль Королевы Весны за максимум полученной ММ от Мужчины во время ивента 8 марта 2017 года
1093 1093
 define('UNIT_AWARD_MEDAL_8_MARCH_SPRING_QUEEN_COUNT', 2210); // Медаль Королевы Весны за максимум полученных подарков от Мужчины во время ивента 8 марта 2017 года
1094 1094
 
1095 1095
 define('UNIT_AWARD_MEMORY', 2300); // Памятные знаки за существование и участие - например "4 года в игре". "Был онлайн в новогоднюю ночь 2013". итд
1096
-define('UNIT_AWARD_MEMORY_IMMORTAL', 2301);  // Бессмертный
1097
-define('UNIT_AWARD_MEMORY_2015_WOMEN_DAY', 2302);  // Значек за подарок Женщине от Мужчины во время ивента 8 марта 2015 года
1096
+define('UNIT_AWARD_MEMORY_IMMORTAL', 2301); // Бессмертный
1097
+define('UNIT_AWARD_MEMORY_2015_WOMEN_DAY', 2302); // Значек за подарок Женщине от Мужчины во время ивента 8 марта 2015 года
1098 1098
 define('UNIT_AWARD_MEMORY_BLITZ_R0', 2303); // Блиц-сервер, участник 0-го раунда
1099 1099
 define('UNIT_AWARD_MEMORY_SUPER_BORN_2015_SIMPLE', 2304); // День Рождения СН
1100 1100
 define('UNIT_AWARD_MEMORY_SUPER_BORN_2015_BRONZE', 2305); // День Рождения СН
1101 1101
 define('UNIT_AWARD_MEMORY_SUPER_BORN_2015_SILVER', 2306); // День Рождения СН
1102 1102
 define('UNIT_AWARD_MEMORY_SUPER_BORN_2015_GOLD', 2307); // День Рождения СН
1103 1103
 define('UNIT_AWARD_MEMORY_SUPER_BORN_2015_PLATINUM', 2308); // День Рождения СН
1104
-define('UNIT_AWARD_MEMORY_2016_WOMEN_DAY', 2309);  // Значек за подарок Женщине от Мужчины во время ивента 8 марта 2016 года
1105
-define('UNIT_AWARD_MEMORY_2017_WOMEN_DAY', 2310);  // Значек за подарок Женщине от Мужчины во время ивента 8 марта 2017 года
1104
+define('UNIT_AWARD_MEMORY_2016_WOMEN_DAY', 2309); // Значек за подарок Женщине от Мужчины во время ивента 8 марта 2016 года
1105
+define('UNIT_AWARD_MEMORY_2017_WOMEN_DAY', 2310); // Значек за подарок Женщине от Мужчины во время ивента 8 марта 2017 года
1106 1106
 define('UNIT_AWARD_MEMORY_SUPER_BORN_2017_SIMPLE', 2311); // День Рождения СН - 2017
1107 1107
 define('UNIT_AWARD_MEMORY_SUPER_BORN_2017_BRONZE', 2312); // День Рождения СН - 2017
1108 1108
 define('UNIT_AWARD_MEMORY_SUPER_BORN_2017_SILVER', 2313); // День Рождения СН - 2017
@@ -1124,7 +1124,7 @@  discard block
 block discarded – undo
1124 1124
 define('UNIT_AWARD_MEMORY_NEW_YEAR_2018_SIMPLE', 2326); // СуперНовый Год - 2018
1125 1125
 define('UNIT_AWARD_MEMORY_NEW_YEAR_2018_BRONZE', 2327); // СуперНовый Год - 2018
1126 1126
 define('UNIT_AWARD_MEMORY_NEW_YEAR_2018_SILVER', 2328); // СуперНовый Год - 2018
1127
-define('UNIT_AWARD_MEMORY_NEW_YEAR_2018_GOLD',   2329); // СуперНовый Год - 2018
1127
+define('UNIT_AWARD_MEMORY_NEW_YEAR_2018_GOLD', 2329); // СуперНовый Год - 2018
1128 1128
 define('UNIT_AWARD_MEMORY_NEW_YEAR_2018_PLATINUM', 2330); // СуперНовый Год - 2018
1129 1129
 define('UNIT_AWARD_MEMORY_NEW_YEAR_2018_DIAMOND', 2331); // СуперНовый Год - 2018
1130 1130
 
@@ -1265,7 +1265,7 @@  discard block
 block discarded – undo
1265 1265
 const GROUP_UNIT_OBJECTS_IN_SPACE = 790002;
1266 1266
 
1267 1267
 
1268
-define('GROUP_PART',         800000);
1268
+define('GROUP_PART', 800000);
1269 1269
 // Зарезервировано для запчастей: 800.001 - 899.999
1270 1270
 // define('GROUP_PART_HULL',    801000); // Корпуса - 1000 штук
1271 1271
 // define('GROUP_PART_ARMOR',   802000); // Броня - 1000 штук
@@ -1593,35 +1593,35 @@  discard block
 block discarded – undo
1593 1593
 
1594 1594
 
1595 1595
 // define('NICK_ID',               -1);
1596
-define('NICK_HTML',              0);
1597
-
1598
-define('NICK_FIRST',             1);
1599
-define('NICK_RACE',           1000);
1600
-define('NICK_GENDER',         2000);
1601
-define('NICK_AWARD',          3000);
1602
-define('NICK_VACATION',       3500);
1603
-define('NICK_BIRTHDAY',       4000);
1604
-define('NICK_RANK',           4500);
1605
-define('NICK_RANK_NO_TEXT',   4750);
1606
-define('NICK_PREMIUM',        5000);
1607
-define('NICK_AUTH_LEVEL',     6000);
1608
-
1609
-define('NICK_HIGHLIGHT',      6300);
1610
-define('NICK_CLASS',          6450);
1611
-
1612
-define('NICK_NICK_CLASS',     6600);
1613
-define('NICK_NICK',           7000);
1596
+define('NICK_HTML', 0);
1597
+
1598
+define('NICK_FIRST', 1);
1599
+define('NICK_RACE', 1000);
1600
+define('NICK_GENDER', 2000);
1601
+define('NICK_AWARD', 3000);
1602
+define('NICK_VACATION', 3500);
1603
+define('NICK_BIRTHDAY', 4000);
1604
+define('NICK_RANK', 4500);
1605
+define('NICK_RANK_NO_TEXT', 4750);
1606
+define('NICK_PREMIUM', 5000);
1607
+define('NICK_AUTH_LEVEL', 6000);
1608
+
1609
+define('NICK_HIGHLIGHT', 6300);
1610
+define('NICK_CLASS', 6450);
1611
+
1612
+define('NICK_NICK_CLASS', 6600);
1613
+define('NICK_NICK', 7000);
1614 1614
 define('NICK_NICK_CLASS_END', 7300);
1615 1615
 
1616
-define('NICK_ALLY_CLASS',     7600);
1617
-define('NICK_ALLY',           8000);
1616
+define('NICK_ALLY_CLASS', 7600);
1617
+define('NICK_ALLY', 8000);
1618 1618
 define('NICK_ALLY_CLASS_END', 8300);
1619 1619
 
1620
-define('NICK_CLASS_END',      8450);
1621
-define('NICK_HIGHLIGHT_END',  8600);
1620
+define('NICK_CLASS_END', 8450);
1621
+define('NICK_HIGHLIGHT_END', 8600);
1622 1622
 
1623
-define('NICK_LAST',           9999);
1624
-define('NICK_SORT',          10000);
1623
+define('NICK_LAST', 9999);
1624
+define('NICK_SORT', 10000);
1625 1625
 
1626 1626
 // Настройки игрока
1627 1627
 define('PLAYER_OPTION_MENU_SORT', 1);
@@ -1725,8 +1725,8 @@  discard block
 block discarded – undo
1725 1725
 define('LOG_ONLIINE_AGGREGATE_PERIOD_MINUTE_10', 1);
1726 1726
 
1727 1727
 define('BLITZ_REGISTER_DISABLED', 0);
1728
-define('BLITZ_REGISTER_OPEN'    , 1);
1729
-define('BLITZ_REGISTER_CLOSED'  , 2);
1728
+define('BLITZ_REGISTER_OPEN', 1);
1729
+define('BLITZ_REGISTER_CLOSED', 2);
1730 1730
 define('BLITZ_REGISTER_SHOW_LOGIN', 3);
1731 1731
 define('BLITZ_REGISTER_DISCLOSURE_NAMES', 4);
1732 1732
 
@@ -1858,8 +1858,8 @@  discard block
 block discarded – undo
1858 1858
 const MODULE_LOAD_ORDER_AUTH_VKONTAKTE        = 3;
1859 1859
 const MODULE_LOAD_ORDER_PAYMENT_SECONDARY     = 90000;
1860 1860
 const MODULE_LOAD_ORDER_UNIT_RES_METAMATTER   = 99999;
1861
-const MODULE_LOAD_ORDER_DEFAULT               = 100000;     // HARDCODE
1862
-const MODULE_LOAD_ORDER_CORE_SHIP_CONSTRUCTOR = 999999;     // RESERVED
1861
+const MODULE_LOAD_ORDER_DEFAULT               = 100000; // HARDCODE
1862
+const MODULE_LOAD_ORDER_CORE_SHIP_CONSTRUCTOR = 999999; // RESERVED
1863 1863
 const MODULE_LOAD_ORDER_MENU_CUSTOMIZE        = 200000000;
1864 1864
 const MODULE_LOAD_ORDER_LATEST                = 2000000000; // HARDCODE
1865 1865
 const MODULE_LOAD_ORDER_GAME_SKIRMISH         = 2000100000;
Please login to merge, or discard this patch.
admin/admin_locale.php 1 patch
Spacing   +29 added lines, -29 removed lines patch added patch discarded remove patch
@@ -7,9 +7,9 @@  discard block
 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
 
@@ -20,12 +20,12 @@  discard block
 block discarded – undo
20 20
 function adm_lng_assign_string($lang_id, $locale_string_name, $value) {
21 21
   global $locale_string_template, $languages_info, $languages, $domain;
22 22
 
23
-  if(is_array($value)) {
24
-    foreach($value as $sub_key => $sub_value) {
23
+  if (is_array($value)) {
24
+    foreach ($value as $sub_key => $sub_value) {
25 25
       adm_lng_assign_string($lang_id, "{$locale_string_name}[{$sub_key}]", $sub_value);
26 26
     }
27
-  } elseif($value) {
28
-    if(!isset($locale_string_template[$locale_string_name])) {
27
+  } elseif ($value) {
28
+    if (!isset($locale_string_template[$locale_string_name])) {
29 29
       $locale_string_template[$locale_string_name] = array();
30 30
     }
31 31
     $locale_string_template[$locale_string_name] = array_merge($locale_string_template[$locale_string_name], array("[{$lang_id}]" => htmlentities($value, ENT_COMPAT, 'utf-8')));
@@ -46,11 +46,11 @@  discard block
 block discarded – undo
46 46
   global $domain, $lang_id;
47 47
 
48 48
   $return = "{$ident}'{$string_name}' => ";
49
-  if(isset($string_value[$lang_id]) && !is_array($string_value[$lang_id])) {
49
+  if (isset($string_value[$lang_id]) && !is_array($string_value[$lang_id])) {
50 50
     $return .= "'" . str_replace(array("\\", "'"), array('\\\\', "\\'"), $string_value[$lang_id]) . "',";
51 51
   } else {
52 52
     $return .= "array(\r\n";
53
-    foreach($string_value as $arr_name => $arr_data) {
53
+    foreach ($string_value as $arr_name => $arr_data) {
54 54
       $return .= adm_lng_parse_string($arr_name, $arr_data, $ident . '  ');
55 55
     }
56 56
     $return .= "{$ident}),\r\n";
@@ -103,12 +103,12 @@  discard block
 block discarded – undo
103 103
 
104 104
   $string_name_new = false;
105 105
 
106
-  if(isset($honor_constants[$domain][$string_name_prefix])) {
106
+  if (isset($honor_constants[$domain][$string_name_prefix])) {
107 107
     $found_constants = array_keys($constants, $string_name);
108
-    foreach($found_constants as $constant_name) {
108
+    foreach ($found_constants as $constant_name) {
109 109
       $honor_prefix_list = is_array($honor_constants[$domain][$string_name_prefix]) ? $honor_constants[$domain][$string_name_prefix] : array($honor_constants[$domain][$string_name_prefix]);
110
-      foreach($honor_prefix_list as $honor_prefix) {
111
-        if(strpos($constant_name, $honor_prefix) === 0) {
110
+      foreach ($honor_prefix_list as $honor_prefix) {
111
+        if (strpos($constant_name, $honor_prefix) === 0) {
112 112
           $string_name_new = $constant_name;
113 113
           break;
114 114
         }
@@ -118,13 +118,13 @@  discard block
 block discarded – undo
118 118
 
119 119
   $string_name_new = $string_name_new ? $string_name_new : "'{$string_name}'";
120 120
   fwrite($file_handler, "{$ident}{$string_name_new} => ");
121
-  if(isset($string_value[$lang_id]) && !is_array($string_value[$lang_id])) {
121
+  if (isset($string_value[$lang_id]) && !is_array($string_value[$lang_id])) {
122 122
     fwrite($file_handler, "'" . str_replace(array("\\", "'"), array('\\\\', "\\'"), $string_value[$lang_id]) . "',");
123 123
 //    fwrite($file_handler, "'" . addslashes($string_value[$lang_id]) . "',");
124 124
   } else {
125 125
     $string_name_prefix = $string_name_prefix . "[{$string_name}]";
126 126
     fwrite($file_handler, "array(\r\n");
127
-    foreach($string_value as $arr_name => $arr_data) {
127
+    foreach ($string_value as $arr_name => $arr_data) {
128 128
       adm_lng_write_string($arr_name, $arr_data, $ident . '  ', $string_name_prefix);
129 129
     }
130 130
     fwrite($file_handler, "{$ident}),\r\n");
@@ -144,13 +144,13 @@  discard block
 block discarded – undo
144 144
 $languages_info = lng_get_list();
145 145
 $domain = sys_get_param_str('domain');
146 146
 
147
-if($domain) {
147
+if ($domain) {
148 148
   $lang_new = sys_get_param('lang_new');
149
-  if(!empty($lang_new) && is_array($lang_new)) {
149
+  if (!empty($lang_new) && is_array($lang_new)) {
150 150
     $constants = get_defined_constants(true);
151 151
     $constants = $constants['user'];
152 152
     ksort($constants);
153
-    foreach($languages_info as $lang_id => $land_data) {
153
+    foreach ($languages_info as $lang_id => $land_data) {
154 154
       $file_handler = fopen(SN_ROOT_PHYSICAL . "language/{$lang_id}/{$domain}.mo.php.new", 'w');
155 155
       fwrite($file_handler, "<?php\r\n\r\n/*\r\n#############################################################################
156 156
 #  Filename: {$domain}.mo.php
@@ -158,7 +158,7 @@  discard block
 block discarded – undo
158 158
 #  Website: http://www.supernova.ws
159 159
 #  Description: Massive Multiplayer Online Browser Space Strategy Game\r\n#\r\n");
160 160
 
161
-      foreach($land_data['LANG_COPYRIGHT'] as $lang_copyright) {
161
+      foreach ($land_data['LANG_COPYRIGHT'] as $lang_copyright) {
162 162
         $lang_copyright = str_replace(array('&copy;', '&quot;', '&lt;', '&gt;'), array('©', '"', '<', '>'), $lang_copyright);
163 163
         fwrite($file_handler, "#  {$lang_copyright}\r\n");
164 164
       }
@@ -166,7 +166,7 @@  discard block
 block discarded – undo
166 166
 /**\r\n*\r\n* @package language\r\n* @system [{$land_data['LANG_NAME_ENGLISH']}]\r\n* @version " . SN_VERSION . "\r\n*\r\n*/\r\n
167 167
 /**\r\n* DO NOT CHANGE\r\n*/\r\n\r\nif (!defined('INSIDE')) die();\r\n
168 168
 \$a_lang_array = array(\r\n");
169
-      foreach($lang_new as $string_name => $string_value) {
169
+      foreach ($lang_new as $string_name => $string_value) {
170 170
         adm_lng_write_string($string_name, $string_value);
171 171
       }
172 172
       fwrite($file_handler, ");\r\n");
@@ -176,21 +176,21 @@  discard block
 block discarded – undo
176 176
     sys_redirect("admin_locale.php?domain={$domain}");
177 177
   }
178 178
 
179
-  foreach($languages_info as $lang_id => $lang_data) {
179
+  foreach ($languages_info as $lang_id => $lang_data) {
180 180
     $template->assign_block_vars('language', $lang_data);
181 181
     $full_filename = SN_ROOT_PHYSICAL . "language/{$lang_id}/{$domain}.mo.php";
182 182
     $languages[$lang_id] = adm_lng_load($full_filename . (file_exists($full_filename . '.new') ? '.new' : ''));
183
-    foreach($languages[$lang_id] as $locale_string_name => $cork) {
183
+    foreach ($languages[$lang_id] as $locale_string_name => $cork) {
184 184
       adm_lng_assign_string($lang_id, "[{$locale_string_name}]", $languages[$lang_id][$locale_string_name]);
185 185
     }
186 186
   }
187 187
 
188
-  foreach($locale_string_template as $locale_string_name => $locale_string_list) {
188
+  foreach ($locale_string_template as $locale_string_name => $locale_string_list) {
189 189
     $template->assign_block_vars('string', array(
190 190
       'NAME' => $locale_string_name,
191 191
     ));
192 192
 
193
-    foreach($languages_info as $lang_id => $cork2) {
193
+    foreach ($languages_info as $lang_id => $cork2) {
194 194
       $template->assign_block_vars('string.locale', array(
195 195
         'LANG' => $lang_id,
196 196
         'VALUE' => $locale_string_list["[{$lang_id}]"],
@@ -206,17 +206,17 @@  discard block
 block discarded – undo
206 206
   $dir = dir($path);
207 207
   while (false !== ($lang_id = $dir->read())) {
208 208
     $full_path = $path . $lang_id;
209
-    if($lang_id[0] != "." && is_dir($full_path)) {
209
+    if ($lang_id[0] != "." && is_dir($full_path)) {
210 210
       $lang_file_list = dir($full_path);
211 211
       while (false !== ($filename = $lang_file_list->read())) {
212 212
         $lang_domain = strtolower(substr($filename, 0, strpos($filename, '.')));
213
-        if(!$lang_domain) {
213
+        if (!$lang_domain) {
214 214
           continue;
215 215
         }
216 216
 
217 217
         $file_ext = strtolower(substr($filename, strpos($filename, '.')));
218
-        if($lang_domain != 'language') {
219
-          if($file_ext == '.mo.php.new' || ($file_ext == '.mo.php' && empty($languages[$lang_id][$lang_domain]))) {
218
+        if ($lang_domain != 'language') {
219
+          if ($file_ext == '.mo.php.new' || ($file_ext == '.mo.php' && empty($languages[$lang_id][$lang_domain]))) {
220 220
             $language_domains[$lang_domain] = $lang_domain;
221 221
             $languages[$lang_id][$lang_domain] = $lang_domain;
222 222
           }
@@ -226,7 +226,7 @@  discard block
 block discarded – undo
226 226
   }
227 227
   $dir->close();
228 228
 
229
-  foreach($language_domains as $lang_domain) {
229
+  foreach ($language_domains as $lang_domain) {
230 230
     $template->assign_block_vars('domain', array(
231 231
       'NAME' => $lang_domain,
232 232
     ));
Please login to merge, or discard this patch.