Completed
Push — work-fleets ( 680ce4...35627b )
by SuperNova.WS
05:25
created
includes/db/db_queries.php 2 patches
Doc Comments   +17 added lines, -12 removed lines patch added patch discarded remove patch
@@ -188,6 +188,11 @@  discard block
 block discarded – undo
188 188
  */
189 189
 // OK v4
190 190
 // TODO - вынести в отдельный класс
191
+/**
192
+ * @param string $db_id_field_name
193
+ * @param string $db_table_name
194
+ * @param string $db_value_field_name
195
+ */
191 196
 function db_get_set_unique_id_value($current_value_unsafe, $db_id_field_name, $db_table_name, $db_value_field_name) {
192 197
   $current_value_safe = db_escape($current_value_unsafe);
193 198
   $value_id = doquery("SELECT `{$db_id_field_name}` AS id_field FROM {{{$db_table_name}}} WHERE `{$db_value_field_name}` = '{$current_value_safe}' LIMIT 1 FOR UPDATE", true);
@@ -220,7 +225,7 @@  discard block
 block discarded – undo
220 225
 
221 226
 /**
222 227
  * @param $user
223
- * @param $username_safe
228
+ * @param string $username_safe
224 229
  */
225 230
 function db_player_name_history_replace($user, $username_safe) {
226 231
   doquery("REPLACE INTO {{player_name_history}} SET `player_id` = {$user['id']}, `player_name` = '{$username_safe}'");
@@ -228,7 +233,7 @@  discard block
 block discarded – undo
228 233
 
229 234
 
230 235
 /**
231
- * @param $username_safe
236
+ * @param string $username_safe
232 237
  *
233 238
  * @return array|bool|mysqli_result|null
234 239
  */
@@ -488,9 +493,9 @@  discard block
 block discarded – undo
488 493
  * @param $user_id
489 494
  * @param $change_type
490 495
  * @param $dark_matter
491
- * @param $comment
496
+ * @param string $comment
492 497
  * @param $row
493
- * @param $page_url
498
+ * @param string $page_url
494 499
  */
495 500
 function db_log_dark_matter_insert($user_id, $change_type, $dark_matter, $comment, $row, $page_url) {
496 501
   doquery(
@@ -534,9 +539,9 @@  discard block
 block discarded – undo
534 539
 
535 540
 // Quests ***********************************************************************************************************
536 541
 /**
537
- * @param $query_add_select
542
+ * @param string $query_add_select
538 543
  * @param $query_add_from
539
- * @param $query_add_where
544
+ * @param string $query_add_where
540 545
  *
541 546
  * @return array|bool|mysqli_result|null
542 547
  */
@@ -580,11 +585,11 @@  discard block
 block discarded – undo
580 585
 }
581 586
 
582 587
 /**
583
- * @param $quest_name
584
- * @param $quest_type
585
- * @param $quest_description
588
+ * @param string $quest_name
589
+ * @param integer $quest_type
590
+ * @param string $quest_description
586 591
  * @param $quest_conditions
587
- * @param $quest_rewards
592
+ * @param string $quest_rewards
588 593
  * @param $quest_id
589 594
  */
590 595
 function db_quest_update($quest_name, $quest_type, $quest_description, $quest_conditions, $quest_rewards, $quest_id) {
@@ -607,7 +612,7 @@  discard block
 block discarded – undo
607 612
 /**
608 613
  * @param $banner
609 614
  * @param $banned
610
- * @param $reason
615
+ * @param string $reason
611 616
  * @param $ban_until
612 617
  */
613 618
 function db_ban_insert($banner, $banned, $reason, $ban_until) {
@@ -630,7 +635,7 @@  discard block
 block discarded – undo
630 635
 /**
631 636
  * @param $banner
632 637
  * @param $banned
633
- * @param $reason
638
+ * @param string $reason
634 639
  */
635 640
 function db_ban_insert_unset($banner, $banned, $reason) {
636 641
   doquery(
Please login to merge, or discard this patch.
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -85,7 +85,7 @@  discard block
 block discarded – undo
85 85
 
86 86
 function db_stat_list_statistic($who, $is_common_stat, $Rank, $start, $source = false) {
87 87
 // pdump($source);
88
-  if(!$source) {
88
+  if (!$source) {
89 89
     $source = array(
90 90
       'statpoints' => 'statpoints',
91 91
       'users'      => 'users',
@@ -106,8 +106,8 @@  discard block
 block discarded – undo
106 106
     );
107 107
   }
108 108
 // pdump($source);
109
-  if($who == 1) {
110
-    if($is_common_stat) { // , UNIX_TIMESTAMP(CONCAT(YEAR(CURRENT_DATE), DATE_FORMAT(`user_birthday`, '-%m-%d'))) AS `nearest_birthday`
109
+  if ($who == 1) {
110
+    if ($is_common_stat) { // , UNIX_TIMESTAMP(CONCAT(YEAR(CURRENT_DATE), DATE_FORMAT(`user_birthday`, '-%m-%d'))) AS `nearest_birthday`
111 111
       $query_str =
112 112
         "SELECT
113 113
       @rownum:=@rownum+1 rownum, subject.{$source['id']} as `id`, sp.{$Rank}_rank as rank, sp.{$Rank}_old_rank as rank_old, sp.{$Rank}_points as points, subject.{$source['username']} as `name`, subject.*
@@ -191,7 +191,7 @@  discard block
 block discarded – undo
191 191
 function db_get_set_unique_id_value($current_value_unsafe, $db_id_field_name, $db_table_name, $db_value_field_name) {
192 192
   $current_value_safe = db_escape($current_value_unsafe);
193 193
   $value_id = doquery("SELECT `{$db_id_field_name}` AS id_field FROM {{{$db_table_name}}} WHERE `{$db_value_field_name}` = '{$current_value_safe}' LIMIT 1 FOR UPDATE", true);
194
-  if(!isset($value_id['id_field']) || !$value_id['id_field']) {
194
+  if (!isset($value_id['id_field']) || !$value_id['id_field']) {
195 195
     doquery("INSERT INTO {{{$db_table_name}}} (`{$db_value_field_name}`) VALUES ('{$current_value_safe}');");
196 196
     $variable_id = db_insert_id();
197 197
   } else {
Please login to merge, or discard this patch.
includes/db/db_queries_ally.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -293,7 +293,7 @@
 block discarded – undo
293 293
 }
294 294
 
295 295
 /**
296
- * @param $ranklist
296
+ * @param string $ranklist
297 297
  * @param $user
298 298
  */
299 299
 function db_ally_update_ranklist($ranklist, $user) {
Please login to merge, or discard this patch.
includes/db/db_queries_chat.php 1 patch
Doc Comments   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -17,9 +17,9 @@  discard block
 block discarded – undo
17 17
 
18 18
 /**
19 19
  * @param $user_id
20
- * @param $nick
20
+ * @param string $nick
21 21
  * @param $ally_id
22
- * @param $message
22
+ * @param string $message
23 23
  * @param $chat_message_sender_name
24 24
  * @param $chat_message_recipient_id
25 25
  * @param $chat_message_recipient_name
@@ -55,7 +55,7 @@  discard block
 block discarded – undo
55 55
  * @param $alliance
56 56
  * @param $where_add
57 57
  * @param $start_row
58
- * @param $page_limit
58
+ * @param integer $page_limit
59 59
  *
60 60
  * @return array|bool|mysqli_result|null
61 61
  */
Please login to merge, or discard this patch.
includes/db/db_queries_fleet.php 2 patches
Doc Comments   +6 added lines, -2 removed lines patch added patch discarded remove patch
@@ -22,6 +22,10 @@  discard block
 block discarded – undo
22 22
   doquery('DELETE FROM `{{aks}}` WHERE `id` NOT IN (SELECT DISTINCT `fleet_group` FROM `{{fleets}}`);');
23 23
 }
24 24
 
25
+/**
26
+ * @param double $arrival
27
+ * @param integer $target_structure
28
+ */
25 29
 function db_missile_insert($target_coord, $user, $planetrow, $arrival, $fleet_ship_count, $target_structure) {
26 30
   doquery(
27 31
     "INSERT INTO `{{iraks}}` SET
@@ -114,14 +118,14 @@  discard block
 block discarded – undo
114 118
 
115 119
 
116 120
 /**
117
- * @param $fleet_group_id_list
121
+ * @param string $fleet_group_id_list
118 122
  */
119 123
 function db_acs_delete_by_list($fleet_group_id_list) {
120 124
   doquery("DELETE FROM {{aks}} WHERE `id` IN ({$fleet_group_id_list})");
121 125
 }
122 126
 
123 127
 /**
124
- * @param $bashing_list
128
+ * @param string $bashing_list
125 129
  */
126 130
 function db_bashing_insert($bashing_list) {
127 131
   doquery("INSERT INTO {{bashing}} (bashing_user_id, bashing_planet_id, bashing_time) VALUES {$bashing_list};");
Please login to merge, or discard this patch.
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,7 +1,7 @@
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- * DB ACS functions
4
- */
3
+   * DB ACS functions
4
+   */
5 5
 
6 6
 /* ACS ****************************************************************************************************************/
7 7
 /**
Please login to merge, or discard this patch.
includes/db/db_queries_news_and_surveys.php 1 patch
Doc Comments   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -79,9 +79,9 @@  discard block
 block discarded – undo
79 79
 }
80 80
 
81 81
 /**
82
- * @param $template
83
- * @param $query_where
84
- * @param $query_limit
82
+ * @param template $template
83
+ * @param string $query_where
84
+ * @param integer $query_limit
85 85
  *
86 86
  * @return array|bool|mysqli_result|null
87 87
  */
@@ -105,7 +105,7 @@  discard block
 block discarded – undo
105 105
  * @param $user
106 106
  * @param $survey_id
107 107
  * @param $survey_vote_id
108
- * @param $user_name_safe
108
+ * @param string $user_name_safe
109 109
  */
110 110
 function db_survey_vote_insert(&$user, $survey_id, $survey_vote_id, $user_name_safe) {
111 111
   doquery("INSERT INTO {{survey_votes}} SET `survey_parent_id` = {$survey_id}, `survey_parent_answer_id` = {$survey_vote_id}, `survey_vote_user_id` = {$user['id']}, `survey_vote_user_name` = '{$user_name_safe}';");
Please login to merge, or discard this patch.
includes/functions/int_fleet_events.php 2 patches
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -69,8 +69,8 @@
 block discarded – undo
69 69
 
70 70
 /**
71 71
  * @param Fleet $objFleet
72
- * @param       $ov_label
73
- * @param       $planet_end_type
72
+ * @param       integer $ov_label
73
+ * @param       integer $planet_end_type
74 74
  *
75 75
  * @return mixed
76 76
  */
Please login to merge, or discard this 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 > $config->game_maxPlanet) {
19
+    if ($objFleet->fleet_end_planet > $config->game_maxPlanet) {
20 20
       $objFleet->fleet_end_name = $lang['ov_fleet_exploration'];
21
-    } elseif($objFleet->mission_type == MT_COLONIZE) {
21
+    } elseif ($objFleet->mission_type == MT_COLONIZE) {
22 22
       $objFleet->fleet_end_name = $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/tpl_helpers.php 2 patches
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -185,6 +185,9 @@
 block discarded – undo
185 185
   return $result;
186 186
 }
187 187
 
188
+/**
189
+ * @param integer $que_id
190
+ */
188 191
 function tpl_parse_planet_que($que, $planet, $que_id) {
189 192
   $hangar_que = array();
190 193
   $que_hangar = $que['ques'][$que_id][$planet['id_owner']][$planet['id']];
Please login to merge, or discard this patch.
Spacing   +29 added lines, -29 removed lines patch added patch discarded remove patch
@@ -2,8 +2,8 @@  discard block
 block discarded – undo
2 2
 
3 3
 // Compare function to sort fleet in time order
4 4
 function tpl_assign_fleet_compare($a, $b) {
5
-  if($a['fleet']['OV_THIS_PLANET'] == $b['fleet']['OV_THIS_PLANET']) {
6
-    if($a['fleet']['OV_LEFT'] == $b['fleet']['OV_LEFT']) {
5
+  if ($a['fleet']['OV_THIS_PLANET'] == $b['fleet']['OV_THIS_PLANET']) {
6
+    if ($a['fleet']['OV_LEFT'] == $b['fleet']['OV_LEFT']) {
7 7
       return 0;
8 8
     }
9 9
 
@@ -19,17 +19,17 @@  discard block
 block discarded – undo
19 19
  * @param string   $js_name
20 20
  */
21 21
 function tpl_assign_fleet(&$template, $fleets, $js_name = 'fleets') {
22
-  if(!$fleets) {
22
+  if (!$fleets) {
23 23
     return;
24 24
   }
25 25
 
26 26
   usort($fleets, 'tpl_assign_fleet_compare');
27 27
 
28
-  foreach($fleets as $fleet_data) {
28
+  foreach ($fleets as $fleet_data) {
29 29
     $template->assign_block_vars($js_name, $fleet_data['fleet']);
30 30
 
31
-    if($fleet_data['ships']) {
32
-      foreach($fleet_data['ships'] as $ship_data) {
31
+    if ($fleet_data['ships']) {
32
+      foreach ($fleet_data['ships'] as $ship_data) {
33 33
         $template->assign_block_vars("{$js_name}.ships", $ship_data);
34 34
       }
35 35
     }
@@ -50,8 +50,8 @@  discard block
 block discarded – undo
50 50
     'DEUTERIUM' => $fleet[RES_DEUTERIUM],
51 51
   );
52 52
 
53
-  foreach($fleet as $ship_id => $ship_amount) {
54
-    if(in_array($ship_id, sn_get_groups('fleet'))) {
53
+  foreach ($fleet as $ship_id => $ship_amount) {
54
+    if (in_array($ship_id, sn_get_groups('fleet'))) {
55 55
       $single_ship_data = get_ship_data($ship_id, $user_data);
56 56
       $return['ships'][$ship_id] = array(
57 57
         'ID'          => $ship_id,
@@ -90,11 +90,11 @@  discard block
 block discarded – undo
90 90
 
91 91
   $result = array();
92 92
 
93
-  if(!$user_data) {
93
+  if (!$user_data) {
94 94
     $user_data = $user;
95 95
   }
96 96
 
97
-  if(!$objFleet->isReturning() && $objFleet->mission_type == MT_AKS) {
97
+  if (!$objFleet->isReturning() && $objFleet->mission_type == MT_AKS) {
98 98
     $aks = db_acs_get_by_group_id($objFleet->group_id);
99 99
   }
100 100
 
@@ -135,14 +135,14 @@  discard block
 block discarded – undo
135 135
     'STAY_LEFT' => floor($objFleet->time_mission_job_complete + 1 - SN_TIME_NOW),
136 136
   );
137 137
 
138
-  if(property_exists($objFleet, 'fleet_start_name')) {
138
+  if (property_exists($objFleet, 'fleet_start_name')) {
139 139
     $result['START_NAME'] = $objFleet->fleet_start_name;
140 140
   }
141
-  if(property_exists($objFleet, 'fleet_end_name')) {
141
+  if (property_exists($objFleet, 'fleet_end_name')) {
142 142
     $result['END_NAME'] = $objFleet->fleet_end_name;
143 143
   }
144 144
 
145
-  if(property_exists($objFleet, 'event_time')) {
145
+  if (property_exists($objFleet, 'event_time')) {
146 146
     $result['fleet'] = array_merge($result['fleet'], array(
147 147
       'OV_LABEL'        => $objFleet->ov_label,
148 148
       'EVENT_TIME_TEXT' => property_exists($objFleet, 'event_time') ? date(FMT_DATE_TIME, $objFleet->event_time + SN_CLIENT_TIME_DIFF) : '',
@@ -154,9 +154,9 @@  discard block
 block discarded – undo
154 154
   $ship_list_fully_parsed = $objFleet->shipsGetArray();
155 155
 
156 156
   $ship_id = 0;
157
-  if($spy_level >= 6) {
158
-    foreach($ship_list_fully_parsed as $ship_sn_id => $ship_amount) {
159
-      if($spy_level >= 10) {
157
+  if ($spy_level >= 6) {
158
+    foreach ($ship_list_fully_parsed as $ship_sn_id => $ship_amount) {
159
+      if ($spy_level >= 10) {
160 160
         $single_ship_data = get_ship_data($ship_sn_id, $user_data);
161 161
         $result['ships'][$ship_sn_id] = array(
162 162
           'ID'          => $ship_sn_id,
@@ -188,8 +188,8 @@  discard block
 block discarded – undo
188 188
 function tpl_parse_planet_que($que, $planet, $que_id) {
189 189
   $hangar_que = array();
190 190
   $que_hangar = $que['ques'][$que_id][$planet['id_owner']][$planet['id']];
191
-  if(!empty($que_hangar)) {
192
-    foreach($que_hangar as $que_item) {
191
+  if (!empty($que_hangar)) {
192
+    foreach ($que_hangar as $que_item) {
193 193
       $hangar_que['que'][] = array('id' => $que_item['que_unit_id'], 'count' => $que_item['que_unit_amount']);
194 194
       $hangar_que[$que_item['que_unit_id']] += $que_item['que_unit_amount'];
195 195
     }
@@ -252,10 +252,10 @@  discard block
 block discarded – undo
252 252
     'PLANET_GOVERNOR_LEVEL_MAX' => get_unit_param($planet['PLANET_GOVERNOR_ID'], P_MAX_STACK),
253 253
   );
254 254
 
255
-  if(!empty($que['ques'][QUE_STRUCTURES][$planet['id_owner']][$planet['id']])) {
255
+  if (!empty($que['ques'][QUE_STRUCTURES][$planet['id_owner']][$planet['id']])) {
256 256
     $result['building_que'] = array();
257 257
     $building_que = &$que['ques'][QUE_STRUCTURES][$planet['id_owner']][$planet['id']];
258
-    foreach($building_que as $que_element) {
258
+    foreach ($building_que as $que_element) {
259 259
       $result['building_que'][] = que_tpl_parse_element($que_element);
260 260
     }
261 261
   }
@@ -271,19 +271,19 @@  discard block
 block discarded – undo
271 271
 function flt_get_fleets_to_planet_by_array_of_Fleet($array_of_Fleet) {
272 272
   global $user;
273 273
 
274
-  if(empty($array_of_Fleet)) {
274
+  if (empty($array_of_Fleet)) {
275 275
     return false;
276 276
   }
277 277
 
278 278
   $fleet_list = array();
279
-  foreach($array_of_Fleet as $fleet) {
280
-    if($fleet->playerOwnerId == $user['id']) {
281
-      if($fleet->mission_type == MT_MISSILE) {
279
+  foreach ($array_of_Fleet as $fleet) {
280
+    if ($fleet->playerOwnerId == $user['id']) {
281
+      if ($fleet->mission_type == MT_MISSILE) {
282 282
         continue;
283 283
       }
284 284
       $fleet_ownage = 'own';
285 285
     } else {
286
-      switch($fleet->mission_type) {
286
+      switch ($fleet->mission_type) {
287 287
         case MT_ATTACK:
288 288
         case MT_AKS:
289 289
         case MT_DESTROY:
@@ -300,10 +300,10 @@  discard block
 block discarded – undo
300 300
 
301 301
     $fleet_list[$fleet_ownage]['fleets'][$fleet->dbId] = $fleet;
302 302
 
303
-    if($fleet->isReturning() || (!$fleet->isReturning() && $fleet->mission_type == MT_RELOCATE) || ($fleet->target_owner_id != $user['id'])) {
303
+    if ($fleet->isReturning() || (!$fleet->isReturning() && $fleet->mission_type == MT_RELOCATE) || ($fleet->target_owner_id != $user['id'])) {
304 304
       $fleet_sn = $fleet->shipsGetArray();
305
-      foreach($fleet_sn as $ship_id => $ship_amount) {
306
-        if(in_array($ship_id, sn_get_groups('fleet'))) {
305
+      foreach ($fleet_sn as $ship_id => $ship_amount) {
306
+        if (in_array($ship_id, sn_get_groups('fleet'))) {
307 307
           $fleet_list[$fleet_ownage]['total'][$ship_id] += $ship_amount;
308 308
         }
309 309
       }
@@ -320,7 +320,7 @@  discard block
 block discarded – undo
320 320
   return $fleet_list;
321 321
 }
322 322
 
323
-function tpl_set_resource_info(template &$template, $planet_row, $fleets_to_planet = array(), $round = 0) {
323
+function tpl_set_resource_info(template & $template, $planet_row, $fleets_to_planet = array(), $round = 0) {
324 324
   $template->assign_vars(array(
325 325
     'RESOURCE_ROUNDING' => $round,
326 326
 
Please login to merge, or discard this patch.
includes/includes/coe_simulator_helpers.php 2 patches
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -1,5 +1,8 @@
 block discarded – undo
1 1
 <?php
2 2
 
3
+/**
4
+ * @param string $type
5
+ */
3 6
 function sn_ube_simulator_encode_replay($combat, $type)
4 7
 {
5 8
   $strPacked = "{$type}!";
Please login to merge, or discard this patch.
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -4,9 +4,9 @@  discard block
 block discarded – undo
4 4
 {
5 5
   $strPacked = "{$type}!";
6 6
 
7
-  foreach($combat as $fleetID => $fleetCompress)
7
+  foreach ($combat as $fleetID => $fleetCompress)
8 8
   {
9
-    foreach($fleetCompress as $key => $value)
9
+    foreach ($fleetCompress as $key => $value)
10 10
     {
11 11
       $value = intval($value);
12 12
       $strPacked .= "{$key},{$value};";
@@ -22,29 +22,29 @@  discard block
 block discarded – undo
22 22
   $fleet_id = 0;
23 23
 
24 24
   $arr_data_unpacked = explode('!', $str_data);
25
-  foreach($arr_data_unpacked as $data_piece)
25
+  foreach ($arr_data_unpacked as $data_piece)
26 26
   {
27
-    if(!$data_piece)
27
+    if (!$data_piece)
28 28
     {
29 29
       continue;
30 30
     }
31 31
 
32
-    if($data_piece == 'A' || $data_piece == 'D')
32
+    if ($data_piece == 'A' || $data_piece == 'D')
33 33
     {
34 34
       $fleet_type = $data_piece;
35 35
       continue;
36 36
     }
37 37
 
38 38
     $arr_unit_strings = explode(';', $data_piece);
39
-    foreach($arr_unit_strings as $str_unit_string)
39
+    foreach ($arr_unit_strings as $str_unit_string)
40 40
     {
41
-      if(!$str_unit_string)
41
+      if (!$str_unit_string)
42 42
       {
43 43
         continue;
44 44
       }
45 45
 
46 46
       $arr_unit_data = explode(',', $str_unit_string);
47
-      if($arr_unit_data[1])
47
+      if ($arr_unit_data[1])
48 48
       {
49 49
         $unpacked[$fleet_type][$fleet_id][$arr_unit_data[0]] = intval($arr_unit_data[1]);
50 50
       }
Please login to merge, or discard this patch.
includes/includes/flt_mission_attack.php 2 patches
Doc Comments   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -10,9 +10,8 @@
 block discarded – undo
10 10
 
11 11
 /**
12 12
  * @param Mission $objMission
13
- * @param array   $mission_data
14 13
  *
15
- * @return array|null
14
+ * @return null|boolean
16 15
  */
17 16
 function flt_mission_attack($objMission) {
18 17
   $objFleet = $objMission->fleet;
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -17,14 +17,14 @@
 block discarded – undo
17 17
 function flt_mission_attack($objMission) {
18 18
   $objFleet = $objMission->fleet;
19 19
 
20
-  if($objFleet->shipsGetTotal() <= 0) {
20
+  if ($objFleet->shipsGetTotal() <= 0) {
21 21
     return null;
22 22
   }
23 23
 
24 24
   $destination_user = $objMission->dst_user;
25 25
   $destination_planet = $objMission->dst_planet;
26 26
 
27
-  if(
27
+  if (
28 28
     // Нет данных о планете назначения или её владельце
29 29
     empty($destination_user) || empty($destination_planet) || !is_array($destination_user) || !is_array($destination_planet)
30 30
     ||
Please login to merge, or discard this patch.