Completed
Push — work-fleets ( f5fbda...1bdd41 )
by SuperNova.WS
06:04
created
includes/includes/flt_flying_fleet_handler2.php 1 patch
Spacing   +22 added lines, -26 removed lines patch added patch discarded remove patch
@@ -19,15 +19,11 @@  discard block
 block discarded – undo
19 19
 // ------------------------------------------------------------------
20 20
 function flt_flyingFleetsSort($a, $b) {
21 21
   // Сравниваем время флотов - кто раньше, тот и первый обрабатывается
22
-  return $a['fleet_time'] > $b['fleet_time'] ? 1 : ($a['fleet_time'] < $b['fleet_time'] ? -1 :
23
-    // Если время - одинаковое, сравниваем события флотов
22
+  return $a['fleet_time'] > $b['fleet_time'] ? 1 : ($a['fleet_time'] < $b['fleet_time'] ? -1 : // Если время - одинаковое, сравниваем события флотов
24 23
     // Если события - одинаковые, то флоты равны
25
-    ($a['fleet_event'] == $b['fleet_event'] ? 0 :
26
-      // Если события разные - первыми считаем прибывающие флоты
27
-      ($a['fleet_event'] == EVENT_FLT_ARRIVE ? 1 : ($b['fleet_event'] == EVENT_FLT_ARRIVE ? -1 :
28
-        // Если нет прибывающих флотов - дальше считаем флоты, которые закончили миссию
29
-        ($a['fleet_event'] == EVENT_FLT_ACOMPLISH ? 1 : ($b['fleet_event'] == EVENT_FLT_ACOMPLISH ? -1 :
30
-          // Если нет флотов, закончивших задание - остались возвращающиеся флоты, которые равны между собой
24
+    ($a['fleet_event'] == $b['fleet_event'] ? 0 : // Если события разные - первыми считаем прибывающие флоты
25
+      ($a['fleet_event'] == EVENT_FLT_ARRIVE ? 1 : ($b['fleet_event'] == EVENT_FLT_ARRIVE ? -1 : // Если нет прибывающих флотов - дальше считаем флоты, которые закончили миссию
26
+        ($a['fleet_event'] == EVENT_FLT_ACOMPLISH ? 1 : ($b['fleet_event'] == EVENT_FLT_ACOMPLISH ? -1 : // Если нет флотов, закончивших задание - остались возвращающиеся флоты, которые равны между собой
31 27
           // TODO: Добавить еще проверку по ID флота и/или времени запуска - что бы обсчитывать их в порядке запуска
32 28
           (
33 29
           0 // Вообще сюда доходить не должно - будет отсекаться на равенстве событий
@@ -41,7 +37,7 @@  discard block
 block discarded – undo
41 37
 function log_file($msg) {
42 38
   static $handler;
43 39
 
44
-  if(!$handler) {
40
+  if (!$handler) {
45 41
     $handler = fopen('event.log', 'a+');
46 42
   }
47 43
 
@@ -81,12 +77,12 @@  discard block
 block discarded – undo
81 77
   */
82 78
   global $debug;
83 79
 
84
-  if(classSupernova::$config->game_disable != GAME_DISABLE_NONE || $skip_fleet_update) {
80
+  if (classSupernova::$config->game_disable != GAME_DISABLE_NONE || $skip_fleet_update) {
85 81
     return;
86 82
   }
87 83
 
88 84
   sn_db_transaction_start();
89
-  if(classSupernova::$config->db_loadItem('game_disable') != GAME_DISABLE_NONE || SN_TIME_NOW - strtotime(classSupernova::$config->db_loadItem('fleet_update_last')) <= classSupernova::$config->fleet_update_interval) {
85
+  if (classSupernova::$config->db_loadItem('game_disable') != GAME_DISABLE_NONE || SN_TIME_NOW - strtotime(classSupernova::$config->db_loadItem('fleet_update_last')) <= classSupernova::$config->fleet_update_interval) {
90 86
     sn_db_transaction_rollback();
91 87
 
92 88
     return;
@@ -94,14 +90,14 @@  discard block
 block discarded – undo
94 90
 
95 91
 
96 92
   // Watchdog timer
97
-  if(classSupernova::$config->db_loadItem('fleet_update_lock')) {
98
-    if(defined('DEBUG_FLYING_FLEETS')) {
93
+  if (classSupernova::$config->db_loadItem('fleet_update_lock')) {
94
+    if (defined('DEBUG_FLYING_FLEETS')) {
99 95
       $random = 0;
100 96
     } else {
101 97
       $random = mt_rand(240, 300);
102 98
     }
103 99
 
104
-    if(SN_TIME_NOW - strtotime(classSupernova::$config->fleet_update_lock) <= $random) {
100
+    if (SN_TIME_NOW - strtotime(classSupernova::$config->fleet_update_lock) <= $random) {
105 101
       sn_db_transaction_rollback();
106 102
 
107 103
       return;
@@ -125,11 +121,11 @@  discard block
 block discarded – undo
125 121
   $missions_used = array();
126 122
 
127 123
   $objFleetList = FleetList::dbGetFleetListCurrentTick();
128
-  foreach($objFleetList->_container as $objFleet) {
124
+  foreach ($objFleetList->_container as $objFleet) {
129 125
     set_time_limit(15);
130 126
     // TODO - Унифицировать код с темплейтным разбором эвентов на планете!
131 127
     $missions_used[$objFleet->mission_type] = 1;
132
-    if($objFleet->time_arrive_to_target <= SN_TIME_NOW && !$objFleet->isReturning()) {
128
+    if ($objFleet->time_arrive_to_target <= SN_TIME_NOW && !$objFleet->isReturning()) {
133 129
       $fleet_event_list[] = array(
134 130
         'object'      => $objFleet,
135 131
         'fleet_time'  => $objFleet->time_arrive_to_target,
@@ -137,7 +133,7 @@  discard block
 block discarded – undo
137 133
       );
138 134
     }
139 135
 
140
-    if($objFleet->time_mission_job_complete > 0 && $objFleet->time_mission_job_complete <= SN_TIME_NOW && !$objFleet->isReturning()) {
136
+    if ($objFleet->time_mission_job_complete > 0 && $objFleet->time_mission_job_complete <= SN_TIME_NOW && !$objFleet->isReturning()) {
141 137
       $fleet_event_list[] = array(
142 138
         'object'      => $objFleet,
143 139
         'fleet_time'  => $objFleet->time_mission_job_complete,
@@ -145,7 +141,7 @@  discard block
 block discarded – undo
145 141
       );
146 142
     }
147 143
 
148
-    if($objFleet->time_return_to_source <= SN_TIME_NOW) {
144
+    if ($objFleet->time_return_to_source <= SN_TIME_NOW) {
149 145
       $fleet_event_list[] = array(
150 146
         'object'      => $objFleet,
151 147
         'fleet_time'  => $objFleet->time_return_to_source,
@@ -171,17 +167,17 @@  discard block
 block discarded – undo
171 167
 //    MT_MISSILE => 'flt_mission_missile.php',
172 168
     MT_EXPLORE   => 'flt_mission_explore',
173 169
   );
174
-  foreach($missions_used as $mission_id => $cork) {
170
+  foreach ($missions_used as $mission_id => $cork) {
175 171
     require_once(SN_ROOT_PHYSICAL . "includes/includes/{$mission_files[$mission_id]}" . DOT_PHP_EX);
176 172
   }
177 173
 
178 174
 //log_file('Обработка миссий');
179 175
   $sn_groups_mission = sn_get_groups('missions');
180
-  foreach($fleet_event_list as $fleet_event) {
176
+  foreach ($fleet_event_list as $fleet_event) {
181 177
     // TODO: Указатель тут потом сделать
182 178
     // TODO: СЕЙЧАС НАДО ПРОВЕРЯТЬ ПО БАЗЕ - А ЖИВОЙ ЛИ ФЛОТ?!
183 179
     $fleet_row = $fleet_event['fleet_row'];
184
-    if(empty($fleet_event['object'])) {
180
+    if (empty($fleet_event['object'])) {
185 181
       // Fleet was destroyed in course of previous actions
186 182
       continue;
187 183
     }
@@ -205,20 +201,20 @@  discard block
 block discarded – undo
205 201
 
206 202
     $objFleet->dbLoad($objFleet->dbId);
207 203
 
208
-    if(!$objFleet->dbId) {
204
+    if (!$objFleet->dbId) {
209 205
       // Fleet was destroyed in course of previous actions
210 206
       sn_db_transaction_commit();
211 207
       continue;
212 208
     }
213 209
 
214
-    if($fleet_event['fleet_event'] == EVENT_FLT_RETURN) {
210
+    if ($fleet_event['fleet_event'] == EVENT_FLT_RETURN) {
215 211
       // Fleet returns to planet
216 212
       $objFleet->shipsLand(true);
217 213
       sn_db_transaction_commit();
218 214
       continue;
219 215
     }
220 216
 
221
-    if($fleet_event['fleet_event'] == EVENT_FLT_ARRIVE && $objFleet->isReturning()) {
217
+    if ($fleet_event['fleet_event'] == EVENT_FLT_ARRIVE && $objFleet->isReturning()) {
222 218
       // При событии EVENT_FLT_ARRIVE флот всегда должен иметь fleet_mess == 0
223 219
       // В противном случае это означает, что флот уже был обработан ранее - например, при САБе
224 220
       sn_db_transaction_commit();
@@ -238,13 +234,13 @@  discard block
 block discarded – undo
238 234
     $objMission->dst_planet = $mission_data['dst_planet'] ? db_planet_by_vector($objFleet->target_coordinates_typed(), '', true, '`id`, `id_owner`, `name`') : null;
239 235
     $objMission->fleet_event = $fleet_event['fleet_event'];
240 236
 
241
-    if($objMission->dst_planet && $objMission->dst_planet['id_owner']) {
237
+    if ($objMission->dst_planet && $objMission->dst_planet['id_owner']) {
242 238
       $update_result = sys_o_get_updated($objMission->dst_planet['id_owner'], $objMission->dst_planet['id'], $objFleet->time_arrive_to_target);
243 239
       $objMission->dst_user = !empty($objMission->dst_user) ? $update_result['user'] : null;
244 240
       $objMission->dst_planet = $update_result['planet'];
245 241
     }
246 242
 
247
-    switch($objFleet->mission_type) {
243
+    switch ($objFleet->mission_type) {
248 244
       // Для боевых атак нужно обновлять по САБу и по холду - таки надо возвращать данные из обработчика миссий!
249 245
       case MT_AKS:
250 246
       case MT_ATTACK:
Please login to merge, or discard this patch.
includes/functions/uni_functions.php 1 patch
Spacing   +26 added lines, -26 removed lines patch added patch discarded remove patch
@@ -7,12 +7,12 @@  discard block
 block discarded – undo
7 7
 
8 8
   $possible_cores = array();
9 9
   $probability = 0;
10
-  foreach($density_list as $possible_core_id => $core_data) {
11
-    if(!$core_data[UNIT_PLANET_DENSITY_RARITY]) {
10
+  foreach ($density_list as $possible_core_id => $core_data) {
11
+    if (!$core_data[UNIT_PLANET_DENSITY_RARITY]) {
12 12
       continue;
13 13
     }
14 14
 
15
-    if(
15
+    if (
16 16
       // Core type exists
17 17
       in_array($possible_core_id, $position_data['core_types'])
18 18
       // Limit core type with planet sector count
@@ -33,8 +33,8 @@  discard block
 block discarded – undo
33 33
 
34 34
   $random = mt_rand(1, $probability);
35 35
   $selected_core = null;
36
-  foreach($possible_cores as $core_type => $core_info) {
37
-    if($random <= $core_info[UNIT_PLANET_DENSITY_RARITY]) {
36
+  foreach ($possible_cores as $core_type => $core_info) {
37
+    if ($random <= $core_info[UNIT_PLANET_DENSITY_RARITY]) {
38 38
       $selected_core = $core_info;
39 39
       break;
40 40
     }
@@ -57,7 +57,7 @@  discard block
 block discarded – undo
57 57
 function uni_create_planet($Galaxy, $System, $Position, $PlanetOwnerID, $planet_name_unsafe = '', $HomeWorld = false, $options = array()) {
58 58
   $Position = intval($Position);
59 59
 
60
-  if(!isset($options['skip_check']) && db_planet_by_gspt($Galaxy, $System, $Position, PT_PLANET, true, '`id`')) {
60
+  if (!isset($options['skip_check']) && db_planet_by_gspt($Galaxy, $System, $Position, PT_PLANET, true, '`id`')) {
61 61
     return false;
62 62
   }
63 63
 
@@ -66,11 +66,11 @@  discard block
 block discarded – undo
66 66
 
67 67
   $planet_generator = sn_get_groups('planet_generator');
68 68
 
69
-  if($HomeWorld) {
69
+  if ($HomeWorld) {
70 70
     $position_data = $planet_generator[0];
71 71
   } else {
72 72
     $position_data = $planet_generator[$Position >= UNIVERSE_RANDOM_PLANET_START || $Position < 1 ? UNIVERSE_RANDOM_PLANET_START : $Position];
73
-    if($Position >= UNIVERSE_RANDOM_PLANET_START) {
73
+    if ($Position >= UNIVERSE_RANDOM_PLANET_START) {
74 74
       // Корректируем температуру для планеты-странника
75 75
       $position_data['t_max_max'] -= UNIVERSE_RANDOM_PLANET_TEMPERATURE_DECREASE * ($Position - UNIVERSE_RANDOM_PLANET_START);
76 76
     }
@@ -170,15 +170,15 @@  discard block
 block discarded – undo
170 170
   $moon_name = '';
171 171
   $moon_row = array();
172 172
   $moon = db_planet_by_gspt($pos_galaxy, $pos_system, $pos_planet, PT_MOON, false, 'id');
173
-  if(!$moon['id']) {
173
+  if (!$moon['id']) {
174 174
     $moon_planet = db_planet_by_gspt($pos_galaxy, $pos_system, $pos_planet, PT_PLANET, true, '`id`, `temp_min`, `temp_max`, `name`, `debris_metal`, `debris_crystal`');
175 175
 
176
-    if($moon_planet['id']) {
176
+    if ($moon_planet['id']) {
177 177
       $base_storage_size = BASE_STORAGE_SIZE;
178 178
 
179
-      if(!$moon_chance) {
179
+      if (!$moon_chance) {
180 180
         $size = mt_rand(1100, 8999);
181
-      } elseif($moon_chance <= 100) {
181
+      } elseif ($moon_chance <= 100) {
182 182
         $size = mt_rand($moon_chance * 100 + 1000, $moon_chance * 200 + 2999);
183 183
       } else {
184 184
         $size = $moon_chance;
@@ -194,7 +194,7 @@  discard block
 block discarded – undo
194 194
 
195 195
       $field_max = ceil($size / 1000);
196 196
 
197
-      if(isset($options['image']) && $options['image']) {
197
+      if (isset($options['image']) && $options['image']) {
198 198
         $moon_image = $options['image'];
199 199
       } else {
200 200
         $moon_image = 'mond';
@@ -209,7 +209,7 @@  discard block
 block discarded – undo
209 209
           `deuterium` = '0', `deuterium_perhour` = '0', `deuterium_max` = '{$base_storage_size}'"
210 210
       );
211 211
 
212
-      if($update_debris) {
212
+      if ($update_debris) {
213 213
         $debris_spent = $moon_chance * 1000000;
214 214
         $metal_spent = round(min($moon_planet['debris_metal'], $debris_spent * mt_rand(50, 75) / 100));
215 215
         $crystal_spent = min($moon_planet['debris_crystal'], $debris_spent - $metal_spent);
@@ -244,21 +244,21 @@  discard block
 block discarded – undo
244 244
   $planet_row['id'] = $user['current_planet'];
245 245
 
246 246
   // Пытаемся переключить на новую планету
247
-  if(($selected_planet = sys_get_param_id('cp')) && $selected_planet != $user['current_planet']) {
247
+  if (($selected_planet = sys_get_param_id('cp')) && $selected_planet != $user['current_planet']) {
248 248
     $planet_row = db_planet_by_id_and_owner($selected_planet, $user['id'], false, 'id');
249 249
   } else {
250 250
     $planet_row = db_planet_by_id($planet_row['id']);
251 251
   }
252 252
 
253 253
   // Если новая планета не найдена или было переключения - проверяем текущую выбранную планету
254
-  if(!isset($planet_row['id'])) // || $planet_row['id'] != $user['current_planet']
254
+  if (!isset($planet_row['id'])) // || $planet_row['id'] != $user['current_planet']
255 255
   {
256 256
     $planet_row = db_planet_by_id_and_owner($user['current_planet'], $user['id'], false, 'id');
257 257
     // Если текущей планеты не существует - выставляем Столицу
258
-    if(!isset($planet_row['id'])) {
258
+    if (!isset($planet_row['id'])) {
259 259
       $planet_row = db_planet_by_id_and_owner($user['id_planet'], $user['id'], false, 'id');
260 260
       // Если и столицы не существует - значит что-то очень не так с записью пользователя
261
-      if(!isset($planet_row['id'])) {
261
+      if (!isset($planet_row['id'])) {
262 262
         global $debug;
263 263
         $debug->error("User ID {$user['id']} has Capital planet {$user['id_planet']} but this planet does not exists", 'User record error', 502);
264 264
       }
@@ -266,7 +266,7 @@  discard block
 block discarded – undo
266 266
   }
267 267
 
268 268
   // Если производилось переключение планеты - делаем запись в юзере
269
-  if($user['current_planet'] != $planet_row['id']) {
269
+  if ($user['current_planet'] != $planet_row['id']) {
270 270
     db_user_set_by_id($user['id'], "`current_planet` = '{$planet_row['id']}'");
271 271
     $user['current_planet'] = $planet_row['id'];
272 272
   }
@@ -284,7 +284,7 @@  discard block
 block discarded – undo
284 284
 }
285 285
 
286 286
 function uni_render_planet_full($from, $prefix = '', $html_safe = true, $include_id = false) {
287
-  if(!$from['id']) {
287
+  if (!$from['id']) {
288 288
     $result = classLocale::$lang['sys_planet_expedition'];
289 289
   } else {
290 290
     $from_planet_id = $include_id ? (
@@ -335,23 +335,23 @@  discard block
 block discarded – undo
335 335
 
336 336
 function uni_planet_teleport_check($user, $planetrow, $new_coordinates = null) {
337 337
   try {
338
-    if($planetrow['planet_teleport_next'] && $planetrow['planet_teleport_next'] > SN_TIME_NOW) {
338
+    if ($planetrow['planet_teleport_next'] && $planetrow['planet_teleport_next'] > SN_TIME_NOW) {
339 339
       throw new exception(classLocale::$lang['ov_teleport_err_cooldown'], ERR_ERROR);
340 340
     }
341 341
 
342
-    if(mrc_get_level($user, null, RES_DARK_MATTER) < classSupernova::$config->planet_teleport_cost) {
342
+    if (mrc_get_level($user, null, RES_DARK_MATTER) < classSupernova::$config->planet_teleport_cost) {
343 343
       throw new exception(classLocale::$lang['ov_teleport_err_no_dark_matter'], ERR_ERROR);
344 344
     }
345 345
 
346 346
     // TODO: Replace quick-check with using gathered flying fleet data
347
-    if(FleetList::fleet_count_incoming($planetrow['galaxy'], $planetrow['system'], $planetrow['planet'])) {
347
+    if (FleetList::fleet_count_incoming($planetrow['galaxy'], $planetrow['system'], $planetrow['planet'])) {
348 348
       throw new exception(classLocale::$lang['ov_teleport_err_fleet'], ERR_ERROR);
349 349
     }
350 350
 
351
-    if(is_array($new_coordinates)) {
351
+    if (is_array($new_coordinates)) {
352 352
       $new_coordinates['planet_type'] = PT_PLANET;
353 353
       $incoming = db_planet_by_vector($new_coordinates, '', true, 'id');
354
-      if($incoming['id']) {
354
+      if ($incoming['id']) {
355 355
         throw new exception(classLocale::$lang['ov_teleport_err_destination_busy'], ERR_ERROR);
356 356
       }
357 357
     }
@@ -360,7 +360,7 @@  discard block
 block discarded – undo
360 360
       'result'  => ERR_NONE,
361 361
       'message' => '',
362 362
     );
363
-  } catch(exception $e) {
363
+  } catch (exception $e) {
364 364
     $response = array(
365 365
       'result'  => $e->getCode(),
366 366
       'message' => $e->getMessage(),
Please login to merge, or discard this patch.
includes/functions/sys_user.php 1 patch
Spacing   +22 added lines, -22 removed lines patch added patch discarded remove patch
@@ -7,7 +7,7 @@  discard block
 block discarded – undo
7 7
  */
8 8
 
9 9
 function sys_user_vacation($user) {
10
-  if(sys_get_param_str('vacation') == 'leave') {
10
+  if (sys_get_param_str('vacation') == 'leave') {
11 11
     if ($user['vacation'] < SN_TIME_NOW) {
12 12
       $user['vacation'] = 0;
13 13
       $user['vacation_next'] = SN_TIME_NOW + classSupernova::$config->player_vacation_timeout;
@@ -15,7 +15,7 @@  discard block
 block discarded – undo
15 15
     }
16 16
   }
17 17
 
18
-  if($user['vacation']) {
18
+  if ($user['vacation']) {
19 19
     // sn_sys_logout(false, true);
20 20
     // core_auth::logout(false, true);
21 21
 
@@ -45,33 +45,33 @@  discard block
 block discarded – undo
45 45
   // TODO: Full rewrite
46 46
   sn_db_transaction_start();
47 47
   $TheUser = db_user_by_id($UserID);
48
-  if ( $TheUser['ally_id'] != 0 ) {
49
-    $TheAlly = doquery ( "SELECT * FROM `{{alliance}}` WHERE `id` = '" . $TheUser['ally_id'] . "';", '', true );
48
+  if ($TheUser['ally_id'] != 0) {
49
+    $TheAlly = doquery("SELECT * FROM `{{alliance}}` WHERE `id` = '" . $TheUser['ally_id'] . "';", '', true);
50 50
     $TheAlly['ally_members'] -= 1;
51
-    if ( $TheAlly['ally_members'] > 0 ) {
52
-      doquery ( "UPDATE `{{alliance}}` SET `ally_members` = '" . $TheAlly['ally_members'] . "' WHERE `id` = '" . $TheAlly['id'] . "';");
51
+    if ($TheAlly['ally_members'] > 0) {
52
+      doquery("UPDATE `{{alliance}}` SET `ally_members` = '" . $TheAlly['ally_members'] . "' WHERE `id` = '" . $TheAlly['id'] . "';");
53 53
     } else {
54
-      doquery ( "DELETE FROM `{{alliance}}` WHERE `id` = '" . $TheAlly['id'] . "';");
55
-      doquery ( "DELETE FROM `{{statpoints}}` WHERE `stat_type` = '2' AND `id_owner` = '" . $TheAlly['id'] . "';");
54
+      doquery("DELETE FROM `{{alliance}}` WHERE `id` = '" . $TheAlly['id'] . "';");
55
+      doquery("DELETE FROM `{{statpoints}}` WHERE `stat_type` = '2' AND `id_owner` = '" . $TheAlly['id'] . "';");
56 56
     }
57 57
   }
58
-  doquery ( "DELETE FROM `{{statpoints}}` WHERE `stat_type` = '1' AND `id_owner` = '" . $UserID . "';");
58
+  doquery("DELETE FROM `{{statpoints}}` WHERE `stat_type` = '1' AND `id_owner` = '" . $UserID . "';");
59 59
 
60 60
   db_planet_list_delete_by_owner($UserID);
61 61
 
62
-  doquery ( "DELETE FROM `{{messages}}` WHERE `message_sender` = '" . $UserID . "';");
63
-  doquery ( "DELETE FROM `{{messages}}` WHERE `message_owner` = '" . $UserID . "';");
64
-  doquery ( "DELETE FROM `{{notes}}` WHERE `owner` = '" . $UserID . "';");
62
+  doquery("DELETE FROM `{{messages}}` WHERE `message_sender` = '" . $UserID . "';");
63
+  doquery("DELETE FROM `{{messages}}` WHERE `message_owner` = '" . $UserID . "';");
64
+  doquery("DELETE FROM `{{notes}}` WHERE `owner` = '" . $UserID . "';");
65 65
   FleetList::db_fleet_list_delete_by_owner($UserID);
66 66
 //  doquery ( "DELETE FROM `{{rw}}` WHERE `id_owner1` = '" . $UserID . "';");
67 67
 //  doquery ( "DELETE FROM `{{rw}}` WHERE `id_owner2` = '" . $UserID . "';");
68
-  doquery ( "DELETE FROM `{{buddy}}` WHERE `BUDDY_SENDER_ID` = '" . $UserID . "';");
69
-  doquery ( "DELETE FROM `{{buddy}}` WHERE `BUDDY_OWNER_ID` = '" . $UserID . "';");
70
-  doquery ( "DELETE FROM `{{annonce}}` WHERE `user` = '" . $UserID . "';");
68
+  doquery("DELETE FROM `{{buddy}}` WHERE `BUDDY_SENDER_ID` = '" . $UserID . "';");
69
+  doquery("DELETE FROM `{{buddy}}` WHERE `BUDDY_OWNER_ID` = '" . $UserID . "';");
70
+  doquery("DELETE FROM `{{annonce}}` WHERE `user` = '" . $UserID . "';");
71 71
 
72 72
 
73 73
   classSupernova::db_del_record_by_id(LOC_USER, $UserID);
74
-  doquery ( "DELETE FROM `{{referrals}}` WHERE (`id` = '{$UserID}') OR (`id_partner` = '{$UserID}');");
74
+  doquery("DELETE FROM `{{referrals}}` WHERE (`id` = '{$UserID}') OR (`id_partner` = '{$UserID}');");
75 75
   classSupernova::$config->db_saveItem('users_amount', classSupernova::$config->db_loadItem('users_amount') - 1);
76 76
   sn_db_transaction_commit();
77 77
 }
@@ -145,7 +145,7 @@  discard block
 block discarded – undo
145 145
   !empty($options['password_encoded_unsafe']) ? $field_set['password'] = $options['password_encoded_unsafe'] : false;
146 146
 
147 147
   $user_new = classSupernova::db_ins_field_set(LOC_USER, $field_set);
148
-  if(!($options['galaxy'] && $options['system'] && $options['planet'])) {
148
+  if (!($options['galaxy'] && $options['system'] && $options['planet'])) {
149 149
     $options['galaxy'] = classSupernova::$config->LastSettedGalaxyPos;
150 150
     $options['system'] = classSupernova::$config->LastSettedSystemPos;
151 151
     $segment_size = floor(classSupernova::$config->game_maxPlanet / 3);
@@ -154,19 +154,19 @@  discard block
 block discarded – undo
154 154
     $options['planet'] = mt_rand(1 + $segment * $segment_size, ($segment + 1) * $segment_size);
155 155
 
156 156
     // $new_planet_id = 0;
157
-    while(true) {
158
-      if($options['planet'] > classSupernova::$config->game_maxPlanet) {
157
+    while (true) {
158
+      if ($options['planet'] > classSupernova::$config->game_maxPlanet) {
159 159
         $options['planet'] = mt_rand(0, $segment_size - 1) + 1;
160 160
         $options['system']++;
161 161
       }
162
-      if($options['system'] > classSupernova::$config->game_maxSystem) {
162
+      if ($options['system'] > classSupernova::$config->game_maxSystem) {
163 163
         $options['system'] = 1;
164 164
         $options['galaxy']++;
165 165
       }
166 166
       $options['galaxy'] > classSupernova::$config->game_maxGalaxy ? $options['galaxy'] = 1 : false;
167 167
 
168 168
       $galaxy_row = db_planet_by_gspt($options['galaxy'], $options['system'], $options['planet'], PT_PLANET, true, 'id');
169
-      if(!$galaxy_row['id']) {
169
+      if (!$galaxy_row['id']) {
170 170
         classSupernova::$config->db_saveItem(array(
171 171
           'LastSettedGalaxyPos' => $options['galaxy'],
172 172
           'LastSettedSystemPos' => $options['system'],
@@ -189,7 +189,7 @@  discard block
 block discarded – undo
189 189
   $username_safe = db_escape($username_unsafe);
190 190
   db_player_name_history_replace($user_new, $username_safe);
191 191
 
192
-  if(!empty($options['partner_id']) && ($referral_row = db_user_by_id($options['partner_id'], true))) {
192
+  if (!empty($options['partner_id']) && ($referral_row = db_user_by_id($options['partner_id'], true))) {
193 193
     db_referral_insert($options, $user_new);
194 194
   }
195 195
 
Please login to merge, or discard this patch.
includes/functions/int_banner_create.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -15,7 +15,7 @@  discard block
 block discarded – undo
15 15
 // banner.php?id=<userid>&type=<banner|userbar>&format=<png>
16 16
   $id = intval($id);
17 17
 
18
-  switch($type) {
18
+  switch ($type) {
19 19
     case 'banner':
20 20
       $img_name = classSupernova::$config->int_banner_background;
21 21
     break;
@@ -48,7 +48,7 @@  discard block
 block discarded – undo
48 48
     'info'     => SN_ROOT_PHYSICAL . "design/fonts/" . classSupernova::$config->int_banner_fontInfo,
49 49
   );
50 50
 
51
-  if($id) {
51
+  if ($id) {
52 52
     // Querys
53 53
     $user = db_user_by_id($id);
54 54
     $planet_row = db_planet_by_id($user['id_planet']);
@@ -64,7 +64,7 @@  discard block
 block discarded – undo
64 64
   }
65 65
 
66 66
   $b_univ = classSupernova::$config->game_name;
67
-  switch($type) {
67
+  switch ($type) {
68 68
     case 'banner':
69 69
       // Banner size 416 x 58
70 70
       $fsize = 15;
@@ -77,7 +77,7 @@  discard block
 block discarded – undo
77 77
       imagettftext($image, 11, 0, 8, 26, $txt_shadow, $fonts['info'], $b_user);
78 78
       imagettftext($image, 11, 0, 6, 23, $txt_color, $fonts['info'], $b_user);
79 79
 
80
-      if($id) {
80
+      if ($id) {
81 81
         // Player level - right-alligned
82 82
         $is = imagettfbbox(11, 0, $fonts['info'], $b_lvl);
83 83
         imagettftext($image, 11, 0, $size[0] - 4 - $is[2], 25, $txt_shadow, $fonts['info'], $b_lvl);
@@ -135,7 +135,7 @@  discard block
 block discarded – undo
135 135
       imagettftext($image, 9, 0, 4, $size[1] - 4, $txt_shadow, $fonts['userbar'], $b_user);
136 136
       imagettftext($image, 9, 0, 2, $size[1] - 6, $txt_color, $fonts['userbar'], $b_user);
137 137
 
138
-      if($id) {
138
+      if ($id) {
139 139
         // Player level - right-alligned
140 140
         $isp = imagettfbbox(9, 0, $fonts['userbar'], $b_lvl);
141 141
         imagettftext($image, 9, 0, $is - $isp[2] - 10, $size[1] - 4, $txt_shadow, $fonts['userbar'], $b_lvl);
Please login to merge, or discard this patch.
includes/functions/eco_queue.php 1 patch
Spacing   +93 added lines, -93 removed lines patch added patch discarded remove patch
@@ -2,8 +2,8 @@  discard block
 block discarded – undo
2 2
 
3 3
 function que_get_unit_que($unit_id) {
4 4
   $que_type = false;
5
-  foreach(sn_get_groups('ques') as $que_id => $que_data) {
6
-    if(in_array($unit_id, $que_data['unit_list'])) {
5
+  foreach (sn_get_groups('ques') as $que_id => $que_data) {
6
+    if (in_array($unit_id, $que_data['unit_list'])) {
7 7
       $que_type = $que_id;
8 8
       break;
9 9
     }
@@ -14,14 +14,14 @@  discard block
 block discarded – undo
14 14
 
15 15
 
16 16
 function que_get_max_que_length($user, $planet, $que_id, $que_data = null) {
17
-  if(empty($que_data)) {
17
+  if (empty($que_data)) {
18 18
     $que_data = sn_get_groups('ques');
19 19
     $que_data = $que_data[$que_id];
20 20
   }
21 21
 
22 22
 
23 23
   $que_length = 1;
24
-  switch($que_id) {
24
+  switch ($que_id) {
25 25
     case QUE_RESEARCH:
26 26
       $que_length = classSupernova::$config->server_que_length_research + mrc_get_level($user, null, UNIT_PREMIUM); // TODO - вынести в модуль
27 27
     break;
@@ -35,8 +35,8 @@  discard block
 block discarded – undo
35 35
 
36 36
 function eco_que_str2arr($que_str) {
37 37
   $que_arr = explode(';', $que_str);
38
-  foreach($que_arr as $que_index => &$que_item) {
39
-    if($que_item) {
38
+  foreach ($que_arr as $que_index => &$que_item) {
39
+    if ($que_item) {
40 40
       $que_item = explode(',', $que_item);
41 41
     } else {
42 42
       unset($que_arr[$que_index]);
@@ -47,7 +47,7 @@  discard block
 block discarded – undo
47 47
 }
48 48
 
49 49
 function eco_que_arr2str($que_arr) {
50
-  foreach($que_arr as &$que_item) {
50
+  foreach ($que_arr as &$que_item) {
51 51
     $que_item = implode(',', $que_item);
52 52
   }
53 53
 
@@ -59,14 +59,14 @@  discard block
 block discarded – undo
59 59
   $classLocale = classLocale::$lang;
60 60
 
61 61
   $is_autoconvert = false;
62
-  if($build_mode == BUILD_AUTOCONVERT || sys_get_param_int('auto_convert')) {
62
+  if ($build_mode == BUILD_AUTOCONVERT || sys_get_param_int('auto_convert')) {
63 63
     $build_mode = BUILD_CREATE;
64 64
     $is_autoconvert = true;
65 65
   }
66 66
 
67 67
   $unit_amount_qued = 0;
68 68
   try {
69
-    if(!$user['id']) {
69
+    if (!$user['id']) {
70 70
       throw new exception('{Нет идентификатора пользователя - сообщите Администрации}', ERR_ERROR); // TODO EXCEPTION
71 71
     }
72 72
 
@@ -77,16 +77,16 @@  discard block
 block discarded – undo
77 77
       foreach($unit_list as $unit_id => $unit_amount) if($unit_amount) break;
78 78
     }
79 79
     */
80
-    if(!$unit_id) {
80
+    if (!$unit_id) {
81 81
       throw new exception('{Нет идентификатора юнита - сообщите Администрации}', ERR_ERROR); // TODO EXCEPTION
82 82
     }
83 83
 
84 84
     $que_id = que_get_unit_que($unit_id);
85
-    if(!$que_id) {
85
+    if (!$que_id) {
86 86
       throw new exception('{Неправильный тип очереди - сообщите Администрации}', ERR_ERROR); // TODO EXCEPTION
87 87
     }
88 88
 
89
-    if($build_mode == BUILD_DESTROY && $que_id != QUE_STRUCTURES) {
89
+    if ($build_mode == BUILD_DESTROY && $que_id != QUE_STRUCTURES) {
90 90
       throw new exception('{Уничтожать можно только здания на планете}', ERR_ERROR); // TODO EXCEPTION
91 91
     }
92 92
 
@@ -94,11 +94,11 @@  discard block
 block discarded – undo
94 94
     $que_data = $que_data[$que_id];
95 95
 
96 96
     // TODO Переделать под подочереди
97
-    if($que_id == QUE_STRUCTURES) {
97
+    if ($que_id == QUE_STRUCTURES) {
98 98
       $sn_groups_build_allow = sn_get_groups('build_allow');
99 99
       $que_data['unit_list'] = $sn_groups_build_allow[$planet['planet_type']];
100 100
 
101
-      if(!isset($que_data['unit_list'][$unit_id])) {
101
+      if (!isset($que_data['unit_list'][$unit_id])) {
102 102
         throw new exception('{Это здание нельзя строить на ' . ($planet['planet_type'] == PT_PLANET ? 'планете' : 'луне'), ERR_ERROR); // TODO EXCEPTION
103 103
       }
104 104
     }
@@ -119,7 +119,7 @@  discard block
 block discarded – undo
119 119
     // Это нужно, что бы заблокировать пользователя и работу с очередями
120 120
     $user = db_user_by_id($user['id']);
121 121
     // Это нужно, что бы заблокировать планету от списания ресурсов
122
-    if(isset($planet['id']) && $planet['id']) {
122
+    if (isset($planet['id']) && $planet['id']) {
123 123
       $planet = db_planet_by_id($planet['id'], true);
124 124
     } else {
125 125
       $planet['id'] = 0;
@@ -131,12 +131,12 @@  discard block
 block discarded – undo
131 131
     $in_que = &$que['in_que'][$que_id][$user['id']][$planet_id];
132 132
     $que_max_length = que_get_max_que_length($user, $planet, $que_id, $que_data);
133 133
     // TODO Добавить вызовы функций проверок текущей и максимальной длин очередей
134
-    if(count($in_que) >= $que_max_length) {
134
+    if (count($in_que) >= $que_max_length) {
135 135
       throw new exception('{Все слоты очереди заняты}', ERR_ERROR); // TODO EXCEPTION
136 136
     }
137 137
 
138 138
     // TODO Отдельно посмотреть на уничтожение зданий - что бы можно было уничтожать их без планов
139
-    switch(eco_can_build_unit($user, $planet, $unit_id)) {
139
+    switch (eco_can_build_unit($user, $planet, $unit_id)) {
140 140
       case BUILD_ALLOWED:
141 141
       break;
142 142
       case BUILD_UNIT_BUSY:
@@ -144,7 +144,7 @@  discard block
 block discarded – undo
144 144
       break; // TODO EXCEPTION eco_bld_msg_err_laboratory_upgrading
145 145
       // case BUILD_REQUIRE_NOT_MEET:
146 146
       default:
147
-        if($build_mode == BUILD_CREATE) {
147
+        if ($build_mode == BUILD_CREATE) {
148 148
           throw new exception('{Требования не удовлетворены}', ERR_ERROR);
149 149
         }
150 150
       break; // TODO EXCEPTION eco_bld_msg_err_requirements_not_meet
@@ -154,14 +154,14 @@  discard block
 block discarded – undo
154 154
     $unit_amount_qued = $unit_amount;
155 155
     $units_qued = isset($in_que[$unit_id]) ? $in_que[$unit_id] : 0;
156 156
     $unit_level = mrc_get_level($user, $planet, $unit_id, true, true) + $units_qued;
157
-    if($unit_max = get_unit_param($unit_id, P_MAX_STACK)) {
158
-      if($unit_level >= $unit_max) {
157
+    if ($unit_max = get_unit_param($unit_id, P_MAX_STACK)) {
158
+      if ($unit_level >= $unit_max) {
159 159
         throw new exception('{Максимальное количество юнитов данного типа уже достигнуто или будет достигнуто по окончанию очереди}', ERR_ERROR); // TODO EXCEPTION
160 160
       }
161 161
       $unit_amount = max(0, min($unit_amount, $unit_max - $unit_level));
162 162
     }
163 163
 
164
-    if($unit_amount < 1) {
164
+    if ($unit_amount < 1) {
165 165
       throw new exception('{Неправильное количество юнитов - сообщите Администрации}', ERR_ERROR); // TODO EXCEPTION
166 166
     }
167 167
 
@@ -170,21 +170,21 @@  discard block
 block discarded – undo
170 170
     //  {
171 171
     //    die('Unit busy'); // TODO EXCEPTION
172 172
     //  }
173
-    if(get_unit_param($unit_id, P_STACKABLE)) {
173
+    if (get_unit_param($unit_id, P_STACKABLE)) {
174 174
       // TODO Поле 'max_Lot_size' для ограничения размера стэка в очереди - то ли в юниты, то ли в очередь
175
-      if(in_array($unit_id, $group_missile = sn_get_groups('missile'))) {
175
+      if (in_array($unit_id, $group_missile = sn_get_groups('missile'))) {
176 176
         // TODO Поле 'container' - указывает на родительску структуру, в которой хранится данный юнит и по вместительности которой нужно применять размер юнита
177 177
         $used_silo = 0;
178
-        foreach($group_missile as $missile_id) {
178
+        foreach ($group_missile as $missile_id) {
179 179
           $missile_qued = isset($in_que[$missile_id]) ? $in_que[$missile_id] : 0;
180 180
           $used_silo += (mrc_get_level($user, $planet, $missile_id, true, true) + $missile_qued) * get_unit_param($missile_id, P_UNIT_SIZE);
181 181
         }
182 182
         $free_silo = mrc_get_level($user, $planet, STRUC_SILO) * get_unit_param(STRUC_SILO, P_CAPACITY) - $used_silo;
183
-        if($free_silo <= 0) {
183
+        if ($free_silo <= 0) {
184 184
           throw new exception('{Ракетная шахта уже заполнена или будет заполнена по окончанию очереди}', ERR_ERROR); // TODO EXCEPTION
185 185
         }
186 186
         $unit_size = get_unit_param($unit_id, P_UNIT_SIZE);
187
-        if($free_silo < $unit_size) {
187
+        if ($free_silo < $unit_size) {
188 188
           throw new exception("{В ракетной шахте нет места для {$classLocale['tech'][$unit_id]}}", ERR_ERROR); // TODO EXCEPTION
189 189
         }
190 190
         $unit_amount = max(0, min($unit_amount, floor($free_silo / $unit_size)));
@@ -192,10 +192,10 @@  discard block
 block discarded – undo
192 192
       $unit_level = $new_unit_level = 0;
193 193
     } else {
194 194
       $unit_amount = 1;
195
-      if($que_id == QUE_STRUCTURES) {
195
+      if ($que_id == QUE_STRUCTURES) {
196 196
         // if($build_mode == BUILD_CREATE && eco_planet_fields_max($planet) - $planet['field_current'] - $que['sectors'][$planet['id']] <= 0)
197 197
         $sectors_qued = is_array($in_que) ? array_sum($in_que) : 0;
198
-        if($build_mode == BUILD_CREATE && eco_planet_fields_max($planet) - $planet['field_current'] - $sectors_qued <= 0) {
198
+        if ($build_mode == BUILD_CREATE && eco_planet_fields_max($planet) - $planet['field_current'] - $sectors_qued <= 0) {
199 199
           throw new exception('{Не хватает секторов на планете}', ERR_ERROR); // TODO EXCEPTION
200 200
         }
201 201
         // И что это я такое написал? Зачем?
@@ -212,9 +212,9 @@  discard block
 block discarded – undo
212 212
 
213 213
     $exchange = array();
214 214
     $market_get_autoconvert_cost = market_get_autoconvert_cost();
215
-    if($is_autoconvert && $build_data[BUILD_AUTOCONVERT]) {
215
+    if ($is_autoconvert && $build_data[BUILD_AUTOCONVERT]) {
216 216
       $dark_matter = mrc_get_level($user, null, RES_DARK_MATTER);
217
-      if(mrc_get_level($user, null, RES_DARK_MATTER) < $market_get_autoconvert_cost) {
217
+      if (mrc_get_level($user, null, RES_DARK_MATTER) < $market_get_autoconvert_cost) {
218 218
         throw new exception("{Нет хватает " . ($market_get_autoconvert_cost - $dark_matter) . "ТМ на постройки с автоконвертацией ресурсов}", ERR_ERROR); // TODO EXCEPTION
219 219
       }
220 220
 
@@ -224,7 +224,7 @@  discard block
 block discarded – undo
224 224
       $resource_exchange_rates = array();
225 225
       $resource_diff = array();
226 226
       $all_positive = true;
227
-      foreach($resources_loot as $resource_id) {
227
+      foreach ($resources_loot as $resource_id) {
228 228
         $resource_db_name = pname_resource_name($resource_id);
229 229
         $resource_got[$resource_id] = floor(mrc_get_level($user, $planet, $resource_id));
230 230
         $resource_exchange_rates[$resource_id] = classSupernova::$config->__get("rpg_exchange_{$resource_db_name}");
@@ -232,15 +232,15 @@  discard block
 block discarded – undo
232 232
         $all_positive = $all_positive && ($resource_diff[$resource_id] > 0);
233 233
       }
234 234
       // Нужна автоконвертация
235
-      if($all_positive) {
235
+      if ($all_positive) {
236 236
         $is_autoconvert = false;
237 237
       } else {
238
-        foreach($resource_diff as $resource_diff_id => &$resource_diff_amount) {
239
-          if($resource_diff_amount >= 0) {
238
+        foreach ($resource_diff as $resource_diff_id => &$resource_diff_amount) {
239
+          if ($resource_diff_amount >= 0) {
240 240
             continue;
241 241
           }
242
-          foreach($resource_diff as $resource_got_id => &$resource_got_amount) {
243
-            if($resource_got_amount <= 0) {
242
+          foreach ($resource_diff as $resource_got_id => &$resource_got_amount) {
243
+            if ($resource_got_amount <= 0) {
244 244
               continue;
245 245
             }
246 246
             $current_exchange = $resource_exchange_rates[$resource_got_id] / $resource_exchange_rates[$resource_diff_id];
@@ -256,14 +256,14 @@  discard block
 block discarded – undo
256 256
         }
257 257
 
258 258
         $is_autoconvert_ok = true;
259
-        foreach($resource_diff as $resource_diff_amount2) {
260
-          if($resource_diff_amount2 < 0) {
259
+        foreach ($resource_diff as $resource_diff_amount2) {
260
+          if ($resource_diff_amount2 < 0) {
261 261
             $is_autoconvert_ok = false;
262 262
             break;
263 263
           }
264 264
         }
265 265
 
266
-        if($is_autoconvert_ok) {
266
+        if ($is_autoconvert_ok) {
267 267
           $build_data['RESULT'][$build_mode] = BUILD_ALLOWED;
268 268
           $build_data['CAN'][$build_mode] = $unit_amount;
269 269
         } else {
@@ -272,19 +272,19 @@  discard block
 block discarded – undo
272 272
       }
273 273
     }
274 274
     $unit_amount = min($build_data['CAN'][$build_mode], $unit_amount);
275
-    if($unit_amount <= 0) {
275
+    if ($unit_amount <= 0) {
276 276
       throw new exception('{Не хватает ресурсов}', ERR_ERROR); // TODO EXCEPTION
277 277
     }
278 278
 
279
-    if($new_unit_level < 0) {
279
+    if ($new_unit_level < 0) {
280 280
       throw new exception('{Нельзя уничтожить больше юнитов, чем есть}', ERR_ERROR); // TODO EXCEPTION
281 281
     }
282 282
 
283
-    if($build_data['RESULT'][$build_mode] != BUILD_ALLOWED) {
283
+    if ($build_data['RESULT'][$build_mode] != BUILD_ALLOWED) {
284 284
       throw new exception('{Строительство блокировано}', ERR_ERROR); // TODO EXCEPTION
285 285
     }
286 286
 
287
-    if($is_autoconvert) {
287
+    if ($is_autoconvert) {
288 288
       ksort($exchange);
289 289
       ksort($resource_got);
290 290
       db_change_units($user, $planet, array(
@@ -299,7 +299,7 @@  discard block
 block discarded – undo
299 299
     }
300 300
 
301 301
     $unit_amount_qued = 0;
302
-    while($unit_amount > 0 && count($que['ques'][$que_id][$user['id']][$planet_id]) < $que_max_length) {
302
+    while ($unit_amount > 0 && count($que['ques'][$que_id][$user['id']][$planet_id]) < $que_max_length) {
303 303
       $place = min($unit_amount, MAX_FLEET_OR_DEFS_PER_ROW);
304 304
       que_add_unit($unit_id, $user, $planet, $build_data, $new_unit_level, $place, $build_mode);
305 305
       $unit_amount -= $place;
@@ -309,7 +309,7 @@  discard block
 block discarded – undo
309 309
 
310 310
     sn_db_transaction_commit();
311 311
 
312
-    if($redirect) {
312
+    if ($redirect) {
313 313
       sys_redirect("{$_SERVER['PHP_SELF']}?mode=" . sys_get_param_str('mode') . "&ally_id=" . sys_get_param_id('ally_id'));
314 314
       die();
315 315
     }
@@ -318,7 +318,7 @@  discard block
 block discarded – undo
318 318
       'STATUS'  => ERR_NONE,
319 319
       'MESSAGE' => '{Строительство начато}',
320 320
     );
321
-  } catch(exception $e) {
321
+  } catch (exception $e) {
322 322
     sn_db_transaction_rollback();
323 323
     $operation_result = array(
324 324
       'STATUS'  => in_array($e->getCode(), array(ERR_NONE, ERR_WARNING, ERR_ERROR)) ? $e->getCode() : ERR_ERROR,
@@ -326,7 +326,7 @@  discard block
 block discarded – undo
326 326
     );
327 327
   }
328 328
 
329
-  if(!empty($operation_result['MESSAGE'])) {
329
+  if (!empty($operation_result['MESSAGE'])) {
330 330
     $operation_result['MESSAGE'] .= ' ' . ($unit_amount_qued ? $unit_amount_qued : $unit_amount) . 'x[' . classLocale::$lang['tech'][$unit_id] . ']';
331 331
   }
332 332
 
@@ -337,11 +337,11 @@  discard block
 block discarded – undo
337 337
 function que_recalculate($old_que) {
338 338
   $new_que = array();
339 339
 
340
-  if(!is_array($old_que['items'])) {
340
+  if (!is_array($old_que['items'])) {
341 341
     return $new_que;
342 342
   }
343
-  foreach($old_que['items'] as $row) {
344
-    if(!isset($row) || !$row || $row['que_unit_amount'] <= 0) {
343
+  foreach ($old_que['items'] as $row) {
344
+    if (!isset($row) || !$row || $row['que_unit_amount'] <= 0) {
345 345
       continue;
346 346
     }
347 347
 
@@ -352,9 +352,9 @@  discard block
 block discarded – undo
352 352
 
353 353
     $last_id = count($new_que['items']) - 1;
354 354
 
355
-    if($row['que_planet_id']) {
355
+    if ($row['que_planet_id']) {
356 356
       $new_que['planets'][$row['que_planet_id']][$row['que_type']][] = &$new_que['items'][$last_id];
357
-    } elseif($row['que_type'] == QUE_RESEARCH) {
357
+    } elseif ($row['que_type'] == QUE_RESEARCH) {
358 358
       $new_que['players'][$row['que_player_id']][$row['que_type']][] = &$new_que['items'][$last_id];
359 359
     }
360 360
     $new_que['ques'][$row['que_type']][$row['que_player_id']][intval($row['que_planet_id'])][] = &$new_que['items'][$last_id];
@@ -389,9 +389,9 @@  discard block
 block discarded – undo
389 389
   $que_type = que_get_unit_que($unit_id);
390 390
   $planet_id_origin = $planet['id'] ? $planet['id'] : 'NULL';
391 391
   $planet_id = $que_type == QUE_RESEARCH ? 'NULL' : $planet_id_origin;
392
-  if(is_numeric($planet_id)) {
392
+  if (is_numeric($planet_id)) {
393 393
     db_planet_set_by_id($planet_id, "`que_processed` = UNIX_TIMESTAMP(NOW())");
394
-  } elseif(is_numeric($user['id'])) {
394
+  } elseif (is_numeric($user['id'])) {
395 395
     db_user_set_by_id($user['id'], '`que_processed` = UNIX_TIMESTAMP(NOW())');
396 396
   }
397 397
 
@@ -421,17 +421,17 @@  discard block
 block discarded – undo
421 421
   $planet['id'] = $planet['id'] && $que_type !== QUE_RESEARCH ? $planet['id'] : 0;
422 422
   $global_que = que_get($user['id'], $planet['id'], $que_type, true);
423 423
 
424
-  if(!empty($global_que['ques'][$que_type][$user['id']][$planet['id']])) {
424
+  if (!empty($global_que['ques'][$que_type][$user['id']][$planet['id']])) {
425 425
     $que = array_reverse($global_que['ques'][$que_type][$user['id']][$planet['id']]);
426 426
 
427
-    foreach($que as $que_item) {
427
+    foreach ($que as $que_item) {
428 428
       db_que_delete_by_id($que_item['que_id']);
429 429
 
430
-      if($que_item['que_planet_id_origin']) {
430
+      if ($que_item['que_planet_id_origin']) {
431 431
         $planet['id'] = $que_item['que_planet_id_origin'];
432 432
       }
433 433
 
434
-      if(!isset($planets_locked[$planet['id']])) {
434
+      if (!isset($planets_locked[$planet['id']])) {
435 435
         $planets_locked[$planet['id']] = $planet['id'] ? db_planet_by_id($planet['id'], true) : $planet;
436 436
       }
437 437
 
@@ -443,14 +443,14 @@  discard block
 block discarded – undo
443 443
         RES_DEUTERIUM => $build_data[RES_DEUTERIUM] * $que_item['que_unit_amount'],
444 444
       ));
445 445
 
446
-      if(!$clear) {
446
+      if (!$clear) {
447 447
         break;
448 448
       }
449 449
     }
450 450
 
451
-    if(is_numeric($planet['id'])) {
451
+    if (is_numeric($planet['id'])) {
452 452
       db_planet_set_by_id($planet['id'], "`que_processed` = UNIX_TIMESTAMP(NOW())");
453
-    } elseif(is_numeric($user['id'])) {
453
+    } elseif (is_numeric($user['id'])) {
454 454
       db_user_set_by_id($user['id'], '`que_processed` = UNIX_TIMESTAMP(NOW())');
455 455
     }
456 456
 
@@ -498,21 +498,21 @@  discard block
 block discarded – undo
498 498
   // TODO: Переделать для $que_type === false
499 499
   $planet['id'] = $planet['id'] ? $planet['id'] : 0;
500 500
 
501
-  if(!is_array($que)) {
501
+  if (!is_array($que)) {
502 502
     $que = que_get($user['id'], $planet['id'], $que_type);
503 503
   }
504 504
 
505
-  if(is_array($que) && isset($que['items'])) {
505
+  if (is_array($que) && isset($que['items'])) {
506 506
     $que = $que['ques'][$que_type][$user['id']][$planet['id']];
507 507
   }
508 508
 
509
-  if($que) {
510
-    foreach($que as $que_element) {
509
+  if ($que) {
510
+    foreach ($que as $que_element) {
511 511
       $template->assign_block_vars('que', que_tpl_parse_element($que_element, $short_names));
512 512
     }
513 513
   }
514 514
 
515
-  if($que_type == QUE_RESEARCH) {
515
+  if ($que_type == QUE_RESEARCH) {
516 516
   }
517 517
 }
518 518
 
@@ -538,7 +538,7 @@  discard block
 block discarded – undo
538 538
   $user = db_user_by_id($user['id'], true);
539 539
 
540 540
   $time_left[$user['id']][0] = max(0, $on_time - $user['que_processed']);
541
-  if($planet === null && !$time_left[$user['id']][0]) {
541
+  if ($planet === null && !$time_left[$user['id']][0]) {
542 542
     // TODO
543 543
     return $que;
544 544
   }
@@ -547,12 +547,12 @@  discard block
 block discarded – undo
547 547
   $que_type_id = $planet === null ? QUE_RESEARCH : false;
548 548
   $planet = intval(is_array($planet) ? $planet['id'] : $planet); // В $planet у нас теперь только её ID или шаблон null/0/false
549 549
   $que = que_get($user['id'], $planet, $que_type_id, true);
550
-  if(empty($que['items'])) {
550
+  if (empty($que['items'])) {
551 551
     return $que;
552 552
   }
553 553
 
554 554
   $planet_list = array();
555
-  if($planet !== null) {
555
+  if ($planet !== null) {
556 556
     // Если нужно изменять данные на планетах - блокируем планеты и получаем данные о них
557 557
     // TODO - от них не надо ничего, кроме ID и que_processed
558 558
     $planet_row = db_planet_list_by_user_or_planet($user['id'], $planet);
@@ -561,21 +561,21 @@  discard block
 block discarded – undo
561 561
   }
562 562
 
563 563
   // Теперь в $time_left лежит время обсчета всех очередей по каждой из планеты
564
-  if(array_sum($time_left[$user['id']]) == 0) {
564
+  if (array_sum($time_left[$user['id']]) == 0) {
565 565
     return $que;
566 566
   }
567 567
 
568 568
   $db_changeset = array();
569 569
   $unit_changes = array();
570
-  foreach($que['items'] as &$que_item) {
570
+  foreach ($que['items'] as &$que_item) {
571 571
     $que_player_id = &$que_item['que_player_id'];
572 572
     $que_planet_id = intval($que_item['que_planet_id']);
573 573
 
574 574
     $que_time_left = &$que['time_left'][$que_player_id][$que_planet_id][$que_item['que_type']];
575
-    if(!isset($que_time_left)) {
575
+    if (!isset($que_time_left)) {
576 576
       $que_time_left = $time_left[$que_player_id][$que_planet_id];
577 577
     }
578
-    if($que_time_left <= 0 || $que_item['que_unit_amount'] <= 0) {
578
+    if ($que_time_left <= 0 || $que_item['que_unit_amount'] <= 0) {
579 579
       continue;
580 580
     }
581 581
     // Дальше мы идем, если только осталось время в очереди И юниты к постройке
@@ -588,7 +588,7 @@  discard block
 block discarded – undo
588 588
     // Теперь работаем с остатком времени на юните. Оно не может быть равно или меньше нуля
589 589
 
590 590
     // Если времени в очереди осталось не меньше, чем время текущего юнита - значит мы достроили юнит
591
-    if($que_time_left >= $que_item['que_time_left']) {
591
+    if ($que_time_left >= $que_item['que_time_left']) {
592 592
       // Увеличиваем количество отстроенных юнитов
593 593
       $unit_processed++;
594 594
       // Вычитаем из времени очереди потраченное на постройку время
@@ -601,12 +601,12 @@  discard block
 block discarded – undo
601 601
     $que_item['que_unit_amount'] -= $unit_processed;
602 602
 
603 603
     // Если еще остались юниты - значит ВСЁ оставшееся время приходится на достройку следующего юнита
604
-    if($que_item['que_unit_amount'] > 0) {
604
+    if ($que_item['que_unit_amount'] > 0) {
605 605
       $que_item['que_time_left'] = $que_item['que_time_left'] - $que_time_left;
606 606
       $que_time_left = 0;
607 607
     }
608 608
 
609
-    if($que_item['que_unit_amount'] <= 0) {
609
+    if ($que_item['que_unit_amount'] <= 0) {
610 610
       $db_changeset['que'][] = array(
611 611
         'action'  => SQL_OP_DELETE,
612 612
         P_VERSION => 1,
@@ -632,14 +632,14 @@  discard block
 block discarded – undo
632 632
       );
633 633
     }
634 634
 
635
-    if($unit_processed) {
635
+    if ($unit_processed) {
636 636
       $unit_processed_delta = $unit_processed * ($que_item['que_unit_mode'] == BUILD_CREATE ? 1 : -1);
637 637
       $unit_changes[$que_player_id][$que_planet_id][$que_item['que_unit_id']] += $unit_processed_delta;
638 638
     }
639 639
   }
640 640
 
641
-  foreach($time_left as $player_id => $planet_data) {
642
-    foreach($planet_data as $planet_id => $time_on_planet) {
641
+  foreach ($time_left as $player_id => $planet_data) {
642
+    foreach ($planet_data as $planet_id => $time_on_planet) {
643 643
       $table = $planet_id ? 'planets' : 'users';
644 644
       $id = $planet_id ? $planet_id : $player_id;
645 645
       $db_changeset[$table][] = array(
@@ -655,8 +655,8 @@  discard block
 block discarded – undo
655 655
         ),
656 656
       );
657 657
 
658
-      if(is_array($unit_changes[$player_id][$planet_id])) {
659
-        foreach($unit_changes[$player_id][$planet_id] as $unit_id => $unit_amount) {
658
+      if (is_array($unit_changes[$player_id][$planet_id])) {
659
+        foreach ($unit_changes[$player_id][$planet_id] as $unit_id => $unit_amount) {
660 660
           $db_changeset['unit'][] = sn_db_unit_changeset_prepare($unit_id, $unit_amount, $user, $planet_id ? $planet_id : null);
661 661
         }
662 662
       }
@@ -666,38 +666,38 @@  discard block
 block discarded – undo
666 666
   $que = que_recalculate($que);
667 667
 
668 668
   // TODO: Re-enable quests for Alliances
669
-  if(!empty($unit_changes) && !$user['user_as_ally']) {
669
+  if (!empty($unit_changes) && !$user['user_as_ally']) {
670 670
     $quest_list = qst_get_quests($user['id']);
671 671
     $quest_triggers = qst_active_triggers($quest_list);
672 672
     $quest_rewards = array();
673 673
 
674 674
 
675 675
     $xp_incoming = array();
676
-    foreach($unit_changes as $user_id => $planet_changes) {
677
-      foreach($planet_changes as $planet_id => $changes) {
676
+    foreach ($unit_changes as $user_id => $planet_changes) {
677
+      foreach ($planet_changes as $planet_id => $changes) {
678 678
         $planet_this = $planet_id ? classSupernova::db_get_record_by_id(LOC_PLANET, $planet_id) : array();
679
-        foreach($changes as $unit_id => $unit_value) {
679
+        foreach ($changes as $unit_id => $unit_value) {
680 680
           $que_id = que_get_unit_que($unit_id);
681 681
           $unit_level_new = mrc_get_level($user, $planet_this, $unit_id, false, true) + $unit_value;
682
-          if($que_id == QUE_STRUCTURES || $que_id == QUE_RESEARCH) {
682
+          if ($que_id == QUE_STRUCTURES || $que_id == QUE_RESEARCH) {
683 683
             $build_data = eco_get_build_data($user, $planet_this, $unit_id, $unit_level_new - 1);
684 684
             $build_data = $build_data[BUILD_CREATE];
685
-            foreach(sn_get_groups('resources_loot') as $resource_id) {
685
+            foreach (sn_get_groups('resources_loot') as $resource_id) {
686 686
               $xp_incoming[$que_id] += $build_data[$resource_id]; // TODO - добавить конверсию рейтов обмена
687 687
             }
688 688
           }
689 689
 
690
-          if(is_array($quest_triggers)) {
690
+          if (is_array($quest_triggers)) {
691 691
             // TODO: Check mutiply condition quests
692 692
             $quest_trigger_list = array_keys($quest_triggers, $unit_id);
693
-            if(is_array($quest_trigger_list)) {
694
-              foreach($quest_trigger_list as $quest_id) {
693
+            if (is_array($quest_trigger_list)) {
694
+              foreach ($quest_trigger_list as $quest_id) {
695 695
                 $quest_unit_level = $unit_level_new;
696
-                if(get_unit_param($unit_id, P_UNIT_TYPE) == UNIT_SHIPS) {
696
+                if (get_unit_param($unit_id, P_UNIT_TYPE) == UNIT_SHIPS) {
697 697
                   $quest_unit_level = db_unit_count_by_user_and_type_and_snid($user_id, 0, $unit_id);
698 698
                   $quest_unit_level = $quest_unit_level[$unit_id]['qty'];
699 699
                 }
700
-                if($quest_list[$quest_id]['quest_status_status'] != QUEST_STATUS_COMPLETE && $quest_list[$quest_id]['quest_unit_amount'] <= $quest_unit_level) {
700
+                if ($quest_list[$quest_id]['quest_status_status'] != QUEST_STATUS_COMPLETE && $quest_list[$quest_id]['quest_unit_amount'] <= $quest_unit_level) {
701 701
                   $quest_rewards[$quest_id][$user_id][$planet_id] = $quest_list[$quest_id]['quest_rewards_list'];
702 702
                   $quest_list[$quest_id]['quest_status_status'] = QUEST_STATUS_COMPLETE;
703 703
                 }
@@ -710,7 +710,7 @@  discard block
 block discarded – undo
710 710
     // TODO: Изменить начисление награды за квесты на ту планету, на которой происходил ресеч
711 711
     qst_reward($user, $quest_rewards, $quest_list);
712 712
 
713
-    foreach($xp_incoming as $que_id => $xp) {
713
+    foreach ($xp_incoming as $que_id => $xp) {
714 714
       rpg_level_up($user, $que_id == QUE_RESEARCH ? RPG_TECH : RPG_STRUCTURE, $xp / 1000);
715 715
     }
716 716
   }
Please login to merge, or discard this patch.
includes/functions/int_fleet_events.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -6,26 +6,26 @@  discard block
 block discarded – undo
6 6
   $fleet_events = array();
7 7
   $fleet_number = 0;
8 8
 
9
-  if($objFleetList->count() <= 0) {
9
+  if ($objFleetList->count() <= 0) {
10 10
     return;
11 11
   }
12 12
 
13
-  foreach($objFleetList->_container as $objFleet) {
13
+  foreach ($objFleetList->_container as $objFleet) {
14 14
     $planet_start_type = $objFleet->fleet_start_type == PT_MOON ? PT_MOON : PT_PLANET;
15 15
     $planet_start = db_planet_by_gspt($objFleet->fleet_start_galaxy, $objFleet->fleet_start_system, $objFleet->fleet_start_planet, $planet_start_type, false, 'name');
16 16
     $objFleet->fleet_start_name = $planet_start['name'];
17 17
 
18 18
     $planet_end_type = $objFleet->fleet_end_type == PT_MOON ? PT_MOON : PT_PLANET;
19
-    if($objFleet->fleet_end_planet > classSupernova::$config->game_maxPlanet) {
19
+    if ($objFleet->fleet_end_planet > classSupernova::$config->game_maxPlanet) {
20 20
       $objFleet->fleet_end_name = classLocale::$lang['ov_fleet_exploration'];
21
-    } elseif($objFleet->mission_type == MT_COLONIZE) {
21
+    } elseif ($objFleet->mission_type == MT_COLONIZE) {
22 22
       $objFleet->fleet_end_name = classLocale::$lang['ov_fleet_colonization'];
23 23
     } else {
24 24
       $planet_end = db_planet_by_gspt($objFleet->fleet_end_galaxy, $objFleet->fleet_end_system, $objFleet->fleet_end_planet, $planet_end_type, false, 'name');
25 25
       $objFleet->fleet_end_name = $planet_end['name'];
26 26
     }
27 27
 
28
-    if($objFleet->time_arrive_to_target > SN_TIME_NOW && !$objFleet->isReturning() && $objFleet->mission_type != MT_MISSILE &&
28
+    if ($objFleet->time_arrive_to_target > SN_TIME_NOW && !$objFleet->isReturning() && $objFleet->mission_type != MT_MISSILE &&
29 29
       ($planet_scanned === false
30 30
         ||
31 31
         (
@@ -39,11 +39,11 @@  discard block
 block discarded – undo
39 39
       $fleet_events[] = flt_register_event_objFleet($objFleet, 0, $planet_end_type);
40 40
     }
41 41
 
42
-    if($objFleet->time_mission_job_complete > SN_TIME_NOW && !$objFleet->isReturning() && $planet_scanned === false && $objFleet->mission_type != MT_MISSILE) {
42
+    if ($objFleet->time_mission_job_complete > SN_TIME_NOW && !$objFleet->isReturning() && $planet_scanned === false && $objFleet->mission_type != MT_MISSILE) {
43 43
       $fleet_events[] = flt_register_event_objFleet($objFleet, 1, $planet_end_type);
44 44
     }
45 45
 
46
-    if(
46
+    if (
47 47
       $objFleet->time_return_to_source > SN_TIME_NOW && $objFleet->mission_type != MT_MISSILE && ($objFleet->isReturning() || ($objFleet->mission_type != MT_RELOCATE && $objFleet->mission_type != MT_COLONIZE)) &&
48 48
       (
49 49
         ($planet_scanned === false && $objFleet->playerOwnerId == $user['id'])
@@ -59,7 +59,7 @@  discard block
 block discarded – undo
59 59
       $fleet_events[] = flt_register_event_objFleet($objFleet, 2, $planet_end_type);
60 60
     }
61 61
 
62
-    if($objFleet->mission_type == MT_MISSILE) {
62
+    if ($objFleet->mission_type == MT_MISSILE) {
63 63
       $fleet_events[] = flt_register_event_objFleet($objFleet, 3, $planet_end_type);
64 64
     }
65 65
   }
@@ -79,7 +79,7 @@  discard block
 block discarded – undo
79 79
 
80 80
   $is_this_planet = false;
81 81
 
82
-  switch($objFleet->ov_label = $ov_label) {
82
+  switch ($objFleet->ov_label = $ov_label) {
83 83
     case 0:
84 84
       $objFleet->event_time = $objFleet->time_arrive_to_target;
85 85
       $is_this_planet = (
@@ -110,9 +110,9 @@  discard block
 block discarded – undo
110 110
 
111 111
   }
112 112
 
113
-  $objFleet->ov_this_planet = $is_this_planet;// || $planet_scanned != false;
113
+  $objFleet->ov_this_planet = $is_this_planet; // || $planet_scanned != false;
114 114
 
115
-  if($objFleet->playerOwnerId == $user['id']) {
115
+  if ($objFleet->playerOwnerId == $user['id']) {
116 116
     $user_data = $user;
117 117
   } else {
118 118
     $user_data = db_user_by_id($objFleet->playerOwnerId);
Please login to merge, or discard this patch.
includes/functions/msg_send_simple_message.php 1 patch
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -25,7 +25,7 @@  discard block
 block discarded – undo
25 25
     "ally_id = '{$ally_id}'" . ($ally_rank_id >= 0 ? " AND ally_rank_id = {$ally_rank_id}" : ''),
26 26
     false, 'id, username');
27 27
   // while ($u = db_fetch($query))
28
-  foreach($query as $u) {
28
+  foreach ($query as $u) {
29 29
     $sendList[] = $u['id'];
30 30
     $list .= "<br>{$u['username']} ";
31 31
   }
@@ -38,17 +38,17 @@  discard block
 block discarded – undo
38 38
 function msg_send_simple_message($owners, $sender, $timestamp, $message_type, $from, $subject, $text, $escaped = false, $force = false) {
39 39
   global $user, $sn_message_class_list;
40 40
 
41
-  if(!$owners) {
41
+  if (!$owners) {
42 42
     return;
43 43
   }
44 44
 
45 45
   $timestamp = $timestamp ? $timestamp : SN_TIME_NOW;
46 46
   $sender = intval($sender);
47
-  if(!is_array($owners)) {
47
+  if (!is_array($owners)) {
48 48
     $owners = array($owners);
49 49
   }
50 50
 
51
-  if(!$escaped) {
51
+  if (!$escaped) {
52 52
     $from = db_escape($from);
53 53
     $subject = db_escape($subject);
54 54
     $text = db_escape($text);
@@ -63,8 +63,8 @@  discard block
 block discarded – undo
63 63
 
64 64
   $message_class_name_total = $sn_message_class_list[MSG_TYPE_NEW]['name'];
65 65
 
66
-  if($owners[0] == '*') {
67
-    if($user['authlevel'] < 3) {
66
+  if ($owners[0] == '*') {
67
+    if ($user['authlevel'] < 3) {
68 68
       return false;
69 69
     }
70 70
     // TODO Добавить $timestamp - рассылка может быть и отсроченной
@@ -75,24 +75,24 @@  discard block
 block discarded – undo
75 75
     $insert_values = array();
76 76
     $insert_template = "('%u'," . str_replace('%', '%%', " '{$sender}', '{$timestamp}', '{$message_type}', '{$from}', '{$subject}', '{$text}')");
77 77
 
78
-    foreach($owners as $owner) {
79
-      if($user['id'] != $owner) {
78
+    foreach ($owners as $owner) {
79
+      if ($user['id'] != $owner) {
80 80
         $owner_row = db_user_by_id($owner);
81 81
       } else {
82 82
         $owner_row = $user;
83 83
       }
84 84
       sys_user_options_unpack($owner_row);
85 85
 
86
-      if($force || !$message_class_switchable || $owner_row["opt_{$message_class_name}"]) {
86
+      if ($force || !$message_class_switchable || $owner_row["opt_{$message_class_name}"]) {
87 87
         $insert_values[] = sprintf($insert_template, $owner);
88 88
       }
89 89
 
90
-      if($message_class_email && classSupernova::$config->game_email_pm && $owner_row["opt_email_{$message_class_name}"]) {
90
+      if ($message_class_email && classSupernova::$config->game_email_pm && $owner_row["opt_email_{$message_class_name}"]) {
91 91
         @$result = mymail($owner_row['email'], $subject, $text_unescaped, '', true);
92 92
       }
93 93
     }
94 94
 
95
-    if(empty($insert_values)) {
95
+    if (empty($insert_values)) {
96 96
       return;
97 97
     }
98 98
 
@@ -100,7 +100,7 @@  discard block
 block discarded – undo
100 100
   }
101 101
   db_user_list_set_mass_mail($owners, "`{$message_class_name}` = `{$message_class_name}` + 1, `{$message_class_name_total}` = `{$message_class_name_total}` + 1");
102 102
 
103
-  if(in_array($user['id'], $owners) || $owners[0] == '*') {
103
+  if (in_array($user['id'], $owners) || $owners[0] == '*') {
104 104
     $user[$message_class_name]++;
105 105
     $user[$message_class_name_total]++;
106 106
   }
Please login to merge, or discard this patch.
includes/functions/eco_get_build_data.php 1 patch
Spacing   +33 added lines, -33 removed lines patch added patch discarded remove patch
@@ -11,11 +11,11 @@  discard block
 block discarded – undo
11 11
  * @version 1.0
12 12
  */
13 13
 function eco_get_lab_max_effective_level(&$user, $lab_require) {
14
-  if(!$user['user_as_ally'] && !isset($user['laboratories_active'])) {
14
+  if (!$user['user_as_ally'] && !isset($user['laboratories_active'])) {
15 15
     $user['laboratories_active'] = array();
16 16
     $query = db_unit_list_laboratories($user['id']);
17
-    while($row = db_fetch($query)) {
18
-      if(!eco_unit_busy($user, $row, UNIT_TECHNOLOGIES)) {
17
+    while ($row = db_fetch($query)) {
18
+      if (!eco_unit_busy($user, $row, UNIT_TECHNOLOGIES)) {
19 19
         $row += array(
20 20
           STRUC_LABORATORY             => $level_lab = mrc_get_level($user, $row, STRUC_LABORATORY),
21 21
           STRUC_LABORATORY_NANO        => $level_lab_nano = mrc_get_level($user, $row, STRUC_LABORATORY_NANO),
@@ -28,18 +28,18 @@  discard block
 block discarded – undo
28 28
     uasort($user['laboratories_active'], 'eco_lab_sort_effectivness');
29 29
   }
30 30
 
31
-  if(!isset($user['research_effective_level'][$lab_require])) {
32
-    if($user['user_as_ally']) {
31
+  if (!isset($user['research_effective_level'][$lab_require])) {
32
+    if ($user['user_as_ally']) {
33 33
       $lab_level = db_ally_get_ally_count($user);
34 34
     } else {
35 35
       $tech_intergalactic = mrc_get_level($user, null, TECH_RESEARCH) + 1;
36 36
       $lab_level['effective_level'] = 0;
37 37
 
38
-      foreach($user['laboratories_active'] as $data) {
39
-        if($tech_intergalactic <= 0) {
38
+      foreach ($user['laboratories_active'] as $data) {
39
+        if ($tech_intergalactic <= 0) {
40 40
           break;
41 41
         }
42
-        if($data[STRUC_LABORATORY] >= $lab_require) {
42
+        if ($data[STRUC_LABORATORY] >= $lab_require) {
43 43
           $lab_level['effective_level'] += $data['laboratory_effective_level'];
44 44
           $tech_intergalactic--;
45 45
         }
@@ -65,8 +65,8 @@  discard block
 block discarded – undo
65 65
   $time = 0;
66 66
   $only_dark_matter = 0;
67 67
   $cost_in_metal = 0;
68
-  foreach($unit_data[P_COST] as $resource_id => $resource_amount) {
69
-    if($resource_id === P_FACTOR || !($resource_cost = $resource_amount * $price_increase)) {
68
+  foreach ($unit_data[P_COST] as $resource_id => $resource_amount) {
69
+    if ($resource_id === P_FACTOR || !($resource_cost = $resource_amount * $price_increase)) {
70 70
       continue;
71 71
     }
72 72
 
@@ -75,12 +75,12 @@  discard block
 block discarded – undo
75 75
 
76 76
     $resource_db_name = pname_resource_name($resource_id);
77 77
     $cost_in_metal += $cost[BUILD_CREATE][$resource_id] * classSupernova::$config->__get("rpg_exchange_{$resource_db_name}");
78
-    if(in_array($resource_id, sn_get_groups('resources_loot'))) {
78
+    if (in_array($resource_id, sn_get_groups('resources_loot'))) {
79 79
       $time += $resource_cost * classSupernova::$config->__get("rpg_exchange_{$resource_db_name}") / $rpg_exchange_deuterium;
80 80
       $resource_got = mrc_get_level($user, $planet, $resource_id);
81
-    } elseif($resource_id == RES_DARK_MATTER) {
81
+    } elseif ($resource_id == RES_DARK_MATTER) {
82 82
       $resource_got = mrc_get_level($user, null, $resource_id);
83
-    } elseif($resource_id == RES_ENERGY) {
83
+    } elseif ($resource_id == RES_ENERGY) {
84 84
       $resource_got = max(0, $planet['energy_max'] - $planet['energy_used']);
85 85
     } else {
86 86
       $resource_got = 0;
@@ -93,7 +93,7 @@  discard block
 block discarded – undo
93 93
 
94 94
   $resources_normalized = 0;
95 95
   $resources_loot = sn_get_groups('resources_loot');
96
-  foreach($resources_loot as $resource_id) {
96
+  foreach ($resources_loot as $resource_id) {
97 97
     $resource_db_name = pname_resource_name($resource_id);
98 98
     $resource_got = mrc_get_level($user, $planet, $resource_id);
99 99
     $resources_normalized += floor($resource_got) * classSupernova::$config->__get("rpg_exchange_{$resource_db_name}");
@@ -111,7 +111,7 @@  discard block
 block discarded – undo
111 111
   $cost[P_OPTIONS][P_TIME_RAW] = $time = $time * 60 * 60 / get_game_speed() / 2500;
112 112
 
113 113
   // TODO - Вынести в отдельную процедуру расчёт стоимости
114
-  if($only_cost) {
114
+  if ($only_cost) {
115 115
     return $cost;
116 116
   }
117 117
 
@@ -120,7 +120,7 @@  discard block
 block discarded – undo
120 120
 
121 121
   $mercenary = 0;
122 122
   $cost['RESULT'][BUILD_DESTROY] = BUILD_INDESTRUCTABLE;
123
-  if(in_array($unit_id, sn_get_groups('structures'))) {
123
+  if (in_array($unit_id, sn_get_groups('structures'))) {
124 124
     $time = $time * pow(0.5, mrc_get_level($user, $planet, STRUC_FACTORY_NANO)) / (mrc_get_level($user, $planet, STRUC_FACTORY_ROBOT) + 1);
125 125
     $mercenary = MRC_ENGINEER;
126 126
     $cost['RESULT'][BUILD_DESTROY] =
@@ -130,23 +130,23 @@  discard block
 block discarded – undo
130 130
         : BUILD_NO_RESOURCES
131 131
       )
132 132
         : BUILD_NO_UNITS;
133
-  } elseif(in_array($unit_id, sn_get_groups('tech'))) {
133
+  } elseif (in_array($unit_id, sn_get_groups('tech'))) {
134 134
     $lab_level = eco_get_lab_max_effective_level($user, intval($unit_data['require'][STRUC_LABORATORY]));
135 135
     $time = $time / $lab_level;
136 136
     $mercenary = MRC_ACADEMIC;
137
-  } elseif(in_array($unit_id, sn_get_groups('defense'))) {
137
+  } elseif (in_array($unit_id, sn_get_groups('defense'))) {
138 138
     $time = $time * pow(0.5, mrc_get_level($user, $planet, STRUC_FACTORY_NANO)) / (mrc_get_level($user, $planet, STRUC_FACTORY_HANGAR) + 1);
139 139
     $mercenary = MRC_FORTIFIER;
140
-  } elseif(in_array($unit_id, sn_get_groups('fleet'))) {
140
+  } elseif (in_array($unit_id, sn_get_groups('fleet'))) {
141 141
     $time = $time * pow(0.5, mrc_get_level($user, $planet, STRUC_FACTORY_NANO)) / (mrc_get_level($user, $planet, STRUC_FACTORY_HANGAR) + 1);
142 142
     $mercenary = MRC_ENGINEER;
143 143
   }
144 144
 
145
-  if($mercenary) {
145
+  if ($mercenary) {
146 146
     $time = $time / mrc_modify_value($user, $planet, $mercenary, 1);
147 147
   }
148 148
 
149
-  if(in_array($unit_id, sn_get_groups('governors')) || $only_dark_matter) {
149
+  if (in_array($unit_id, sn_get_groups('governors')) || $only_dark_matter) {
150 150
     $cost[RES_TIME][BUILD_CREATE] = $cost[RES_TIME][BUILD_DESTROY] = 0;
151 151
   } else {
152 152
     $cost[RES_TIME][BUILD_CREATE] = round($time >= 1 ? $time : 1);
@@ -163,11 +163,11 @@  discard block
 block discarded – undo
163 163
   $result = $result == BUILD_ALLOWED && eco_unit_busy($user, $planet, $unit_id) ? BUILD_UNIT_BUSY : $result;
164 164
 
165 165
   $unit_param = get_unit_param($unit_id);
166
-  if($unit_param[P_UNIT_TYPE] != UNIT_MERCENARIES || !classSupernova::$config->empire_mercenary_temporary) {
166
+  if ($unit_param[P_UNIT_TYPE] != UNIT_MERCENARIES || !classSupernova::$config->empire_mercenary_temporary) {
167 167
     $requirement = &$unit_param[P_REQUIRE];
168
-    if($result == BUILD_ALLOWED && $requirement) {
169
-      foreach($requirement as $require_id => $require_level) {
170
-        if(mrc_get_level($user, $planet, $require_id) < $require_level) {
168
+    if ($result == BUILD_ALLOWED && $requirement) {
169
+      foreach ($requirement as $require_id => $require_level) {
170
+        if (mrc_get_level($user, $planet, $require_id) < $require_level) {
171 171
           $result = BUILD_REQUIRE_NOT_MEET;
172 172
           break;
173 173
         }
@@ -183,10 +183,10 @@  discard block
 block discarded – undo
183 183
 
184 184
   $unit_list = is_array($unit_list) ? $unit_list : array($unit_list => $unit_list);
185 185
   $planet_que = explode(';', $planet_que);
186
-  foreach($planet_que as $planet_que_item) {
187
-    if($planet_que_item) {
186
+  foreach ($planet_que as $planet_que_item) {
187
+    if ($planet_que_item) {
188 188
       list($planet_que_item) = explode(',', $planet_que_item);
189
-      if(in_array($planet_que_item, $unit_list)) {
189
+      if (in_array($planet_que_item, $unit_list)) {
190 190
         $eco_is_builds_in_que = true;
191 191
         break;
192 192
       }
@@ -200,12 +200,12 @@  discard block
 block discarded – undo
200 200
 
201 201
 function sn_eco_unit_busy(&$user, &$planet, $unit_id, &$result) {
202 202
   $result = isset($result) ? $result : false;
203
-  if(!$result) {
204
-    if(($unit_id == STRUC_LABORATORY || $unit_id == STRUC_LABORATORY_NANO) && !classSupernova::$config->BuildLabWhileRun) {
203
+  if (!$result) {
204
+    if (($unit_id == STRUC_LABORATORY || $unit_id == STRUC_LABORATORY_NANO) && !classSupernova::$config->BuildLabWhileRun) {
205 205
       $global_que = que_get($user['id'], $planet['id'], QUE_RESEARCH, false);
206
-      if(is_array($global_que['ques'][QUE_RESEARCH][$user['id']])) {
206
+      if (is_array($global_que['ques'][QUE_RESEARCH][$user['id']])) {
207 207
         $first_element = reset($global_que['ques'][QUE_RESEARCH][$user['id']]);
208
-        if(is_array($first_element)) {
208
+        if (is_array($first_element)) {
209 209
           $result = true;
210 210
         }
211 211
       }
@@ -213,7 +213,7 @@  discard block
 block discarded – undo
213 213
       //{
214 214
       //  $result = true;
215 215
       //}
216
-    } elseif(($unit_id == UNIT_TECHNOLOGIES || in_array($unit_id, sn_get_groups('tech'))) && !classSupernova::$config->BuildLabWhileRun && $planet['que']) {
216
+    } elseif (($unit_id == UNIT_TECHNOLOGIES || in_array($unit_id, sn_get_groups('tech'))) && !classSupernova::$config->BuildLabWhileRun && $planet['que']) {
217 217
       $result = eco_is_builds_in_que($planet['que'], array(STRUC_LABORATORY, STRUC_LABORATORY_NANO));
218 218
     }
219 219
   }
Please login to merge, or discard this patch.
includes/functions/rpg_points.php 1 patch
Spacing   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -29,28 +29,28 @@  discard block
 block discarded – undo
29 29
 function rpg_points_change($user_id, $change_type, $dark_matter, $comment = '', $already_changed = false) {
30 30
   global $debug, $dm_change_legit, $user;
31 31
 
32
-  if(!$user_id) {
32
+  if (!$user_id) {
33 33
     return false;
34 34
   }
35 35
 
36 36
   $dm_change_legit = true;
37 37
   $sn_data_dark_matter_db_name = pname_resource_name(RES_DARK_MATTER);
38 38
 
39
-  if($already_changed) {
39
+  if ($already_changed) {
40 40
     $rows_affected = 1;
41 41
   } else {
42 42
     $changeset = array();
43 43
     $a_user = db_user_by_id($user_id, true);
44
-    if($dark_matter < 0) {
44
+    if ($dark_matter < 0) {
45 45
       $dark_matter_exists = mrc_get_level($a_user, null, RES_DARK_MATTER, false, true);
46 46
       $dark_matter_exists < 0 ? $dark_matter_exists = 0 : false;
47 47
       $metamatter_to_reduce = -$dark_matter - $dark_matter_exists;
48
-      if($metamatter_to_reduce > 0) {
48
+      if ($metamatter_to_reduce > 0) {
49 49
         $metamatter_exists = mrc_get_level($a_user, null, RES_METAMATTER);
50
-        if($metamatter_exists < $metamatter_to_reduce) {
50
+        if ($metamatter_exists < $metamatter_to_reduce) {
51 51
           $debug->error('Ошибка снятия ТМ - ММ+ТМ меньше, чем сумма для снятия!', 'Ошибка снятия ТМ', LOG_ERR_INT_NOT_ENOUGH_DARK_MATTER);
52 52
         }
53
-        if(is_array($comment)) {
53
+        if (is_array($comment)) {
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);
@@ -65,9 +65,9 @@  discard block
 block discarded – undo
65 65
     $rows_affected = classSupernova::$db->db_affected_rows();
66 66
   }
67 67
 
68
-  if($rows_affected || !$dark_matter) {
68
+  if ($rows_affected || !$dark_matter) {
69 69
     $page_url = db_escape($_SERVER['SCRIPT_NAME']);
70
-    if(is_array($comment)) {
70
+    if (is_array($comment)) {
71 71
       $comment = call_user_func_array('sprintf', $comment);
72 72
     }
73 73
     $comment = db_escape($comment);
@@ -75,18 +75,18 @@  discard block
 block discarded – undo
75 75
     $row['username'] = db_escape($row['username']);
76 76
     db_log_dark_matter_insert($user_id, $change_type, $dark_matter, $comment, $row, $page_url);
77 77
 
78
-    if($user['id'] == $user_id) {
78
+    if ($user['id'] == $user_id) {
79 79
       $user['dark_matter'] += $dark_matter;
80 80
     }
81 81
 
82
-    if($dark_matter > 0) {
82
+    if ($dark_matter > 0) {
83 83
       $old_referral = db_referral_get_by_id($user_id);
84
-      if($old_referral['id']) {
84
+      if ($old_referral['id']) {
85 85
         db_referral_update_dm($user_id, $dark_matter);
86 86
         $new_referral = db_referral_get_by_id($user_id);
87 87
 
88 88
         $partner_bonus = floor($new_referral['dark_matter'] / classSupernova::$config->rpg_bonus_divisor) - ($old_referral['dark_matter'] >= classSupernova::$config->rpg_bonus_minimum ? floor($old_referral['dark_matter'] / classSupernova::$config->rpg_bonus_divisor) : 0);
89
-        if($partner_bonus > 0 && $new_referral['dark_matter'] >= classSupernova::$config->rpg_bonus_minimum) {
89
+        if ($partner_bonus > 0 && $new_referral['dark_matter'] >= classSupernova::$config->rpg_bonus_minimum) {
90 90
           rpg_points_change($new_referral['id_partner'], RPG_REFERRAL, $partner_bonus, "Incoming From Referral ID {$user_id}");
91 91
         }
92 92
       }
@@ -103,7 +103,7 @@  discard block
 block discarded – undo
103 103
 function rpg_level_up(&$user, $type, $xp_to_add = 0) {
104 104
   $q = 1.03;
105 105
 
106
-  switch($type) {
106
+  switch ($type) {
107 107
     case RPG_STRUCTURE:
108 108
       $field_level = 'lvl_minier';
109 109
       $field_xp = 'xpminier';
@@ -140,17 +140,17 @@  discard block
 block discarded – undo
140 140
 
141 141
   $xp = &$user[$field_xp];
142 142
 
143
-  if($xp_to_add) {
143
+  if ($xp_to_add) {
144 144
     $xp += $xp_to_add;
145 145
     db_user_set_by_id($user['id'], "`{$field_xp}` = `{$field_xp}` + '{$xp_to_add}'");
146 146
   }
147 147
 
148 148
   $level = $user[$field_level];
149
-  while($xp > rpg_xp_for_level($level + 1, $b1, $q)) {
149
+  while ($xp > rpg_xp_for_level($level + 1, $b1, $q)) {
150 150
     $level++;
151 151
   }
152 152
   $level -= $user[$field_level];
153
-  if($level > 0) {
153
+  if ($level > 0) {
154 154
     db_user_set_by_id($user['id'], "`{$field_level}` = `{$field_level}` + '{$level}'");
155 155
     rpg_points_change($user['id'], $type, $level * 1000, $comment);
156 156
     $user[$field_level] += $level;
Please login to merge, or discard this patch.