Completed
Push — work-fleets ( 3604bd...203362 )
by SuperNova.WS
06:25
created
admin/statbuilder.php 2 patches
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -43,8 +43,7 @@
 block discarded – undo
43 43
   doquery("UPDATE {{alliance}} SET ally_user_id = {$ally_user_id} WHERE id = {$ally_id} LIMIT 1;");
44 44
 
45 45
   message(str_replace('%s', $ally_tag_raw, $lang['ally_been_maked']), str_replace('%s', $ally_tag_raw, $lang['ally_maked']));
46
-}
47
-else
46
+} else
48 47
 {
49 48
   $page .= parsetemplate(gettemplate('ali_external_make'), $lang);
50 49
 }
Please login to merge, or discard this patch.
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -9,18 +9,18 @@
 block discarded – undo
9 9
  * @copyright 2008 by Chlorel for XNova
10 10
  */
11 11
 
12
-define('INSIDE'  , true);
13
-define('INSTALL' , false);
12
+define('INSIDE', true);
13
+define('INSTALL', false);
14 14
 define('IN_ADMIN', true);
15 15
 require_once('../common.' . substr(strrchr(__FILE__, '.'), 1));
16 16
 
17 17
 // if($user['authlevel'] < 1)
18
-if($user['authlevel'] < 3)
18
+if ($user['authlevel'] < 3)
19 19
 {
20 20
   AdminMessage(classLocale::$lang['adm_err_denied']);
21 21
 }
22 22
 
23
-if(SN_TIME_NOW >= classSupernova::$config->db_loadItem('var_stat_update_admin_forced') && SN_TIME_NOW >= classSupernova::$config->db_loadItem('var_stat_update_end'))
23
+if (SN_TIME_NOW >= classSupernova::$config->db_loadItem('var_stat_update_admin_forced') && SN_TIME_NOW >= classSupernova::$config->db_loadItem('var_stat_update_end'))
24 24
 {
25 25
   classSupernova::$config->db_saveItem('var_stat_update_admin_forced', SN_TIME_NOW + 120);
26 26
 
Please login to merge, or discard this patch.
includes/functions/int_fleet_events.php 4 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 > Vector::$knownPlanets) {
19
+    if ($objFleet->fleet_end_planet > Vector::$knownPlanets) {
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.
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -125,8 +125,7 @@
 block discarded – undo
125 125
   return tplParseFleetObject($objFleet, ++$fleet_number, $user_data);
126 126
 }
127 127
 
128
-function int_planet_pretemplate($planetrow, &$template)
129
-{
128
+function int_planet_pretemplate($planetrow, &$template) {
130 129
   global $user;
131 130
 
132 131
   $governor_id = $planetrow['PLANET_GOVERNOR_ID'];
Please login to merge, or discard this patch.
Upper-Lower-Casing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -87,18 +87,18 @@  discard block
 block discarded – undo
87 87
     case 0:
88 88
       $objFleet->event_time = $objFleet->time_arrive_to_target;
89 89
       $is_this_planet = (
90
-        ($planetrow['galaxy'] == $objFleet->fleet_end_galaxy) AND
91
-        ($planetrow['system'] == $objFleet->fleet_end_system) AND
92
-        ($planetrow['planet'] == $objFleet->fleet_end_planet) AND
90
+        ($planetrow['galaxy'] == $objFleet->fleet_end_galaxy) and
91
+        ($planetrow['system'] == $objFleet->fleet_end_system) and
92
+        ($planetrow['planet'] == $objFleet->fleet_end_planet) and
93 93
         ($planetrow['planet_type'] == $planet_end_type));
94 94
     break;
95 95
 
96 96
     case 1:
97 97
       $objFleet->event_time = $objFleet->time_mission_job_complete;
98 98
       $is_this_planet = (
99
-        ($planetrow['galaxy'] == $objFleet->fleet_end_galaxy) AND
100
-        ($planetrow['system'] == $objFleet->fleet_end_system) AND
101
-        ($planetrow['planet'] == $objFleet->fleet_end_planet) AND
99
+        ($planetrow['galaxy'] == $objFleet->fleet_end_galaxy) and
100
+        ($planetrow['system'] == $objFleet->fleet_end_system) and
101
+        ($planetrow['planet'] == $objFleet->fleet_end_planet) and
102 102
         ($planetrow['planet_type'] == $planet_end_type));
103 103
     break;
104 104
 
@@ -106,9 +106,9 @@  discard block
 block discarded – undo
106 106
     case 3:
107 107
       $objFleet->event_time = $objFleet->time_return_to_source;
108 108
       $is_this_planet = (
109
-        ($planetrow['galaxy'] == $objFleet->fleet_start_galaxy) AND
110
-        ($planetrow['system'] == $objFleet->fleet_start_system) AND
111
-        ($planetrow['planet'] == $objFleet->fleet_start_planet) AND
109
+        ($planetrow['galaxy'] == $objFleet->fleet_start_galaxy) and
110
+        ($planetrow['system'] == $objFleet->fleet_start_system) and
111
+        ($planetrow['planet'] == $objFleet->fleet_start_planet) and
112 112
         ($planetrow['planet_type'] == $objFleet->fleet_start_type));
113 113
     break;
114 114
 
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
@@ -4,8 +4,8 @@  discard block
 block discarded – undo
4 4
 use DBStatic\DBStaticFleetACS;
5 5
 
6 6
 function tpl_assign_fleet_compare($a, $b) {
7
-  if($a['fleet']['OV_THIS_PLANET'] == $b['fleet']['OV_THIS_PLANET']) {
8
-    if($a['fleet']['OV_LEFT'] == $b['fleet']['OV_LEFT']) {
7
+  if ($a['fleet']['OV_THIS_PLANET'] == $b['fleet']['OV_THIS_PLANET']) {
8
+    if ($a['fleet']['OV_LEFT'] == $b['fleet']['OV_LEFT']) {
9 9
       return 0;
10 10
     }
11 11
 
@@ -21,17 +21,17 @@  discard block
 block discarded – undo
21 21
  * @param string   $js_name
22 22
  */
23 23
 function tpl_assign_fleet(&$template, $fleets, $js_name = 'fleets') {
24
-  if(!$fleets) {
24
+  if (!$fleets) {
25 25
     return;
26 26
   }
27 27
 
28 28
   usort($fleets, 'tpl_assign_fleet_compare');
29 29
 
30
-  foreach($fleets as $fleet_data) {
30
+  foreach ($fleets as $fleet_data) {
31 31
     $template->assign_block_vars($js_name, $fleet_data['fleet']);
32 32
 
33
-    if($fleet_data['ships']) {
34
-      foreach($fleet_data['ships'] as $ship_data) {
33
+    if ($fleet_data['ships']) {
34
+      foreach ($fleet_data['ships'] as $ship_data) {
35 35
         $template->assign_block_vars("{$js_name}.ships", $ship_data);
36 36
       }
37 37
     }
@@ -52,8 +52,8 @@  discard block
 block discarded – undo
52 52
     'DEUTERIUM' => $fleet[RES_DEUTERIUM],
53 53
   );
54 54
 
55
-  foreach($fleet as $ship_id => $ship_amount) {
56
-    if(in_array($ship_id, classSupernova::$gc->groupFleet)) {
55
+  foreach ($fleet as $ship_id => $ship_amount) {
56
+    if (in_array($ship_id, classSupernova::$gc->groupFleet)) {
57 57
       $single_ship_data = get_ship_data($ship_id, $user_data);
58 58
       $return['ships'][$ship_id] = array(
59 59
         'ID'          => $ship_id,
@@ -92,11 +92,11 @@  discard block
 block discarded – undo
92 92
 
93 93
   $result = array();
94 94
 
95
-  if(!$user_data) {
95
+  if (!$user_data) {
96 96
     $user_data = $user;
97 97
   }
98 98
 
99
-  if(!$objFleet->isReturning() && $objFleet->mission_type == MT_ACS) {
99
+  if (!$objFleet->isReturning() && $objFleet->mission_type == MT_ACS) {
100 100
     $aks = DBStaticFleetACS::db_acs_get_by_group_id($objFleet->group_id);
101 101
   }
102 102
 
@@ -137,14 +137,14 @@  discard block
 block discarded – undo
137 137
     'STAY_LEFT' => floor($objFleet->time_mission_job_complete + 1 - SN_TIME_NOW),
138 138
   );
139 139
 
140
-  if(property_exists($objFleet, 'fleet_start_name')) {
140
+  if (property_exists($objFleet, 'fleet_start_name')) {
141 141
     $result['START_NAME'] = $objFleet->fleet_start_name;
142 142
   }
143
-  if(property_exists($objFleet, 'fleet_end_name')) {
143
+  if (property_exists($objFleet, 'fleet_end_name')) {
144 144
     $result['END_NAME'] = $objFleet->fleet_end_name;
145 145
   }
146 146
 
147
-  if(property_exists($objFleet, 'event_time')) {
147
+  if (property_exists($objFleet, 'event_time')) {
148 148
     $result['fleet'] = array_merge($result['fleet'], array(
149 149
       'OV_LABEL'        => $objFleet->ov_label,
150 150
       'EVENT_TIME_TEXT' => property_exists($objFleet, 'event_time') ? date(FMT_DATE_TIME, $objFleet->event_time + SN_CLIENT_TIME_DIFF) : '',
@@ -155,9 +155,9 @@  discard block
 block discarded – undo
155 155
 
156 156
   $ship_id = 0;
157 157
   $result['ships'] = array();
158
-  if($spy_level >= 6) {
159
-    foreach($objFleet->shipsIterator() as $ship_sn_id => $ship) {
160
-      if($spy_level >= 10) {
158
+  if ($spy_level >= 6) {
159
+    foreach ($objFleet->shipsIterator() as $ship_sn_id => $ship) {
160
+      if ($spy_level >= 10) {
161 161
         $single_ship_data = get_ship_data($ship_sn_id, $user_data);
162 162
         $result['ships'][$ship_sn_id] = array(
163 163
           'ID'          => $ship_sn_id,
@@ -190,8 +190,8 @@  discard block
 block discarded – undo
190 190
 function tpl_parse_planet_que($que, $planet, $que_id) {
191 191
   $hangar_que = array();
192 192
   $que_hangar = $que['ques'][$que_id][$planet['id_owner']][$planet['id']];
193
-  if(!empty($que_hangar)) {
194
-    foreach($que_hangar as $que_item) {
193
+  if (!empty($que_hangar)) {
194
+    foreach ($que_hangar as $que_item) {
195 195
       $hangar_que['que'][] = array('id' => $que_item['que_unit_id'], 'count' => $que_item['que_unit_amount']);
196 196
       $hangar_que[$que_item['que_unit_id']] += $que_item['que_unit_amount'];
197 197
     }
@@ -251,10 +251,10 @@  discard block
 block discarded – undo
251 251
     'PLANET_GOVERNOR_LEVEL_MAX' => get_unit_param($planet['PLANET_GOVERNOR_ID'], P_MAX_STACK),
252 252
   );
253 253
 
254
-  if(!empty($que['ques'][QUE_STRUCTURES][$planet['id_owner']][$planet['id']])) {
254
+  if (!empty($que['ques'][QUE_STRUCTURES][$planet['id_owner']][$planet['id']])) {
255 255
     $result['building_que'] = array();
256 256
     $building_que = &$que['ques'][QUE_STRUCTURES][$planet['id_owner']][$planet['id']];
257
-    foreach($building_que as $que_element) {
257
+    foreach ($building_que as $que_element) {
258 258
       $result['building_que'][] = que_tpl_parse_element($que_element);
259 259
     }
260 260
   }
@@ -273,19 +273,19 @@  discard block
 block discarded – undo
273 273
   static $snGroupFleet;
274 274
   !$snGroupFleet ? $snGroupFleet = classSupernova::$gc->groupFleet : false;
275 275
 
276
-  if(empty($array_of_Fleet)) {
276
+  if (empty($array_of_Fleet)) {
277 277
     return false;
278 278
   }
279 279
 
280 280
   $fleet_list = array();
281
-  foreach($array_of_Fleet as $fleet) {
282
-    if($fleet->playerOwnerId == $user['id']) {
283
-      if($fleet->mission_type == MT_MISSILE) {
281
+  foreach ($array_of_Fleet as $fleet) {
282
+    if ($fleet->playerOwnerId == $user['id']) {
283
+      if ($fleet->mission_type == MT_MISSILE) {
284 284
         continue;
285 285
       }
286 286
       $fleet_ownage = 'own';
287 287
     } else {
288
-      switch($fleet->mission_type) {
288
+      switch ($fleet->mission_type) {
289 289
         case MT_ATTACK:
290 290
         case MT_ACS:
291 291
         case MT_DESTROY:
@@ -302,9 +302,9 @@  discard block
 block discarded – undo
302 302
 
303 303
     $fleet_list[$fleet_ownage]['fleets'][$fleet->dbId] = $fleet;
304 304
 
305
-    if($fleet->isReturning() || (!$fleet->isReturning() && $fleet->mission_type == MT_RELOCATE) || ($fleet->target_owner_id != $user['id'])) {
306
-      foreach($fleet->shipsIterator() as $ship_id => $ship) {
307
-        if(!empty($snGroupFleet[$ship_id])) {
305
+    if ($fleet->isReturning() || (!$fleet->isReturning() && $fleet->mission_type == MT_RELOCATE) || ($fleet->target_owner_id != $user['id'])) {
306
+      foreach ($fleet->shipsIterator() as $ship_id => $ship) {
307
+        if (!empty($snGroupFleet[$ship_id])) {
308 308
           $fleet_list[$fleet_ownage]['total'][$ship_id] += $ship->count;
309 309
         }
310 310
       }
@@ -321,7 +321,7 @@  discard block
 block discarded – undo
321 321
   return $fleet_list;
322 322
 }
323 323
 
324
-function tpl_set_resource_info(template &$template, $planet_row, $fleets_to_planet = array(), $round = 0) {
324
+function tpl_set_resource_info(template & $template, $planet_row, $fleets_to_planet = array(), $round = 0) {
325 325
   $template->assign_vars(array(
326 326
     'RESOURCE_ROUNDING' => $round,
327 327
 
Please login to merge, or discard this patch.
includes/includes/coe_simulator_helpers.php 3 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.
Braces   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -1,7 +1,6 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 
3
-function sn_ube_simulator_encode_replay($combat, $type)
4
-{
3
+function sn_ube_simulator_encode_replay($combat, $type) {
5 4
   $strPacked = "{$type}!";
6 5
 
7 6
   foreach($combat as $fleetID => $fleetCompress)
@@ -17,8 +16,7 @@  discard block
 block discarded – undo
17 16
   return $strPacked;
18 17
 }
19 18
 
20
-function sn_ube_simulator_decode_replay($str_data)
21
-{
19
+function sn_ube_simulator_decode_replay($str_data) {
22 20
   $fleet_id = 0;
23 21
 
24 22
   $arr_data_unpacked = explode('!', $str_data);
Please login to merge, or discard this patch.
includes/includes/flt_mission_explore.php 2 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -31,7 +31,7 @@
 block discarded – undo
31 31
 /**
32 32
  * Fleet mission "Relocate"
33 33
  *
34
- * @param $mission_data Mission
34
+ * @param Mission $mission_data Mission
35 35
  *
36 36
  * @return int
37 37
  *
Please login to merge, or discard this patch.
Spacing   +28 added lines, -29 removed lines patch added patch discarded remove patch
@@ -23,7 +23,7 @@  discard block
 block discarded – undo
23 23
   // TODO - Currently $ship_data is one for all players
24 24
   static $shipCostInMetalPerPiece, $rates;
25 25
 
26
-  if(empty($mission_data->fleet_event) || $mission_data->fleet_event != EVENT_FLT_ACOMPLISH) {
26
+  if (empty($mission_data->fleet_event) || $mission_data->fleet_event != EVENT_FLT_ACOMPLISH) {
27 27
     return;
28 28
   }
29 29
 
@@ -48,12 +48,12 @@  discard block
 block discarded – undo
48 48
   $outcome_value = &$result['$outcome_value'];
49 49
   $outcome_list = &$result['$outcome_list'];
50 50
 
51
-  if(!$shipCostInMetalPerPiece) {
51
+  if (!$shipCostInMetalPerPiece) {
52 52
     $rates = get_resource_exchange();
53 53
 
54
-    foreach(classSupernova::$gc->groupFleet as $unit_id) {
54
+    foreach (classSupernova::$gc->groupFleet as $unit_id) {
55 55
       $unit_info = get_unit_param($unit_id);
56
-      if($unit_info[P_UNIT_TYPE] != UNIT_SHIPS || !isset($unit_info['engine'][0]['speed']) || !$unit_info['engine'][0]['speed']) {
56
+      if ($unit_info[P_UNIT_TYPE] != UNIT_SHIPS || !isset($unit_info['engine'][0]['speed']) || !$unit_info['engine'][0]['speed']) {
57 57
         continue;
58 58
       }
59 59
       $shipCostInMetalPerPiece[$unit_id] = get_unit_cost_in($unit_info[P_COST], RES_METAL);
@@ -73,8 +73,8 @@  discard block
 block discarded – undo
73 73
   $outcome_list[FLT_EXPEDITION_OUTCOME_NONE]['chance'] = ceil(200 / pow($flt_stay_hours, 1 / 1.7));
74 74
 
75 75
   $chance_max = 0;
76
-  foreach($outcome_list as $key => &$value) {
77
-    if(!$value['chance']) {
76
+  foreach ($outcome_list as $key => &$value) {
77
+    if (!$value['chance']) {
78 78
       unset($outcome_list[$key]);
79 79
       continue;
80 80
     }
@@ -82,13 +82,13 @@  discard block
 block discarded – undo
82 82
   }
83 83
   $outcome_value = mt_rand(0, $chance_max);
84 84
   $outcome_description = &$outcome_list[$mission_outcome = FLT_EXPEDITION_OUTCOME_NONE];
85
-  foreach($outcome_list as $key => &$value) {
86
-    if(!$value['chance']) {
85
+  foreach ($outcome_list as $key => &$value) {
86
+    if (!$value['chance']) {
87 87
       continue;
88 88
     }
89 89
     $mission_outcome = $key;
90 90
     $outcome_description = $value;
91
-    if($outcome_value <= $outcome_description['value']) {
91
+    if ($outcome_value <= $outcome_description['value']) {
92 92
       break;
93 93
     }
94 94
   }
@@ -105,7 +105,7 @@  discard block
 block discarded – undo
105 105
 //  $outcome_mission_sub = -1;
106 106
 
107 107
   $fleet_found = array();
108
-  switch($mission_outcome) {
108
+  switch ($mission_outcome) {
109 109
     case FLT_EXPEDITION_OUTCOME_LOST_FLEET:
110 110
       $objFleet->shipsCountApplyLossMultiplier(mt_rand(1, 3) * mt_rand(200000, 300000) / 1000000);
111 111
     break;
@@ -126,8 +126,8 @@  discard block
 block discarded – undo
126 126
 
127 127
       // Ограничиваем корабли только теми, чья стоимость в металле меньше или равно стоимости самого дорогого корабля
128 128
       $can_be_found = array();
129
-      foreach($shipCostInMetalPerPiece as $ship_id => $shipMetalCost) {
130
-        if($shipMetalCost < $max_metal_cost) {
129
+      foreach ($shipCostInMetalPerPiece as $ship_id => $shipMetalCost) {
130
+        if ($shipMetalCost < $max_metal_cost) {
131 131
           $can_be_found[$ship_id] = $shipMetalCost;
132 132
         }
133 133
       }
@@ -135,13 +135,13 @@  discard block
 block discarded – undo
135 135
       unset($can_be_found[SHIP_COLONIZER]);
136 136
       unset($can_be_found[SHIP_SPY]);
137 137
 
138
-      while(count($can_be_found) && $found_in_metal >= max($can_be_found)) {
138
+      while (count($can_be_found) && $found_in_metal >= max($can_be_found)) {
139 139
         $found_index = mt_rand(1, count($can_be_found)) - 1;
140 140
         $found_ship = array_slice($can_be_found, $found_index, 1, true);
141 141
         $found_ship_cost = reset($found_ship);
142 142
         $found_ship_id = key($found_ship);
143 143
 
144
-        if($found_ship_cost > $found_in_metal) {
144
+        if ($found_ship_cost > $found_in_metal) {
145 145
           unset($can_be_found[$found_ship_id]);
146 146
         } else {
147 147
           $found_ship_count = mt_rand(1, floor($found_in_metal / $found_ship_cost));
@@ -150,10 +150,10 @@  discard block
 block discarded – undo
150 150
         }
151 151
       }
152 152
 
153
-      if(empty($fleet_found)) {
153
+      if (empty($fleet_found)) {
154 154
         $msg_text_addon = classLocale::$lang['flt_mission_expedition']['outcomes'][$mission_outcome]['no_result'];
155 155
       } else {
156
-        foreach($fleet_found as $unit_id => $unit_amount) {
156
+        foreach ($fleet_found as $unit_id => $unit_amount) {
157 157
           $objFleet->shipAdjustCount($unit_id, $unit_amount);
158 158
         }
159 159
       }
@@ -177,7 +177,7 @@  discard block
 block discarded – undo
177 177
 
178 178
       $objFleet->resourcesAdjust($resources_found);
179 179
 
180
-      if(array_sum($resources_found) == 0) {
180
+      if (array_sum($resources_found) == 0) {
181 181
         $msg_text_addon = classLocale::$lang['flt_mission_expedition']['outcomes'][$mission_outcome]['no_result'];
182 182
       }
183 183
     break;
@@ -188,7 +188,7 @@  discard block
 block discarded – undo
188 188
       // Рассчитываем количество найденной ТМ
189 189
       $found_dark_matter = floor(min($outcome_percent * $result['$fleet_metal_points'] / $rates[RES_DARK_MATTER], 10000) * mt_rand(750000, 1000000) / 1000000);
190 190
 
191
-      if(!$found_dark_matter) {
191
+      if (!$found_dark_matter) {
192 192
         $msg_text_addon = classLocale::$lang['flt_mission_expedition']['outcomes'][$mission_outcome]['no_result'];
193 193
       }
194 194
     break;
@@ -202,40 +202,39 @@  discard block
 block discarded – undo
202 202
 
203 203
   mission_expedition_result_adjust($result);
204 204
 
205
-  if($found_dark_matter) {
205
+  if ($found_dark_matter) {
206 206
     rpg_points_change($objFleet->playerOwnerId, RPG_EXPEDITION, $found_dark_matter, 'Expedition Bonus');
207 207
     $msg_text_addon = sprintf(classLocale::$lang['flt_mission_expedition']['found_dark_matter'], $found_dark_matter);
208 208
   }
209 209
 
210
-  if(!empty($fleet_lost)) {
210
+  if (!empty($fleet_lost)) {
211 211
     $msg_text_addon = classLocale::$lang['flt_mission_expedition']['lost_fleet'];
212
-    foreach($fleet_lost as $ship_id => $ship_amount) {
212
+    foreach ($fleet_lost as $ship_id => $ship_amount) {
213 213
       $msg_text_addon .= classLocale::$lang['tech'][$ship_id] . ' - ' . $ship_amount . "\r\n";
214 214
     }
215 215
   }
216 216
 
217
-  if(!empty($fleet_found)) {
217
+  if (!empty($fleet_found)) {
218 218
     $msg_text_addon = classLocale::$lang['flt_mission_expedition']['found_fleet'];
219
-    foreach($fleet_found as $ship_id => $ship_amount) {
219
+    foreach ($fleet_found as $ship_id => $ship_amount) {
220 220
       $msg_text_addon .= classLocale::$lang['tech'][$ship_id] . ' - ' . $ship_amount . "\r\n";
221 221
     }
222 222
   }
223 223
 
224
-  if(!empty($resources_found) && array_sum($resources_found) > 0) {
224
+  if (!empty($resources_found) && array_sum($resources_found) > 0) {
225 225
     $msg_text_addon = classLocale::$lang['flt_mission_expedition']['found_resources'];
226
-    foreach($resources_found as $resource_id => $resource_amount) {
226
+    foreach ($resources_found as $resource_id => $resource_amount) {
227 227
       $msg_text_addon .= classLocale::$lang['tech'][$resource_id] . ' - ' . $resource_amount . "\r\n";
228 228
     }
229 229
   }
230 230
 
231
-  if(!$msg_text) {
231
+  if (!$msg_text) {
232 232
     $messages = &classLocale::$lang['flt_mission_expedition']['outcomes'][$mission_outcome]['messages'];
233
-    if($outcome_mission_sub >= 0 && is_array($messages)) {
233
+    if ($outcome_mission_sub >= 0 && is_array($messages)) {
234 234
       $messages = &$messages[$outcome_mission_sub];
235 235
     }
236 236
 
237
-    $msg_text = is_string($messages) ? $messages :
238
-      (is_array($messages) ? $messages[mt_rand(0, count($messages) - 1)] : '');
237
+    $msg_text = is_string($messages) ? $messages : (is_array($messages) ? $messages[mt_rand(0, count($messages) - 1)] : '');
239 238
   }
240 239
 
241 240
   $fleet_row_end_coordinates_without_type = $objFleet->target_coordinates_without_type();
Please login to merge, or discard this patch.
includes/template.php 2 patches
Doc Comments   +5 added lines, -6 removed lines patch added patch discarded remove patch
@@ -34,7 +34,7 @@  discard block
 block discarded – undo
34 34
  * @param string    $title
35 35
  * @param string    $dest
36 36
  * @param int       $time
37
- * @param bool|true $show_header
37
+ * @param boolean $show_header
38 38
  */
39 39
 function message($mes, $title = 'Error', $dest = '', $time = 5, $show_header = true) {
40 40
   $template = gettemplate('message_body', true);
@@ -195,7 +195,7 @@  discard block
 block discarded – undo
195 195
  * @param bool|true       $isDisplayTopNav
196 196
  * @param string          $metatags
197 197
  * @param bool|false      $AdminPage
198
- * @param bool|true       $isDisplayMenu
198
+ * @param boolean       $isDisplayMenu
199 199
  *
200 200
  * @return mixed
201 201
  */
@@ -208,7 +208,6 @@  discard block
 block discarded – undo
208 208
  * @param string          $title
209 209
  * @param bool|true       $isDisplayTopNav
210 210
  * @param string          $metatags
211
- * @param bool|false      $AdminPage
212 211
  * @param bool|true       $isDisplayMenu
213 212
  * @param bool|int|string $exitStatus - Код или сообщение выхода
214 213
  */
@@ -385,10 +384,10 @@  discard block
 block discarded – undo
385 384
 
386 385
 /**
387 386
  * @param       $time
388
- * @param       $event
387
+ * @param       integer $event
389 388
  * @param       $msg
390 389
  * @param       $coordinates
391
- * @param       $is_decrease
390
+ * @param       boolean $is_decrease
392 391
  * @param Fleet $objFleet
393 392
  * @param       $fleet_flying_sorter
394 393
  * @param       $fleet_flying_events
@@ -708,7 +707,7 @@  discard block
 block discarded – undo
708 707
 }
709 708
 
710 709
 /**
711
- * @param array|string  $files
710
+ * @param string  $files
712 711
  * @param template|bool $template
713 712
  * @param string|bool   $template_path
714 713
  *
Please login to merge, or discard this patch.
Spacing   +70 added lines, -70 removed lines patch added patch discarded remove patch
@@ -12,7 +12,7 @@  discard block
 block discarded – undo
12 12
 function gettemplatename($u_dpath) {
13 13
   static $template_names = array();
14 14
 
15
-  if(!isset($template_names[$u_dpath])) {
15
+  if (!isset($template_names[$u_dpath])) {
16 16
     $template_names[$u_dpath] = file_exists(SN_ROOT_PHYSICAL . $u_dpath . 'tmpl.ini') ? sys_file_read(SN_ROOT_PHYSICAL . $u_dpath . 'tmpl.ini') : TEMPLATE_NAME;
17 17
   }
18 18
 
@@ -54,12 +54,12 @@  discard block
 block discarded – undo
54 54
  * @param $sn_menu_extra
55 55
  */
56 56
 function tpl_menu_merge_extra(&$sn_menu, &$sn_menu_extra) {
57
-  if(empty($sn_menu) || empty($sn_menu_extra)) {
57
+  if (empty($sn_menu) || empty($sn_menu_extra)) {
58 58
     return;
59 59
   }
60 60
 
61
-  foreach($sn_menu_extra as $menu_item_id => $menu_item) {
62
-    if(empty($menu_item['LOCATION'])) {
61
+  foreach ($sn_menu_extra as $menu_item_id => $menu_item) {
62
+    if (empty($menu_item['LOCATION'])) {
63 63
       $sn_menu[$menu_item_id] = $menu_item;
64 64
       continue;
65 65
     }
@@ -68,16 +68,16 @@  discard block
 block discarded – undo
68 68
     unset($menu_item['LOCATION']);
69 69
 
70 70
     $is_positioned = $item_location[0];
71
-    if($is_positioned == '+' || $is_positioned == '-') {
71
+    if ($is_positioned == '+' || $is_positioned == '-') {
72 72
       $item_location = substr($item_location, 1);
73 73
     } else {
74 74
       $is_positioned = '';
75 75
     }
76 76
 
77
-    if($item_location) {
77
+    if ($item_location) {
78 78
       $menu_keys = array_keys($sn_menu);
79 79
       $insert_position = array_search($item_location, $menu_keys);
80
-      if($insert_position === false) {
80
+      if ($insert_position === false) {
81 81
         $insert_position = count($sn_menu) - 1;
82 82
         $is_positioned = '+';
83 83
         $item_location = '';
@@ -90,7 +90,7 @@  discard block
 block discarded – undo
90 90
     $spliced = array_splice($sn_menu, $insert_position, count($sn_menu) - $insert_position);
91 91
     $sn_menu[$menu_item_id] = $menu_item;
92 92
 
93
-    if(!$is_positioned && $item_location) {
93
+    if (!$is_positioned && $item_location) {
94 94
       unset($spliced[$item_location]);
95 95
     }
96 96
     $sn_menu = array_merge($sn_menu, $spliced);
@@ -104,24 +104,24 @@  discard block
 block discarded – undo
104 104
  * @param template $template
105 105
  */
106 106
 function tpl_menu_assign_to_template(&$sn_menu, &$template) {
107
-  if(empty($sn_menu) || !is_array($sn_menu)) {
107
+  if (empty($sn_menu) || !is_array($sn_menu)) {
108 108
     return;
109 109
   }
110 110
 
111
-  foreach($sn_menu as $menu_item_id => $menu_item) {
112
-    if(!$menu_item) {
111
+  foreach ($sn_menu as $menu_item_id => $menu_item) {
112
+    if (!$menu_item) {
113 113
       continue;
114 114
     }
115 115
 
116
-    if(is_string($menu_item_id)) {
116
+    if (is_string($menu_item_id)) {
117 117
       $menu_item['ID'] = $menu_item_id;
118 118
     }
119 119
 
120
-    if($menu_item['TYPE'] == 'lang') {
120
+    if ($menu_item['TYPE'] == 'lang') {
121 121
       $lang_string = &classLocale::$lang;
122
-      if(preg_match('#(\w+)(?:\[(\w+)\])?(?:\[(\w+)\])?(?:\[(\w+)\])?(?:\[(\w+)\])?#', $menu_item['ITEM'], $matches) && count($matches) > 1) {
123
-        for($i = 1; $i < count($matches); $i++) {
124
-          if(defined($matches[$i])) {
122
+      if (preg_match('#(\w+)(?:\[(\w+)\])?(?:\[(\w+)\])?(?:\[(\w+)\])?(?:\[(\w+)\])?#', $menu_item['ITEM'], $matches) && count($matches) > 1) {
123
+        for ($i = 1; $i < count($matches); $i++) {
124
+          if (defined($matches[$i])) {
125 125
             $matches[$i] = constant($matches[$i]);
126 126
           }
127 127
           $lang_string = &$lang_string[$matches[$i]];
@@ -133,8 +133,8 @@  discard block
 block discarded – undo
133 133
     $menu_item['ALT'] = htmlentities($menu_item['ALT']);
134 134
     $menu_item['TITLE'] = htmlentities($menu_item['TITLE']);
135 135
 
136
-    if(!empty($menu_item['ICON'])) {
137
-      if(is_string($menu_item['ICON'])) {
136
+    if (!empty($menu_item['ICON'])) {
137
+      if (is_string($menu_item['ICON'])) {
138 138
         $menu_item['ICON_PATH'] = $menu_item['ICON'];
139 139
       } else {
140 140
         $menu_item['ICON'] = $menu_item_id;
@@ -164,7 +164,7 @@  discard block
 block discarded – undo
164 164
     'MENU_START_HIDE'     => !empty($_COOKIE[SN_COOKIE . '_menu_hidden']) || defined('SN_GOOGLE'),
165 165
   ));
166 166
 
167
-  if(isset($template_result['MENU_CUSTOMIZE'])) {
167
+  if (isset($template_result['MENU_CUSTOMIZE'])) {
168 168
     $template->assign_vars(array(
169 169
       'PLAYER_OPTION_MENU_SHOW_ON_BUTTON'   => classSupernova::$user_options[PLAYER_OPTION_MENU_SHOW_ON_BUTTON],
170 170
       'PLAYER_OPTION_MENU_HIDE_ON_BUTTON'   => classSupernova::$user_options[PLAYER_OPTION_MENU_HIDE_ON_BUTTON],
@@ -178,7 +178,7 @@  discard block
 block discarded – undo
178 178
     ));
179 179
   }
180 180
 
181
-  if(defined('IN_ADMIN') && IN_ADMIN === true && !empty($user['authlevel']) && $user['authlevel'] > 0) {
181
+  if (defined('IN_ADMIN') && IN_ADMIN === true && !empty($user['authlevel']) && $user['authlevel'] > 0) {
182 182
     tpl_menu_merge_extra($sn_menu_admin, $sn_menu_admin_extra);
183 183
     tpl_menu_assign_to_template($sn_menu_admin, $template);
184 184
   } else {
@@ -218,7 +218,7 @@  discard block
 block discarded – undo
218 218
   $in_admin = defined('IN_ADMIN') && IN_ADMIN === true;
219 219
   $is_login = defined('LOGIN_LOGOUT') && LOGIN_LOGOUT === true;
220 220
 
221
-  if(is_object($page)) {
221
+  if (is_object($page)) {
222 222
     isset($page->_rootref['MENU']) ? $isDisplayMenu = $page->_rootref['MENU'] : false;
223 223
     isset($page->_rootref['NAVBAR']) ? $isDisplayTopNav = $page->_rootref['NAVBAR'] : false;
224 224
 
@@ -226,7 +226,7 @@  discard block
 block discarded – undo
226 226
     !isset($page->_rootref['PAGE_HEADER']) && $title ? $page->assign_var('PAGE_HEADER', $title) : false;
227 227
   }
228 228
 
229
-  if(empty($user['id']) || !is_numeric($user['id'])) {
229
+  if (empty($user['id']) || !is_numeric($user['id'])) {
230 230
     $isDisplayMenu = false;
231 231
     $isDisplayTopNav = false;
232 232
   }
@@ -238,10 +238,10 @@  discard block
 block discarded – undo
238 238
   $user_time_measured_unix = intval(isset($user_time_diff[PLAYER_OPTION_TIME_DIFF_MEASURE_TIME]) ? strtotime($user_time_diff[PLAYER_OPTION_TIME_DIFF_MEASURE_TIME]) : 0);
239 239
 
240 240
   $font_size = !empty($_COOKIE[SN_COOKIE_F]) ? $_COOKIE[SN_COOKIE_F] : classSupernova::$user_options[PLAYER_OPTION_BASE_FONT_SIZE];
241
-  if(strpos($font_size, '%') !== false) {
241
+  if (strpos($font_size, '%') !== false) {
242 242
     // Размер шрифта в процентах
243 243
     $font_size = min(max(floatval($font_size), FONT_SIZE_PERCENT_MIN), FONT_SIZE_PERCENT_MAX) . '%';
244
-  } elseif(strpos($font_size, 'px') !== false) {
244
+  } elseif (strpos($font_size, 'px') !== false) {
245 245
     // Размер шрифта в пикселях
246 246
     $font_size = min(max(floatval($font_size), FONT_SIZE_PIXELS_MIN), FONT_SIZE_PIXELS_MAX) . 'px';
247 247
   } else {
@@ -253,10 +253,10 @@  discard block
 block discarded – undo
253 253
 
254 254
   $template = gettemplate('_global_header', true);
255 255
 
256
-  if(!empty(classSupernova::$sn_mvc['javascript'])) {
257
-    foreach(classSupernova::$sn_mvc['javascript'] as $page_name => $script_list) {
258
-      if(empty($page_name) || $page_name == $sn_page_name) {
259
-        foreach($script_list as $filename => $content) {
256
+  if (!empty(classSupernova::$sn_mvc['javascript'])) {
257
+    foreach (classSupernova::$sn_mvc['javascript'] as $page_name => $script_list) {
258
+      if (empty($page_name) || $page_name == $sn_page_name) {
259
+        foreach ($script_list as $filename => $content) {
260 260
           $template_result['.']['javascript'][] = array(
261 261
             'FILE'    => $filename,
262 262
             'CONTENT' => $content,
@@ -282,9 +282,9 @@  discard block
 block discarded – undo
282 282
   classSupernova::$sn_mvc['css'][''] = array_merge($standard_css, classSupernova::$sn_mvc['css']['']);
283 283
 
284 284
 
285
-  foreach(classSupernova::$sn_mvc['css'] as $page_name => $script_list) {
286
-    if(empty($page_name) || $page_name == $sn_page_name) {
287
-      foreach($script_list as $filename => $content) {
285
+  foreach (classSupernova::$sn_mvc['css'] as $page_name => $script_list) {
286
+    if (empty($page_name) || $page_name == $sn_page_name) {
287
+      foreach ($script_list as $filename => $content) {
288 288
         $template_result['.']['css'][] = array(
289 289
           'FILE'    => $filename,
290 290
           'CONTENT' => $content,
@@ -331,12 +331,12 @@  discard block
 block discarded – undo
331 331
   $template->assign_recursive($template_result);
332 332
   displayP(parsetemplate($template));
333 333
 
334
-  if(($isDisplayMenu || $in_admin) && !isset($_COOKIE['menu_disable'])) {
334
+  if (($isDisplayMenu || $in_admin) && !isset($_COOKIE['menu_disable'])) {
335 335
     // $AdminPage = $AdminPage ? $user['authlevel'] : 0;
336 336
     displayP(parsetemplate(tpl_render_menu()));
337 337
   }
338 338
 
339
-  if($isDisplayTopNav && !$in_admin) {
339
+  if ($isDisplayTopNav && !$in_admin) {
340 340
     displayP(parsetemplate(tpl_render_topnav($user, $planetrow)));
341 341
   }
342 342
 
@@ -344,8 +344,8 @@  discard block
 block discarded – undo
344 344
 
345 345
   !is_array($page) ? $page = array($page) : false;
346 346
   $result_added = false;
347
-  foreach($page as $page_item) {
348
-    if(!$result_added && is_object($page_item) && isset($page_item->_tpldata['result'])) {
347
+  foreach ($page as $page_item) {
348
+    if (!$result_added && is_object($page_item) && isset($page_item->_tpldata['result'])) {
349 349
       $page_item = gettemplate('_result_message', $page_item);
350 350
       $temp = $page_item->files['_result_message'];
351 351
       unset($page_item->files['_result_message']);
@@ -368,7 +368,7 @@  discard block
 block discarded – undo
368 368
   ));
369 369
   displayP(parsetemplate($template));
370 370
 
371
-  $user['authlevel'] >= 3 && classSupernova::$config->debug ? classSupernova::$debug->echo_log() : false;;
371
+  $user['authlevel'] >= 3 && classSupernova::$config->debug ? classSupernova::$debug->echo_log() : false; ;
372 372
 
373 373
   classSupernova::$db->db_disconnect();
374 374
 
@@ -406,7 +406,7 @@  discard block
 block discarded – undo
406 406
  * @param string         $type
407 407
  */
408 408
 function tpl_topnav_event_build(&$template, $FleetList, $type = 'fleet') {
409
-  if(empty($FleetList)) {
409
+  if (empty($FleetList)) {
410 410
     return;
411 411
   }
412 412
 
@@ -415,19 +415,19 @@  discard block
 block discarded – undo
415 415
   $fleet_event_count = 0;
416 416
   $fleet_flying_sorter = array();
417 417
   $fleet_flying_events = array();
418
-  foreach($FleetList->_container as $objFleet) {
418
+  foreach ($FleetList->_container as $objFleet) {
419 419
     $will_return = true;
420
-    if(!$objFleet->isReturning()) {
420
+    if (!$objFleet->isReturning()) {
421 421
       // cut fleets on Hold and Expedition
422
-      if($objFleet->time_arrive_to_target >= SN_TIME_NOW) {
422
+      if ($objFleet->time_arrive_to_target >= SN_TIME_NOW) {
423 423
         $objFleet->mission_type == MT_RELOCATE ? $will_return = false : false;
424 424
         tpl_topnav_event_build_helper($objFleet->time_arrive_to_target, EVENT_FLEET_ARRIVE, classLocale::$lang['sys_event_arrive'], $objFleet->target_coordinates_typed(), !$will_return, $objFleet, $fleet_flying_sorter, $fleet_flying_events, $fleet_event_count);
425 425
       }
426
-      if($objFleet->time_mission_job_complete) {
426
+      if ($objFleet->time_mission_job_complete) {
427 427
         tpl_topnav_event_build_helper($objFleet->time_mission_job_complete, EVENT_FLEET_STAY, classLocale::$lang['sys_event_stay'], $objFleet->target_coordinates_typed(), false, $objFleet, $fleet_flying_sorter, $fleet_flying_events, $fleet_event_count);
428 428
       }
429 429
     }
430
-    if($will_return) {
430
+    if ($will_return) {
431 431
       tpl_topnav_event_build_helper($objFleet->time_return_to_source, EVENT_FLEET_RETURN, classLocale::$lang['sys_event_return'], $objFleet->launch_coordinates_typed(), true, $objFleet, $fleet_flying_sorter, $fleet_flying_events, $fleet_event_count);
432 432
     }
433 433
   }
@@ -435,7 +435,7 @@  discard block
 block discarded – undo
435 435
   asort($fleet_flying_sorter);
436 436
 
437 437
   $fleet_flying_count = $FleetList->count();
438
-  foreach($fleet_flying_sorter as $fleet_event_id => $fleet_time) {
438
+  foreach ($fleet_flying_sorter as $fleet_event_id => $fleet_time) {
439 439
     $fleet_event = &$fleet_flying_events[$fleet_event_id];
440 440
     $template->assign_block_vars("flying_{$type}s", array(
441 441
       'TIME' => max(0, $fleet_time - SN_TIME_NOW),
@@ -464,7 +464,7 @@  discard block
 block discarded – undo
464 464
   global $template_result;
465 465
   $classLocale = classLocale::$lang;
466 466
 
467
-  if(!is_array($user)) {
467
+  if (!is_array($user)) {
468 468
     return '';
469 469
   }
470 470
 
@@ -485,8 +485,8 @@  discard block
 block discarded – undo
485 485
 
486 486
   $ThisUsersPlanets = DBStaticPlanet::db_planet_list_sorted($user);
487 487
   // while ($CurPlanet = db_fetch($ThisUsersPlanets))
488
-  foreach($ThisUsersPlanets as $CurPlanet) {
489
-    if($CurPlanet['destruyed']) {
488
+  foreach ($ThisUsersPlanets as $CurPlanet) {
489
+    if ($CurPlanet['destruyed']) {
490 490
       continue;
491 491
     }
492 492
 
@@ -510,8 +510,8 @@  discard block
 block discarded – undo
510 510
    */
511 511
   $fleet_flying_list = array();
512 512
   $fleet_flying_list[0] = FleetList::dbGetFleetListByOwnerId($user['id']);
513
-  foreach($fleet_flying_list[0]->_container as $fleet_id => $objFleet) {
514
-    if(empty($fleet_flying_list[$objFleet->mission_type])) {
513
+  foreach ($fleet_flying_list[0]->_container as $fleet_id => $objFleet) {
514
+    if (empty($fleet_flying_list[$objFleet->mission_type])) {
515 515
       $fleet_flying_list[$objFleet->mission_type] = new FleetList();
516 516
     }
517 517
     $fleet_flying_list[$objFleet->mission_type][$fleet_id] = $objFleet;
@@ -523,8 +523,8 @@  discard block
 block discarded – undo
523 523
   que_tpl_parse($template, QUE_RESEARCH, $user, array(), null, !classSupernova::$user_options[PLAYER_OPTION_NAVBAR_RESEARCH_WIDE]);
524 524
   que_tpl_parse($template, SUBQUE_FLEET, $user, $planetrow, null, true);
525 525
 
526
-  if(!empty(classSupernova::$sn_mvc['navbar_prefix_button']) && is_array(classSupernova::$sn_mvc['navbar_prefix_button'])) {
527
-    foreach(classSupernova::$sn_mvc['navbar_prefix_button'] as $navbar_button_image => $navbar_button_url) {
526
+  if (!empty(classSupernova::$sn_mvc['navbar_prefix_button']) && is_array(classSupernova::$sn_mvc['navbar_prefix_button'])) {
527
+    foreach (classSupernova::$sn_mvc['navbar_prefix_button'] as $navbar_button_image => $navbar_button_url) {
528 528
       $template->assign_block_vars('navbar_prefix_button', array(
529 529
         'IMAGE'        => $navbar_button_image,
530 530
         'URL_RELATIVE' => $navbar_button_url,
@@ -538,13 +538,13 @@  discard block
 block discarded – undo
538 538
   $time_now_parsed = getdate(SN_TIME_NOW);
539 539
   $time_local_parsed = getdate(defined('SN_CLIENT_TIME_LOCAL') ? SN_CLIENT_TIME_LOCAL : SN_TIME_NOW);
540 540
 
541
-  if(classSupernova::$config->game_news_overview) {
541
+  if (classSupernova::$config->game_news_overview) {
542 542
     $user_last_read_safe = intval($user['news_lastread']);
543 543
     nws_render($template, "WHERE UNIX_TIMESTAMP(`tsTimeStamp`) >= {$user_last_read_safe}", classSupernova::$config->game_news_overview);
544 544
   }
545 545
 
546 546
   $notes_query = DBStaticNote::db_note_list_by_owner($user['id'], true);
547
-  while($note_row = db_fetch($notes_query)) {
547
+  while ($note_row = db_fetch($notes_query)) {
548 548
     note_assign($template, $note_row);
549 549
   }
550 550
 
@@ -558,7 +558,7 @@  discard block
 block discarded – undo
558 558
     'QUE_ID'   => QUE_RESEARCH,
559 559
     'QUE_HTML' => 'topnav',
560 560
 
561
-    'RESEARCH_ONGOING' => (boolean)$user['que'],
561
+    'RESEARCH_ONGOING' => (boolean) $user['que'],
562 562
 
563 563
     'TIME_TEXT'       => sprintf($str_date_format, $time_now_parsed['year'], classLocale::$lang['months'][$time_now_parsed['mon']], $time_now_parsed['mday'],
564 564
       $time_now_parsed['hours'], $time_now_parsed['minutes'], $time_now_parsed['seconds']
@@ -635,7 +635,7 @@  discard block
 block discarded – undo
635 635
     'QUE_STRUCTURES' => QUE_STRUCTURES,
636 636
   ));
637 637
 
638
-  if((defined('SN_RENDER_NAVBAR_PLANET') && SN_RENDER_NAVBAR_PLANET === true) || ($user['option_list'][OPT_INTERFACE]['opt_int_navbar_resource_force'] && SN_RENDER_NAVBAR_PLANET !== false)) {
638
+  if ((defined('SN_RENDER_NAVBAR_PLANET') && SN_RENDER_NAVBAR_PLANET === true) || ($user['option_list'][OPT_INTERFACE]['opt_int_navbar_resource_force'] && SN_RENDER_NAVBAR_PLANET !== false)) {
639 639
     tpl_set_resource_info($template, $planetrow);
640 640
     $template->assign_vars(array(
641 641
       'SN_RENDER_NAVBAR_PLANET' => true,
@@ -650,12 +650,12 @@  discard block
 block discarded – undo
650 650
  * @param template|string $template
651 651
  */
652 652
 function displayP($template) {
653
-  if(is_object($template)) {
654
-    if(empty($template->parsed)) {
653
+  if (is_object($template)) {
654
+    if (empty($template->parsed)) {
655 655
       parsetemplate($template);
656 656
     }
657 657
 
658
-    foreach($template->files as $section => $filename) {
658
+    foreach ($template->files as $section => $filename) {
659 659
       $template->display($section);
660 660
     }
661 661
   } else {
@@ -670,11 +670,11 @@  discard block
 block discarded – undo
670 670
  * @return mixed
671 671
  */
672 672
 function parsetemplate($template, $array = false) {
673
-  if(is_object($template)) {
673
+  if (is_object($template)) {
674 674
     global $user;
675 675
 
676
-    if(!empty($array) && is_array($array)) {
677
-      foreach($array as $key => $data) {
676
+    if (!empty($array) && is_array($array)) {
677
+      foreach ($array as $key => $data) {
678 678
         $template->assign_var($key, $data);
679 679
       }
680 680
     }
@@ -715,7 +715,7 @@  discard block
 block discarded – undo
715 715
 
716 716
   $template_ex = '.tpl.html';
717 717
 
718
-  if($template === false) {
718
+  if ($template === false) {
719 719
     return sys_file_read(TEMPLATE_DIR . '/' . $files . $template_ex);
720 720
   }
721 721
 
@@ -735,7 +735,7 @@  discard block
 block discarded – undo
735 735
   !empty(classSupernova::$sn_mvc['i18n']['']) ? lng_load_i18n(classSupernova::$sn_mvc['i18n']['']) : false;
736 736
   $sn_page_name ? lng_load_i18n(classSupernova::$sn_mvc['i18n'][$sn_page_name]) : false;
737 737
 
738
-  foreach($files as &$filename) {
738
+  foreach ($files as &$filename) {
739 739
     $filename = $filename . $template_ex;
740 740
   }
741 741
 
@@ -760,13 +760,13 @@  discard block
 block discarded – undo
760 760
     'LANG'     => $language ? $language : '',
761 761
     'referral' => $id_ref ? '&id_ref=' . $id_ref : '',
762 762
 
763
-    'REQUEST_PARAMS' => !empty($url_params) ? '?' . implode('&', $url_params) : '',// "?lang={$language}" . ($id_ref ? "&id_ref={$id_ref}" : ''),
763
+    'REQUEST_PARAMS' => !empty($url_params) ? '?' . implode('&', $url_params) : '', // "?lang={$language}" . ($id_ref ? "&id_ref={$id_ref}" : ''),
764 764
     'FILENAME'       => basename($_SERVER['PHP_SELF']),
765 765
   ));
766 766
 
767
-  foreach(lng_get_list() as $lng_id => $lng_data) {
768
-    if(isset($lng_data['LANG_VARIANTS']) && is_array($lng_data['LANG_VARIANTS'])) {
769
-      foreach($lng_data['LANG_VARIANTS'] as $lang_variant) {
767
+  foreach (lng_get_list() as $lng_id => $lng_data) {
768
+    if (isset($lng_data['LANG_VARIANTS']) && is_array($lng_data['LANG_VARIANTS'])) {
769
+      foreach ($lng_data['LANG_VARIANTS'] as $lang_variant) {
770 770
         $lng_data1 = $lng_data;
771 771
         $lng_data1 = array_merge($lng_data1, $lang_variant);
772 772
         $template->assign_block_vars('language', $lng_data1);
@@ -789,8 +789,8 @@  discard block
 block discarded – undo
789 789
   $que = $que['ques'][$que_type][$planet['id_owner']][$planet['id']];
790 790
 
791 791
   $que_length = 0;
792
-  if(!empty($que)) {
793
-    foreach($que as $que_item) {
792
+  if (!empty($que)) {
793
+    foreach ($que as $que_item) {
794 794
       $template->assign_block_vars('que', que_tpl_parse_element($que_item));
795 795
     }
796 796
     $que_length = count($que);
@@ -805,7 +805,7 @@  discard block
 block discarded – undo
805 805
  * @param int      $user_dark_matter
806 806
  */
807 807
 function tpl_planet_density_info(&$template, &$density_price_chart, $user_dark_matter) {
808
-  foreach($density_price_chart as $density_price_index => &$density_price_data) {
808
+  foreach ($density_price_chart as $density_price_index => &$density_price_data) {
809 809
     $density_cost = $density_price_data;
810 810
     $density_number_style = pretty_number($density_cost, true, $user_dark_matter, false, false);
811 811
 
@@ -829,7 +829,7 @@  discard block
 block discarded – undo
829 829
 function tpl_assign_select(&$template, $name, $values) {
830 830
   !is_array($values) ? $values = array($values => $values) : false;
831 831
 
832
-  foreach($values as $key => $value) {
832
+  foreach ($values as $key => $value) {
833 833
     $template->assign_block_vars($name, array(
834 834
       'KEY'   => htmlentities($key, ENT_COMPAT, 'UTF-8'),
835 835
       'VALUE' => htmlentities($value, ENT_COMPAT, 'UTF-8'),
Please login to merge, or discard this patch.
common.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -12,25 +12,25 @@  discard block
 block discarded – undo
12 12
 global $debug, $sn_mvc, $template_result, $user;
13 13
 
14 14
 // Напоминание для Администрации, что игра отключена
15
-if($template_result[F_GAME_DISABLE]) {
15
+if ($template_result[F_GAME_DISABLE]) {
16 16
   // $disable_reason = sys_bbcodeParse($config->game_disable_reason); // Должна быть инициализирована выше по коду - в init.php
17 17
   echo '<div class="global_admin_warning">', $template_result[F_GAME_DISABLE_REASON], '</div>';
18 18
 }
19 19
 unset($disable_reason);
20 20
 
21 21
 
22
-if(defined('IN_ADMIN') && IN_ADMIN === true) {
22
+if (defined('IN_ADMIN') && IN_ADMIN === true) {
23 23
   lng_include('admin');
24
-} elseif($sys_user_logged_in) {
24
+} elseif ($sys_user_logged_in) {
25 25
   sys_user_vacation($user);
26 26
 
27 27
   $planet_id = SetSelectedPlanet($user);
28 28
 
29 29
   // TODO НЕ НУЖНО АЛЬЯНС КАЖДЫЙ РАЗ ОБНОВЛЯТЬ!!!
30
-  if($user['ally_id']) {
30
+  if ($user['ally_id']) {
31 31
     sn_db_transaction_start();
32 32
     sn_ali_fill_user_ally($user);
33
-    if(!$user['ally']['player']['id']) {
33
+    if (!$user['ally']['player']['id']) {
34 34
       // sn_sys_logout(false, true);
35 35
       // core_auth::logout(false);
36 36
       classSupernova::$auth->logout(false);
@@ -49,7 +49,7 @@  discard block
 block discarded – undo
49 49
   sn_db_transaction_commit();
50 50
 
51 51
   $planetrow = $global_data['planet'];
52
-  if(!($planetrow && isset($planetrow['id']) && $planetrow['id'])) {
52
+  if (!($planetrow && isset($planetrow['id']) && $planetrow['id'])) {
53 53
     // sn_sys_logout(false, true);
54 54
     // core_auth::logout(false);
55 55
     classSupernova::$auth->logout(false);
Please login to merge, or discard this patch.
banned.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -20,7 +20,7 @@
 block discarded – undo
20 20
 
21 21
 $query = db_banned_list_select();
22 22
 $i = 0;
23
-while($ban_row = db_fetch($query)) {
23
+while ($ban_row = db_fetch($query)) {
24 24
   $template->assign_block_vars('banlist', array(
25 25
     'USER_NAME'   => $ban_row['ban_user_name'],
26 26
     'REASON'      => $ban_row['ban_reason'],
Please login to merge, or discard this patch.
admin/adm_flying_fleets.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -12,7 +12,7 @@  discard block
 block discarded – undo
12 12
 require('../common.' . substr(strrchr(__FILE__, '.'), 1));
13 13
 
14 14
 // if ($user['authlevel'] < 2)
15
-if($user['authlevel'] < 3) {
15
+if ($user['authlevel'] < 3) {
16 16
   AdminMessage($lang['adm_err_denied']);
17 17
 }
18 18
 
@@ -22,7 +22,7 @@  discard block
 block discarded – undo
22 22
 //while($CurrentFleet = db_fetch($FlyingFleets))
23 23
 
24 24
 $all_flying_fleets = FleetList::dbGetFleetList();
25
-foreach($all_flying_fleets->_container as $fleet_id => $objFleet) {
25
+foreach ($all_flying_fleets->_container as $fleet_id => $objFleet) {
26 26
   $FleetOwner = db_user_by_id($objFleet->playerOwnerId);
27 27
   $TargetOwner = db_user_by_id($objFleet->target_owner_id);
28 28
 
@@ -33,7 +33,7 @@  discard block
 block discarded – undo
33 33
   $fleet_data['fleet']['STAY_TIME_INT'] = $objFleet->time_mission_job_complete;
34 34
 
35 35
   $template->assign_block_vars('fleets', $fleet_data['fleet']);
36
-  foreach($fleet_data['ships'] as $ship_data) {
36
+  foreach ($fleet_data['ships'] as $ship_data) {
37 37
     $template->assign_block_vars('fleets.ships', $ship_data);
38 38
   }
39 39
 }
Please login to merge, or discard this patch.