Completed
Push — work-fleets ( 9e987d...ec9dc8 )
by SuperNova.WS
06:04
created
includes/alliance/ali_internal_admin_mail.inc 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -1,23 +1,23 @@
 block discarded – undo
1 1
 <?php
2 2
 
3
-if(!defined('SN_IN_ALLY') || SN_IN_ALLY !== true) {
3
+if (!defined('SN_IN_ALLY') || SN_IN_ALLY !== true) {
4 4
   classSupernova::$debug->error("Attempt to call ALLIANCE page mode {$mode} directly - not from alliance.php", 'Forbidden', 403);
5 5
 }
6 6
 
7
-if(!$user_can_send_mails) {
7
+if (!$user_can_send_mails) {
8 8
   message(classLocale::$lang['Denied_access'], classLocale::$lang['Send_circular_mail']);
9 9
 }
10 10
 
11 11
 $POST_text = sys_get_param_str('text');
12 12
 $internalAliSendTextUnsafe = sys_get_param_str_unsafe('text');
13
-if($internalAliSendTextUnsafe) {
14
-  message(classLocale::$lang['members_who_recived_message'] . DBStaticMessages::msg_ali_send($internalAliSendTextUnsafe, classLocale::$lang['ali_adm_msg_subject'], sys_get_param_int('r')), classLocale::$lang['Circular_sended'], "alliance.php", '');
13
+if ($internalAliSendTextUnsafe) {
14
+  message(classLocale::$lang['members_who_recived_message'].DBStaticMessages::msg_ali_send($internalAliSendTextUnsafe, classLocale::$lang['ali_adm_msg_subject'], sys_get_param_int('r')), classLocale::$lang['Circular_sended'], "alliance.php", '');
15 15
 }
16 16
 
17
-$r_list = "<option value=\"-1\">" . classLocale::$lang['All_players'] . "</option>";
18
-if($ranks) {
19
-  foreach($ranks as $id => $array) {
20
-    $r_list .= "<option value=\"" . $id . "\">" . $array['name'] . "</option>";
17
+$r_list = "<option value=\"-1\">".classLocale::$lang['All_players']."</option>";
18
+if ($ranks) {
19
+  foreach ($ranks as $id => $array) {
20
+    $r_list .= "<option value=\"".$id."\">".$array['name']."</option>";
21 21
   }
22 22
 }
23 23
 
Please login to merge, or discard this patch.
includes/classes/DBRow.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -86,7 +86,7 @@  discard block
 block discarded – undo
86 86
    * @param db_mysql|null $db
87 87
    */
88 88
   public static function setDb($db = null) {
89
-    if(empty($db) || !($db instanceof db_mysql)) {
89
+    if (empty($db) || !($db instanceof db_mysql)) {
90 90
       $db = null;
91 91
     }
92 92
     static::$db = !empty($db) || !class_exists('classSupernova', false) ? $db : classSupernova::$db;
@@ -149,7 +149,7 @@  discard block
 block discarded – undo
149 149
   public function dbLoad($dbId, $lockSkip = false) {
150 150
     $dbId = idval($dbId);
151 151
     if ($dbId <= 0) {
152
-      classSupernova::$debug->error(get_called_class() . '::' . __METHOD__ . ' $dbId not positive = ' . $dbId);
152
+      classSupernova::$debug->error(get_called_class().'::'.__METHOD__.' $dbId not positive = '.$dbId);
153 153
 
154 154
       return;
155 155
     }
@@ -161,7 +161,7 @@  discard block
 block discarded – undo
161 161
       $this->dbGetLockById($this->_dbId);
162 162
     }
163 163
 
164
-    $db_row = classSupernova::$db->doSelectFetch("SELECT * FROM `{{" . static::$_table . "}}` WHERE `" . static::$_dbIdFieldName . "` = " . $this->_dbId . " LIMIT 1 FOR UPDATE;");
164
+    $db_row = classSupernova::$db->doSelectFetch("SELECT * FROM `{{".static::$_table."}}` WHERE `".static::$_dbIdFieldName."` = ".$this->_dbId." LIMIT 1 FOR UPDATE;");
165 165
     if (empty($db_row)) {
166 166
       return;
167 167
     }
@@ -193,7 +193,7 @@  discard block
 block discarded – undo
193 193
     if ($this->isNew()) {
194 194
       // No DB_ID - new unit
195 195
       if ($this->isEmpty()) {
196
-        classSupernova::$debug->error(__FILE__ . ':' . __LINE__ . ' - object is empty on ' . get_called_class() . '::dbSave');
196
+        classSupernova::$debug->error(__FILE__.':'.__LINE__.' - object is empty on '.get_called_class().'::dbSave');
197 197
       }
198 198
       $this->dbInsert();
199 199
     } else {
@@ -202,7 +202,7 @@  discard block
 block discarded – undo
202 202
         $this->dbDelete();
203 203
       } else {
204 204
         if (!sn_db_transaction_check(false)) {
205
-          classSupernova::$debug->error(__FILE__ . ':' . __LINE__ . ' - transaction should always be started on ' . get_called_class() . '::dbUpdate');
205
+          classSupernova::$debug->error(__FILE__.':'.__LINE__.' - transaction should always be started on '.get_called_class().'::dbUpdate');
206 206
         }
207 207
         $this->dbUpdate();
208 208
       }
@@ -230,13 +230,13 @@  discard block
 block discarded – undo
230 230
   // TODO - protected
231 231
   public function dbInsert() {
232 232
     if (!$this->isNew()) {
233
-      classSupernova::$debug->error(__FILE__ . ':' . __LINE__ . ' - record db_id is not empty on ' . get_called_class() . '::dbInsert');
233
+      classSupernova::$debug->error(__FILE__.':'.__LINE__.' - record db_id is not empty on '.get_called_class().'::dbInsert');
234 234
     }
235 235
 
236 236
     $fieldSet = $this->dbMakeFieldSet(false);
237 237
 
238 238
     if (!static::$db->doInsertSet(static::$_table, $fieldSet)) {
239
-      classSupernova::$debug->error(__FILE__ . ':' . __LINE__ . ' - error saving record ' . get_called_class() . '::dbInsert');
239
+      classSupernova::$debug->error(__FILE__.':'.__LINE__.' - error saving record '.get_called_class().'::dbInsert');
240 240
     }
241 241
     $this->_dbId = static::$db->db_insert_id();
242 242
 
@@ -250,7 +250,7 @@  discard block
 block discarded – undo
250 250
   public function dbUpdate() {
251 251
     // TODO - Update
252 252
     if ($this->isNew()) {
253
-      classSupernova::$debug->error(__FILE__ . ':' . __LINE__ . ' - unit db_id is empty on dbUpdate');
253
+      classSupernova::$debug->error(__FILE__.':'.__LINE__.' - unit db_id is empty on dbUpdate');
254 254
     }
255 255
     $this->db_field_update($this->dbMakeFieldUpdate());
256 256
   }
@@ -261,7 +261,7 @@  discard block
 block discarded – undo
261 261
   // TODO - protected
262 262
   public function dbDelete() {
263 263
     if ($this->isNew()) {
264
-      classSupernova::$debug->error(__FILE__ . ':' . __LINE__ . ' - unit db_id is empty on dbDelete');
264
+      classSupernova::$debug->error(__FILE__.':'.__LINE__.' - unit db_id is empty on dbDelete');
265 265
     }
266 266
     classSupernova::$gc->db->doDeleteRowWhere(static::$_table, array(static::$_dbIdFieldName => $this->_dbId));
267 267
     $this->_dbId = 0;
@@ -447,7 +447,7 @@  discard block
 block discarded – undo
447 447
       }
448 448
     }
449 449
 
450
-    if(empty($set)) {
450
+    if (empty($set)) {
451 451
       $theResult = true;
452 452
     } else {
453 453
       $theResult = classSupernova::$db->doUpdateRowAdjust(
Please login to merge, or discard this patch.
includes/classes/DBStaticUnit.php 2 patches
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -118,6 +118,9 @@
 block discarded – undo
118 118
     return classSupernova::$gc->cacheOperator->db_ins_record(LOC_UNIT, $set);
119 119
   }
120 120
 
121
+  /**
122
+   * @param integer $unit_location_type
123
+   */
121 124
   public static function db_unit_list_delete($user_id = 0, $unit_location_type, $unit_location_id = 0, $unit_snid = 0) {
122 125
     $where = array('unit_location_type' => $unit_location_type);
123 126
     ($unit_location_id = idval($unit_location_id)) ? $where['unit_location_id'] = $unit_location_id : false;
Please login to merge, or discard this patch.
Spacing   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -24,7 +24,7 @@  discard block
 block discarded – undo
24 24
     }
25 25
 
26 26
     if (classSupernova::$gc->snCache->isUnitLocatorNotSet($location_type, $location_id)) {
27
-      $got_data = classSupernova::$gc->cacheOperator->db_get_record_list(LOC_UNIT, "unit_location_type = {$location_type} AND unit_location_id = {$location_id} AND " . DBStaticUnit::db_unit_time_restrictions());
27
+      $got_data = classSupernova::$gc->cacheOperator->db_get_record_list(LOC_UNIT, "unit_location_type = {$location_type} AND unit_location_id = {$location_id} AND ".DBStaticUnit::db_unit_time_restrictions());
28 28
       if (!empty($got_data) && is_array($got_data)) {
29 29
         foreach ($got_data as $unit_id => $unit_data) {
30 30
           classSupernova::$gc->snCache->setUnitLocatorByLocationAndIDs($location_type, $location_id, $unit_data);
@@ -59,9 +59,9 @@  discard block
 block discarded – undo
59 59
 
60 60
   public static function db_unit_count_by_user_and_type_and_snid($user_id, $unit_type = 0, $unit_snid = 0) {
61 61
     $query = classSupernova::$db->doSelect(
62
-      "SELECT unit_snid, sum(unit_level) as `qty`  FROM {{unit}} WHERE `unit_player_id` = {$user_id} " .
63
-      ($unit_type ? "AND `unit_type` = {$unit_type} " : '') .
64
-      ($unit_snid ? "AND `unit_snid` = {$unit_snid} " : '') .
62
+      "SELECT unit_snid, sum(unit_level) as `qty`  FROM {{unit}} WHERE `unit_player_id` = {$user_id} ".
63
+      ($unit_type ? "AND `unit_type` = {$unit_type} " : '').
64
+      ($unit_snid ? "AND `unit_snid` = {$unit_snid} " : '').
65 65
       'GROUP BY `unit_snid`'
66 66
     );
67 67
     $result = array();
@@ -81,8 +81,8 @@  discard block
 block discarded – undo
81 81
     WHERE
82 82
       f.fleet_owner = {$user_id} AND
83 83
       (f.fleet_start_planet_id = {$location_id} OR f.fleet_end_planet_id = {$location_id})
84
-      AND u.unit_snid = {$unit_snid} AND u.`unit_location_type` = " . LOC_FLEET . " AND " . self::db_unit_time_restrictions() .
85
-      " LIMIT 1" .
84
+      AND u.unit_snid = {$unit_snid} AND u.`unit_location_type` = ".LOC_FLEET." AND ".self::db_unit_time_restrictions().
85
+      " LIMIT 1".
86 86
       ($for_update ? ' FOR UPDATE' : ''));
87 87
   }
88 88
 
@@ -90,7 +90,7 @@  discard block
 block discarded – undo
90 90
   public static function db_unit_list_laboratories($user_id) {
91 91
     return classSupernova::$db->doSelect("SELECT DISTINCT unit_location_id AS `id`
92 92
     FROM {{unit}}
93
-    WHERE unit_player_id = {$user_id} AND unit_location_type = " . LOC_PLANET . " AND unit_level > 0 AND unit_snid IN (" . STRUC_LABORATORY . ", " . STRUC_LABORATORY_NANO . ");");
93
+    WHERE unit_player_id = {$user_id} AND unit_location_type = ".LOC_PLANET." AND unit_level > 0 AND unit_snid IN (".STRUC_LABORATORY.", ".STRUC_LABORATORY_NANO.");");
94 94
   }
95 95
 
96 96
   /**
@@ -136,7 +136,7 @@  discard block
 block discarded – undo
136 136
     return classSupernova::$db->doSelect(
137 137
       "SELECT unit_player_id, unit_type, unit_snid, unit_level, count(*) AS unit_amount
138 138
     FROM `{{unit}}`
139
-    WHERE unit_level > 0 AND " . self::db_unit_time_restrictions() .
139
+    WHERE unit_level > 0 AND " . self::db_unit_time_restrictions().
140 140
       " GROUP BY unit_player_id, unit_type, unit_snid, unit_level"
141 141
     );
142 142
   }
@@ -164,7 +164,7 @@  discard block
 block discarded – undo
164 164
       ),
165 165
       array(
166 166
         'unit_time_finish IS NOT NULL',
167
-        "unit_time_finish < FROM_UNIXTIME(" . SN_TIME_NOW . ")",
167
+        "unit_time_finish < FROM_UNIXTIME(".SN_TIME_NOW.")",
168 168
       )
169 169
     );
170 170
   }
@@ -203,7 +203,7 @@  discard block
 block discarded – undo
203 203
 
204 204
     $temp = DBStaticUnit::db_get_unit_by_location($user['id'], $unit_location, $location_id, $unit_id, true, 'unit_id');
205 205
     if (!empty($temp['unit_id'])) {
206
-      $result = (bool)classSupernova::$gc->cacheOperator->db_upd_record_by_id(
206
+      $result = (bool) classSupernova::$gc->cacheOperator->db_upd_record_by_id(
207 207
         LOC_UNIT,
208 208
         $temp['unit_id'],
209 209
         array(),
@@ -214,15 +214,15 @@  discard block
 block discarded – undo
214 214
     } else {
215 215
       $locationIdRendered = $unit_location == LOC_USER ? $user['id'] : $planet_id;
216 216
       $unitType = get_unit_param($unit_id, P_UNIT_TYPE);
217
-      $result = (bool)classSupernova::$gc->cacheOperator->db_ins_record(
217
+      $result = (bool) classSupernova::$gc->cacheOperator->db_ins_record(
218 218
         LOC_UNIT,
219 219
         array(
220 220
           'unit_player_id'     => $user['id'],
221
-          'unit_location_type' => (int)$unit_location,
221
+          'unit_location_type' => (int) $unit_location,
222 222
           'unit_location_id'   => $locationIdRendered,
223
-          'unit_type'          => (int)$unitType,
224
-          'unit_snid'          => (int)$unit_id,
225
-          'unit_level'         => (float)$unit_value,
223
+          'unit_type'          => (int) $unitType,
224
+          'unit_snid'          => (int) $unit_id,
225
+          'unit_level'         => (float) $unit_value,
226 226
         )
227 227
       );
228 228
     }
Please login to merge, or discard this patch.
includes/includes/flt_page4.inc 1 patch
Spacing   +19 added lines, -19 removed lines patch added patch discarded remove patch
@@ -2,28 +2,28 @@  discard block
 block discarded – undo
2 2
 
3 3
 $classLocale = classLocale::$lang;
4 4
 
5
-if(SN_IN_FLEET !== true) {
5
+if (SN_IN_FLEET !== true) {
6 6
   classSupernova::$debug->error("Attempt to call FLEET page mode {$mode} directly - not from fleet.php", 'Forbidden', 403);
7 7
 }
8 8
 
9 9
 $fleetid = sys_get_param_id('fleetid');
10 10
 
11
-if(!is_numeric($fleetid) || empty($fleetid)) {
11
+if (!is_numeric($fleetid) || empty($fleetid)) {
12 12
   header("Location: fleet.php");
13 13
   exit();
14 14
 }
15 15
 
16 16
 $objFleet = new Fleet();
17 17
 $objFleet->dbLoad($fleetid);
18
-if(!$objFleet->dbId) {
18
+if (!$objFleet->dbId) {
19 19
   message(classLocale::$lang['fl_fleet_not_exists'], classLocale::$lang['fl_error']);
20 20
 }
21 21
 
22
-if($objFleet->time_arrive_to_target <= SN_TIME_NOW || $objFleet->time_return_to_source < SN_TIME_NOW || $objFleet->isReturning()) {
22
+if ($objFleet->time_arrive_to_target <= SN_TIME_NOW || $objFleet->time_return_to_source < SN_TIME_NOW || $objFleet->isReturning()) {
23 23
   message(classLocale::$lang['fl_isback'], classLocale::$lang['fl_error']);
24 24
 }
25 25
 
26
-if($objFleet->playerOwnerId != $user['id']) {
26
+if ($objFleet->playerOwnerId != $user['id']) {
27 27
   classSupernova::$debug->warning(classLocale::$lang['fl_aks_hack_wrong_fleet'], 'Wrong Fleet Owner', 301);
28 28
   message(classLocale::$lang['fl_aks_hack_wrong_fleet'], classLocale::$lang['fl_error']);
29 29
 }
@@ -34,19 +34,19 @@  discard block
 block discarded – undo
34 34
 
35 35
 !$aks && !$userToAdd_unsafe ? $userToAdd_unsafe = $user['username'] : false;
36 36
 
37
-if($userToAdd_unsafe) {
37
+if ($userToAdd_unsafe) {
38 38
   $userToAdd = db_escape($userToAdd_unsafe);
39 39
   $userToAddID = DBStaticUser::db_user_by_username($userToAdd_unsafe, false, 'id', true, true);
40 40
   $userToAddID = $userToAddID['id'];
41 41
 
42
-  if($objFleet->target_owner_id == $userToAddID) {
42
+  if ($objFleet->target_owner_id == $userToAddID) {
43 43
     message(classLocale::$lang['flt_aks_player_same'], classLocale::$lang['fl_error']);
44 44
   }
45 45
 
46
-  if($userToAddID) {
47
-    if(!$aks) {
46
+  if ($userToAddID) {
47
+    if (!$aks) {
48 48
       // No AСS exists - making one
49
-      if(!$objFleet->group_id) {
49
+      if (!$objFleet->group_id) {
50 50
         DBStaticFleetACS::db_acs_insert($fleetid, $user['id'], $objFleet);
51 51
 
52 52
         $aks = DBStaticFleetACS::db_acs_get_by_fleet($fleetid);
@@ -61,24 +61,24 @@  discard block
 block discarded – undo
61 61
 
62 62
     $isUserExists = false;
63 63
     $invited_ar = explode(",", $aks['eingeladen']);
64
-    foreach($invited_ar as $inv) {
65
-      if($userToAddID == $inv) {
64
+    foreach ($invited_ar as $inv) {
65
+      if ($userToAddID == $inv) {
66 66
         $isUserExists = true;
67 67
       }
68 68
     }
69 69
 
70
-    if(count($invited_ar) >= 5) {
70
+    if (count($invited_ar) >= 5) {
71 71
       message(classLocale::$lang['flt_aks_error_too_much_players'], classLocale::$lang['fl_error']);
72 72
     }
73 73
 
74
-    if($isUserExists) {
74
+    if ($isUserExists) {
75 75
       $userToAdd_unsafe != $user['username'] ? $add_user_message_mr = sprintf(classLocale::$lang['fl_aks_player_invited_already'], $userToAdd) : false;
76 76
     } else {
77 77
       $add_user_message_mr = sprintf(classLocale::$lang['fl_aks_player_invited'], $userToAdd);
78
-      if(!(DBStaticFleetACS::db_acs_update($userToAddID, $fleetid))) {
78
+      if (!(DBStaticFleetACS::db_acs_update($userToAddID, $fleetid))) {
79 79
         die(sprintf(classLocale::$lang['fl_aks_adding_error'], classSupernova::$db->db_error()));
80 80
       }
81
-      $aks['eingeladen'] .= ',' . $userToAddID;
81
+      $aks['eingeladen'] .= ','.$userToAddID;
82 82
     }
83 83
     DBStaticMessages::msg_send_simple_message($userToAddID, $user['id'], SN_TIME_NOW, MSG_TYPE_COMBAT, $user['username'], classLocale::$lang['fl_aks_invite_message_header'], sprintf(classLocale::$lang['fl_aks_invite_message'], $user['username']));
84 84
   } else {
@@ -94,8 +94,8 @@  discard block
 block discarded – undo
94 94
   'MISSION_NAME' => classLocale::$lang['type_mission'][MT_ACS],
95 95
 ));
96 96
 
97
-if($aks['eingeladen'] && is_array($members = classSupernova::$gc->cacheOperator->db_get_record_list(LOC_USER, "`id` in ({$aks['eingeladen']})")) && !empty($members)) {
98
-  foreach($members as $row) {
97
+if ($aks['eingeladen'] && is_array($members = classSupernova::$gc->cacheOperator->db_get_record_list(LOC_USER, "`id` in ({$aks['eingeladen']})")) && !empty($members)) {
98
+  foreach ($members as $row) {
99 99
     $template->assign_block_vars('invited', array(
100 100
       'NAME' => $row['username'],
101 101
     ));
@@ -120,7 +120,7 @@  discard block
 block discarded – undo
120 120
 $fleet_data = tplParseFleetObject($objFleet, $i, $user);
121 121
 
122 122
 $template->assign_block_vars('fleets', $fleet_data['fleet']);
123
-foreach($fleet_data['ships'] as $ship_data) {
123
+foreach ($fleet_data['ships'] as $ship_data) {
124 124
   $template->assign_block_vars('fleets.ships', $ship_data);
125 125
 }
126 126
 
Please login to merge, or discard this patch.
includes/classes/DBStaticUser.php 2 patches
Doc Comments   +8 added lines, -3 removed lines patch added patch discarded remove patch
@@ -104,6 +104,9 @@  discard block
 block discarded – undo
104 104
     return $result;
105 105
   }
106 106
 
107
+  /**
108
+   * @param integer $config_user_birthday_range
109
+   */
107 110
   public static function db_user_list_to_celebrate($config_user_birthday_range) {
108 111
     $query = static::buildDBQ()
109 112
       ->field('id', 'username', 'user_birthday', 'user_birthday_celebrated')
@@ -193,6 +196,9 @@  discard block
 block discarded – undo
193 196
   }
194 197
 
195 198
 
199
+  /**
200
+   * @param string $username_unsafe
201
+   */
196 202
   public static function db_user_by_username($username_unsafe, $for_update = false, $fields = '*', $player = null, $like = false) {
197 203
     // TODO Проверить, кстати - а везде ли нужно выбирать юзеров или где-то все-таки ищутся Альянсы ?
198 204
     if (!($username_unsafe = trim($username_unsafe))) {
@@ -247,7 +253,6 @@  discard block
 block discarded – undo
247 253
 
248 254
   /**
249 255
    * @param $user_id
250
-   * @param array $set
251 256
    * @param array $adjust
252 257
    *
253 258
    * @return array|bool|mysqli_result|null
@@ -264,8 +269,8 @@  discard block
 block discarded – undo
264 269
    *    <p>array - запись пользователя с установленным полем ['id']</p>
265 270
    * @param bool      $for_update @deprecated
266 271
    * @param string    $fields @deprecated список полей или '*'/'' для всех полей
267
-   * @param null      $player
268
-   * @param bool|null $player Признак выбора записи пользователь типа "игрок"
272
+   * @param boolean      $player
273
+   * @param boolean $player Признак выбора записи пользователь типа "игрок"
269 274
    *    <p>null - Можно выбрать запись любого типа</p>
270 275
    *    <p>true - Выбирается только запись типа "игрок"</p>
271 276
    *    <p>false - Выбирается только запись типа "альянс"</p>
Please login to merge, or discard this patch.
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -23,7 +23,7 @@  discard block
 block discarded – undo
23 23
         ->where('`user_as_ally` IS NULL')
24 24
         ->orderBy(array('`id` DESC'));
25 25
 
26
-    return (string)$query->selectValue();
26
+    return (string) $query->selectValue();
27 27
   }
28 28
 
29 29
   /**
@@ -48,15 +48,15 @@  discard block
 block discarded – undo
48 48
       static::buildDBQ()
49 49
         ->field('id')
50 50
         ->where("`user_as_ally` IS NULL")
51
-        ->where("`user_bot` = " . USER_BOT_PLAYER)
51
+        ->where("`user_bot` = ".USER_BOT_PLAYER)
52 52
         ->setForUpdate();
53 53
 
54 54
     return $query->selectIterator();
55 55
   }
56 56
 
57 57
   public static function db_user_lock_with_target_owner_and_acs($user, $planet = array()) {
58
-    $query = "SELECT 1 FROM `{{users}}` WHERE `id` = " . idval($user['id']) .
59
-      (!empty($planet['id_owner']) ? ' OR `id` = ' . idval($planet['id_owner']) : '')
58
+    $query = "SELECT 1 FROM `{{users}}` WHERE `id` = ".idval($user['id']).
59
+      (!empty($planet['id_owner']) ? ' OR `id` = '.idval($planet['id_owner']) : '')
60 60
       . " FOR UPDATE";
61 61
 
62 62
     static::getDb()->doSelect($query);
@@ -73,7 +73,7 @@  discard block
 block discarded – undo
73 73
       FROM `{{users}}` 
74 74
       WHERE 
75 75
         `user_as_ally` IS NULL" .
76
-        ($online ? ' AND `onlinetime` > ' . (SN_TIME_NOW - classSupernova::$config->game_users_online_timeout) : '')
76
+        ($online ? ' AND `onlinetime` > '.(SN_TIME_NOW - classSupernova::$config->game_users_online_timeout) : '')
77 77
     ));
78 78
   }
79 79
 
@@ -95,7 +95,7 @@  discard block
 block discarded – undo
95 95
       ->fieldCount('r.id', 'referral_count')
96 96
       ->fieldSingleFunction('sum', 'r.dark_matter', 'referral_dm')
97 97
       ->join('LEFT JOIN {{referrals}} as r on r.id_partner = u.id')
98
-      ->where($online ? "`onlinetime` >= " . intval(SN_TIME_NOW - classSupernova::$config->game_users_online_timeout) : 'user_as_ally IS NULL')
98
+      ->where($online ? "`onlinetime` >= ".intval(SN_TIME_NOW - classSupernova::$config->game_users_online_timeout) : 'user_as_ally IS NULL')
99 99
       ->groupBy('u.id')
100 100
       ->orderBy("user_as_ally, {$sort} ASC");
101 101
 
@@ -113,7 +113,7 @@  discard block
 block discarded – undo
113 113
       ->where('(`user_birthday_celebrated` IS NULL OR DATE_ADD(`user_birthday_celebrated`, INTERVAL 1 YEAR) < CURRENT_DATE)')
114 114
       ->where('`user_as_ally` IS NULL')
115 115
       ->having('`days_after_birthday` >= 0')
116
-      ->having('`days_after_birthday` < ' . intval($config_user_birthday_range))
116
+      ->having('`days_after_birthday` < '.intval($config_user_birthday_range))
117 117
       ->setForUpdate();
118 118
 
119 119
     $result = $query->selectIterator();
@@ -222,7 +222,7 @@  discard block
 block discarded – undo
222 222
       $username_safe = db_escape($like ? strtolower($username_unsafe) : $username_unsafe); // тут на самом деле strtolower() лишняя, но пусть будет
223 223
 
224 224
       $user = classSupernova::$db->doSelectFetch(
225
-        "SELECT * FROM {{users}} WHERE `username` " . ($like ? 'LIKE' : '=') . " '{$username_safe}'"
225
+        "SELECT * FROM {{users}} WHERE `username` ".($like ? 'LIKE' : '=')." '{$username_safe}'"
226 226
         . " FOR UPDATE"
227 227
       );
228 228
       classSupernova::$gc->snCache->cache_set(LOC_USER, $user); // В кэш-юзер так же заполнять индексы
@@ -313,7 +313,7 @@  discard block
 block discarded – undo
313 313
    * @param array $playerArray
314 314
    */
315 315
   public static function renderNameAndCoordinates($playerArray) {
316
-    return "{$playerArray['username']} " . uni_render_coordinates($playerArray);
316
+    return "{$playerArray['username']} ".uni_render_coordinates($playerArray);
317 317
   }
318 318
 
319 319
   /**
@@ -347,7 +347,7 @@  discard block
 block discarded – undo
347 347
     foreach ($playerRowFieldChanges as $resourceId => $value) {
348 348
       $fields[pname_resource_name($resourceId)] = $value;
349 349
     }
350
-    if(!empty($fields)) {
350
+    if (!empty($fields)) {
351 351
       classSupernova::$gc->db->doUpdateRowAdjust(
352 352
         TABLE_USERS,
353 353
         array(),
Please login to merge, or discard this patch.
includes/db.php 2 patches
Doc Comments   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -16,7 +16,6 @@  discard block
 block discarded – undo
16 16
  * @param       $user
17 17
  * @param       $planet
18 18
  * @param array $unit_list
19
- * @param null  $query
20 19
  */
21 20
 function db_change_resources(&$user, &$planet, $unit_list) {
22 21
   $group = sn_get_groups('resources_loot');
@@ -56,6 +55,9 @@  discard block
 block discarded – undo
56 55
 
57 56
 }
58 57
 
58
+/**
59
+ * @param boolean $transaction_should_be_started
60
+ */
59 61
 function sn_db_transaction_check($transaction_should_be_started = null) {
60 62
   return classSupernova::$gc->db->getTransaction()->check($transaction_should_be_started);
61 63
 }
Please login to merge, or discard this patch.
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -24,22 +24,22 @@
 block discarded – undo
24 24
   $locationType = sys_get_unit_location($user, $planet, key($unit_list));
25 25
 
26 26
   $resourcesChange = array();
27
-  foreach($unit_list as $unit_id => $unit_amount) {
28
-    if(!in_array($unit_id, $group)) {
27
+  foreach ($unit_list as $unit_id => $unit_amount) {
28
+    if (!in_array($unit_id, $group)) {
29 29
       // TODO - remove later
30 30
       print('<h1>СООБЩИТЕ ЭТО АДМИНУ: db_change_resources() вызван для не-ресурсов!</h1>');
31 31
       pdump(debug_backtrace());
32 32
       die('db_change_resources() вызван для не-ресурсов!');
33 33
     }
34 34
 
35
-    if(empty($unit_amount)) {
35
+    if (empty($unit_amount)) {
36 36
       continue;
37 37
     }
38 38
 
39 39
     $resourcesChange[pname_resource_name($unit_id)] += $unit_amount;
40 40
   }
41 41
 
42
-  if($locationType == LOC_USER) {
42
+  if ($locationType == LOC_USER) {
43 43
     $locationId = $user['id'];
44 44
   } else {
45 45
     $locationId = $planet['id'];
Please login to merge, or discard this patch.
resources.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -22,7 +22,7 @@  discard block
 block discarded – undo
22 22
  *
23 23
  **/
24 24
 
25
-include('common.' . substr(strrchr(__FILE__, '.'), 1));
25
+include('common.'.substr(strrchr(__FILE__, '.'), 1));
26 26
 
27 27
 /**
28 28
  * @param          $resource_id
@@ -36,7 +36,7 @@  discard block
 block discarded – undo
36 36
   $storage_fill = $caps_real['total_storage'][$resource_id] ? floor(mrc_get_level($user, $planetrow, $resource_id) / $caps_real['total_storage'][$resource_id] * 100) : 0;
37 37
 
38 38
   $template->assign_block_vars('resources', array(
39
-    'NAME' => classLocale::$lang["sys_" . pname_resource_name($resource_id)],
39
+    'NAME' => classLocale::$lang["sys_".pname_resource_name($resource_id)],
40 40
 
41 41
     'HOURLY'  => pretty_number($totalProduction, true, true),
42 42
     'WEEKLY'  => pretty_number($totalProduction * 24 * 7, true, true),
@@ -76,12 +76,12 @@  discard block
 block discarded – undo
76 76
       $planetrow[$field_name] = $percent;
77 77
       $SubQry[$field_name] = $percent;
78 78
     } else {
79
-      classSupernova::$debug->warning('Supplying wrong ID in production array - attempt to change some field - ID' . $prod_id, 'Resource Page', 301);
79
+      classSupernova::$debug->warning('Supplying wrong ID in production array - attempt to change some field - ID'.$prod_id, 'Resource Page', 301);
80 80
       continue;
81 81
     }
82 82
   }
83 83
 
84
-  if(!empty($SubQry)) {
84
+  if (!empty($SubQry)) {
85 85
     DBStaticPlanet::db_planet_update_set_by_id(
86 86
       $planetrow['id'],
87 87
       $SubQry
Please login to merge, or discard this patch.
phalanx.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -11,24 +11,24 @@  discard block
 block discarded – undo
11 11
  * @copyright 2008 by Pada for XNova.project.es
12 12
  */
13 13
 
14
-include('common.' . substr(strrchr(__FILE__, '.'), 1));
14
+include('common.'.substr(strrchr(__FILE__, '.'), 1));
15 15
 
16 16
 lng_include('overview');
17 17
 lng_include('universe');
18 18
 
19 19
 $sensorLevel = mrc_get_level($user, $planetrow, STRUC_MOON_PHALANX);
20 20
 if (!intval($sensorLevel)) {
21
-  message (classLocale::$lang['phalanx_nosensoravailable'], classLocale::$lang['tech'][STRUC_MOON_PHALANX], '', 3);
21
+  message(classLocale::$lang['phalanx_nosensoravailable'], classLocale::$lang['tech'][STRUC_MOON_PHALANX], '', 3);
22 22
 }
23 23
 
24 24
 if ($planetrow['planet_type'] != PT_MOON) {
25
-  message (classLocale::$lang['phalanx_onlyformoons'], classLocale::$lang['tech'][STRUC_MOON_PHALANX], '', 3);
25
+  message(classLocale::$lang['phalanx_onlyformoons'], classLocale::$lang['tech'][STRUC_MOON_PHALANX], '', 3);
26 26
 }
27 27
 
28 28
 $scan_galaxy  = sys_get_param_int('galaxy');
29 29
 $scan_system  = sys_get_param_int('system');
30 30
 $scan_planet  = sys_get_param_int('planet');
31
-$scan_planet_type  = 1; // sys_get_param_int('planettype');
31
+$scan_planet_type = 1; // sys_get_param_int('planettype');
32 32
 $id = sys_get_param_id('id');
33 33
 
34 34
 $source_galaxy = $planetrow['galaxy'];
@@ -38,9 +38,9 @@  discard block
 block discarded – undo
38 38
 $sensorRange = GetPhalanxRange($sensorLevel);
39 39
 
40 40
 $system_distance = abs($source_system - $scan_system);
41
-if($system_distance > $sensorRange || $scan_galaxy != $source_galaxy)
41
+if ($system_distance > $sensorRange || $scan_galaxy != $source_galaxy)
42 42
 {
43
-  message (classLocale::$lang['phalanx_rangeerror'], classLocale::$lang['tech'][STRUC_MOON_PHALANX], '', 3);
43
+  message(classLocale::$lang['phalanx_rangeerror'], classLocale::$lang['tech'][STRUC_MOON_PHALANX], '', 3);
44 44
 }
45 45
 
46 46
 $cost = $sensorLevel * 1000;
@@ -51,20 +51,20 @@  discard block
 block discarded – undo
51 51
 }
52 52
 
53 53
 $planet_scanned = DBStaticPlanet::db_planet_by_gspt($scan_galaxy, $scan_system, $scan_planet, $scan_planet_type);
54
-if(!$planet_scanned['id'])
54
+if (!$planet_scanned['id'])
55 55
 {
56 56
   message(classLocale::$lang['phalanx_planet_not_exists'], classLocale::$lang['tech'][STRUC_MOON_PHALANX], '', 3);
57 57
 }
58 58
 
59
-if($planet_scanned['destruyed'])
59
+if ($planet_scanned['destruyed'])
60 60
 {
61
-  message (classLocale::$lang['phalanx_planet_destroyed'], classLocale::$lang['tech'][STRUC_MOON_PHALANX], '', 3);
61
+  message(classLocale::$lang['phalanx_planet_destroyed'], classLocale::$lang['tech'][STRUC_MOON_PHALANX], '', 3);
62 62
 }
63 63
 
64 64
 DBStaticPlanet::db_planet_update_adjust_by_id(
65 65
   $user['current_planet'],
66 66
   array(
67
-    'deuterium' => - $cost,
67
+    'deuterium' => -$cost,
68 68
   )
69 69
 );
70 70
 
Please login to merge, or discard this patch.
overview.php 1 patch
Spacing   +38 added lines, -38 removed lines patch added patch discarded remove patch
@@ -30,7 +30,7 @@  discard block
 block discarded – undo
30 30
 
31 31
 //define('SN_RENDER_NAVBAR_PLANET', false);
32 32
 
33
-include('common.' . substr(strrchr(__FILE__, '.'), 1));
33
+include('common.'.substr(strrchr(__FILE__, '.'), 1));
34 34
 
35 35
 //$ccc = 0;
36 36
 //foreach(DBStaticUser::db_user_list_non_bots() as $ip) {
@@ -49,7 +49,7 @@  discard block
 block discarded – undo
49 49
 
50 50
 $result = array();
51 51
 
52
-switch($mode = sys_get_param_str('mode')) {
52
+switch ($mode = sys_get_param_str('mode')) {
53 53
   case 'manage':
54 54
     sn_sys_sector_buy('overview.php?mode=manage');
55 55
 
@@ -59,7 +59,7 @@  discard block
 block discarded – undo
59 59
     $template  = gettemplate('planet_manage', true);
60 60
     $planet_id = sys_get_param_id('planet_id');
61 61
 
62
-    if(sys_get_param_str('rename') && ($new_name_unsafe = sys_get_param_str_unsafe('new_name'))) {
62
+    if (sys_get_param_str('rename') && ($new_name_unsafe = sys_get_param_str_unsafe('new_name'))) {
63 63
       $planetrow['name'] = $new_name_unsafe;
64 64
       DBStaticPlanet::db_planet_update_set_by_id(
65 65
         $planetrow['id'],
@@ -67,21 +67,21 @@  discard block
 block discarded – undo
67 67
           'name' => $new_name_unsafe,
68 68
         )
69 69
       );
70
-    } elseif(sys_get_param_str('action') == 'make_capital') {
70
+    } elseif (sys_get_param_str('action') == 'make_capital') {
71 71
       try {
72 72
         sn_db_transaction_start();
73 73
         $user = DBStaticUser::db_user_by_id($user['id'], true, '*');
74 74
         $planetrow = DBStaticPlanet::db_planet_by_id($planetrow['id'], true, '*');
75 75
 
76
-        if($planetrow['planet_type'] != PT_PLANET) {
76
+        if ($planetrow['planet_type'] != PT_PLANET) {
77 77
           throw new exception(classLocale::$lang['ov_capital_err_not_a_planet'], ERR_ERROR);
78 78
         }
79 79
 
80
-        if($planetrow['id'] == $user['id_planet']) {
80
+        if ($planetrow['id'] == $user['id_planet']) {
81 81
           throw new exception(classLocale::$lang['ov_capital_err_capital_already'], ERR_ERROR);
82 82
         }
83 83
 
84
-        if($user_dark_matter < classSupernova::$config->planet_capital_cost) {
84
+        if ($user_dark_matter < classSupernova::$config->planet_capital_cost) {
85 85
           throw new exception(classLocale::$lang['ov_capital_err_no_dark_matter'], ERR_ERROR);
86 86
         }
87 87
 
@@ -106,16 +106,16 @@  discard block
 block discarded – undo
106 106
         );
107 107
         sn_db_transaction_commit();
108 108
         sys_redirect('overview.php?mode=manage');
109
-      } catch(exception $e) {
109
+      } catch (exception $e) {
110 110
         sn_db_transaction_rollback();
111 111
         $result[] = array(
112 112
           'STATUS'  => $e->getCode(),
113 113
           'MESSAGE' => $e->getMessage(),
114 114
         );
115 115
       }
116
-    } elseif(sys_get_param_str('action') == 'planet_teleport') {
116
+    } elseif (sys_get_param_str('action') == 'planet_teleport') {
117 117
       try {
118
-        if(!uni_coordinates_valid($new_coordinates = array(
118
+        if (!uni_coordinates_valid($new_coordinates = array(
119 119
           'galaxy' => sys_get_param_int('new_galaxy'),
120 120
           'system' => sys_get_param_int('new_system'),
121 121
           'planet' => sys_get_param_int('new_planet')))
@@ -132,7 +132,7 @@  discard block
 block discarded – undo
132 132
 //        $planetrow = $global_data['planet'];
133 133
 
134 134
         $can_teleport = uni_planet_teleport_check($user, $planetrow, $new_coordinates);
135
-        if($can_teleport['result'] != ERR_NONE) {
135
+        if ($can_teleport['result'] != ERR_NONE) {
136 136
           throw new exception($can_teleport['message'], $can_teleport['result']);
137 137
         }
138 138
 
@@ -151,7 +151,7 @@  discard block
 block discarded – undo
151 151
           array()
152 152
         );
153 153
 
154
-        if($planetrow['id'] == $user['id_planet']) {
154
+        if ($planetrow['id'] == $user['id_planet']) {
155 155
           DBStaticUser::db_user_set_by_id(
156 156
             $user['id'],
157 157
             array(
@@ -171,17 +171,17 @@  discard block
 block discarded – undo
171 171
           'MESSAGE' => classLocale::$lang['ov_teleport_err_none'],
172 172
         );
173 173
         sys_redirect('overview.php?mode=manage');
174
-      } catch(exception $e) {
174
+      } catch (exception $e) {
175 175
         sn_db_transaction_rollback();
176 176
         $result[] = array(
177 177
           'STATUS'  => $e->getCode(),
178 178
           'MESSAGE' => $e->getMessage(),
179 179
         );
180 180
       }
181
-    } elseif(sys_get_param_str('action') == 'planet_abandon') {
181
+    } elseif (sys_get_param_str('action') == 'planet_abandon') {
182 182
       // if(sec_password_check($user['id'], sys_get_param('abandon_confirm'))) {
183
-      if(classSupernova::$auth->password_check(sys_get_param('abandon_confirm'))) {
184
-        if($user['id_planet'] != $user['current_planet'] && $user['current_planet'] == $planet_id) {
183
+      if (classSupernova::$auth->password_check(sys_get_param('abandon_confirm'))) {
184
+        if ($user['id_planet'] != $user['current_planet'] && $user['current_planet'] == $planet_id) {
185 185
           $destroyed = SN_TIME_NOW + 60 * 60 * 24;
186 186
           DBStaticPlanet::db_planet_update_set_by_id(
187 187
             $user['current_planet'],
@@ -207,9 +207,9 @@  discard block
 block discarded – undo
207 207
           message(classLocale::$lang['ov_delete_wrong_planet'], classLocale::$lang['colony_abandon'], 'overview.php?mode=manage');
208 208
         }
209 209
       } else {
210
-        message(classLocale::$lang['ov_delete_wrong_pass'] , classLocale::$lang['colony_abandon'], 'overview.php?mode=manage');
210
+        message(classLocale::$lang['ov_delete_wrong_pass'], classLocale::$lang['colony_abandon'], 'overview.php?mode=manage');
211 211
       }
212
-    } elseif(
212
+    } elseif (
213 213
       ($hire = sys_get_param_int('hire')) && in_array($hire, sn_get_groups('governors'))
214 214
       && (
215 215
         !get_unit_param($hire, P_MAX_STACK) ||
@@ -224,8 +224,8 @@  discard block
 block discarded – undo
224 224
       $user = DBStaticUser::db_user_by_id($user['id'], true);
225 225
       $planetrow = DBStaticPlanet::db_planet_by_id($planetrow['id'], true);
226 226
       $build_data = eco_get_build_data($user, $planetrow, $hire, $planetrow['PLANET_GOVERNOR_ID'] == $hire ? $planetrow['PLANET_GOVERNOR_LEVEL'] : 0);
227
-      if($build_data['CAN'][BUILD_CREATE]) {
228
-        if($planetrow['PLANET_GOVERNOR_ID'] == $hire) {
227
+      if ($build_data['CAN'][BUILD_CREATE]) {
228
+        if ($planetrow['PLANET_GOVERNOR_ID'] == $hire) {
229 229
           $planetrow['PLANET_GOVERNOR_LEVEL']++;
230 230
         } else {
231 231
           $planetrow['PLANET_GOVERNOR_LEVEL'] = 1;
@@ -257,8 +257,8 @@  discard block
 block discarded – undo
257 257
 
258 258
     lng_include('mrc_mercenary');
259 259
     int_planet_pretemplate($planetrow, $template);
260
-    foreach(sn_get_groups('governors') as $governor_id) {
261
-      if($planetrow['planet_type'] == PT_MOON && $governor_id == MRC_TECHNOLOGIST) {
260
+    foreach (sn_get_groups('governors') as $governor_id) {
261
+      if ($planetrow['planet_type'] == PT_MOON && $governor_id == MRC_TECHNOLOGIST) {
262 262
         continue;
263 263
       }
264 264
 
@@ -310,7 +310,7 @@  discard block
 block discarded – undo
310 310
       'PAGE_HINT'   => classLocale::$lang['ov_manage_page_hint'],
311 311
     ));
312 312
 
313
-    foreach($result as &$a_result) {
313
+    foreach ($result as &$a_result) {
314 314
       $template->assign_block_vars('result', $a_result);
315 315
     }
316 316
 
@@ -320,7 +320,7 @@  discard block
 block discarded – undo
320 320
   default:
321 321
     sn_sys_sector_buy();
322 322
 
323
-    if(sys_get_param_str('rename') && $new_name_unsafe = sys_get_param_str_unsafe('new_name')) {
323
+    if (sys_get_param_str('rename') && $new_name_unsafe = sys_get_param_str_unsafe('new_name')) {
324 324
       $planetrow['name'] = $new_name_unsafe;
325 325
       DBStaticPlanet::db_planet_update_set_by_id(
326 326
         $planetrow['id'],
@@ -355,7 +355,7 @@  discard block
 block discarded – undo
355 355
 
356 356
     $planet_count = 0;
357 357
     $planets_query = DBStaticPlanet::db_planet_list_sorted($user, false, '*');
358
-    foreach($planets_query as $an_id => $UserPlanet) {
358
+    foreach ($planets_query as $an_id => $UserPlanet) {
359 359
       sn_db_transaction_start();
360 360
       $UserPlanet = sys_o_get_updated($user, $UserPlanet['id'], SN_TIME_NOW, false, true);
361 361
       sn_db_transaction_commit();
@@ -366,16 +366,16 @@  discard block
 block discarded – undo
366 366
 
367 367
       $planet_fleet_id = 0;
368 368
       $fleet_list = $template_planet['fleet_list'];
369
-      if($fleet_list['own']['count']) {
369
+      if ($fleet_list['own']['count']) {
370 370
         $planet_fleet_id = "p{$UserPlanet['id']}";
371 371
         $fleets_to_planet[$UserPlanet['id']] = tpl_parse_fleet_sn($fleet_list['own']['total'], $planet_fleet_id);
372 372
 //        $fleet_id++;tpl_parse_fleet_sn
373 373
       }
374
-      if($UserPlanet['planet_type'] == PT_MOON) {
374
+      if ($UserPlanet['planet_type'] == PT_MOON) {
375 375
         continue;
376 376
       }
377 377
       $moon = DBStaticPlanet::db_planet_by_parent($UserPlanet['id']);
378
-      if($moon) {
378
+      if ($moon) {
379 379
         $moon_fill = min(100, floor($moon['field_current'] / eco_planet_fields_max($moon) * 100));
380 380
       } else {
381 381
         $moon_fill = 0;
@@ -415,7 +415,7 @@  discard block
 block discarded – undo
415 415
     tpl_assign_fleet($template, $fleets);
416 416
 
417 417
     $lune = $planetrow['planet_type'] == PT_PLANET ? DBStaticPlanet::db_planet_by_parent($planetrow['id']) : DBStaticPlanet::db_planet_by_id($planetrow['parent_planet']);
418
-    if($lune) {
418
+    if ($lune) {
419 419
       $template->assign_vars(array(
420 420
         'MOON_ID' => $lune['id'],
421 421
         'MOON_IMG' => $lune['image'],
@@ -427,15 +427,15 @@  discard block
 block discarded – undo
427 427
     $planet_fill = $planet_fill > 100 ? 100 : $planet_fill;
428 428
 
429 429
     $planet_recyclers_orbiting = 0;
430
-    foreach(Fleet::$snGroupRecyclers as $recycler_id) {
430
+    foreach (Fleet::$snGroupRecyclers as $recycler_id) {
431 431
       $planet_recyclers_orbiting += mrc_get_level($user, $planetrow, $recycler_id);
432 432
     }
433 433
 
434 434
     int_planet_pretemplate($planetrow, $template);
435 435
 
436 436
     $sn_group_ques = sn_get_groups('ques');
437
-    if(!defined('GAME_STRUCTURES_DISABLED') || !GAME_STRUCTURES_DISABLED) {
438
-      foreach(array(QUE_STRUCTURES => $sn_group_ques[QUE_STRUCTURES]) as $que_id => $que_type_data) {
437
+    if (!defined('GAME_STRUCTURES_DISABLED') || !GAME_STRUCTURES_DISABLED) {
438
+      foreach (array(QUE_STRUCTURES => $sn_group_ques[QUE_STRUCTURES]) as $que_id => $que_type_data) {
439 439
         $this_que = $que['ques'][$que_id][$user['id']][$planetrow['id']];
440 440
         $template->assign_block_vars('ques', array(
441 441
           'ID'     => $que_id,
@@ -443,8 +443,8 @@  discard block
 block discarded – undo
443 443
           'LENGTH' => empty($this_que) ? 0 : count($this_que),
444 444
         ));
445 445
 
446
-        if(!empty($this_que)) {
447
-          foreach($this_que as $que_item) {
446
+        if (!empty($this_que)) {
447
+          foreach ($this_que as $que_item) {
448 448
             $template->assign_block_vars('que', que_tpl_parse_element($que_item));
449 449
           }
450 450
         }
@@ -458,7 +458,7 @@  discard block
 block discarded – undo
458 458
       'LENGTH' => $que_hangar_length,
459 459
     ));
460 460
 
461
-    if(!defined('GAME_DEFENSE_DISABLED') || !GAME_DEFENSE_DISABLED) {
461
+    if (!defined('GAME_DEFENSE_DISABLED') || !GAME_DEFENSE_DISABLED) {
462 462
       $que_hangar_length = tpl_assign_hangar($template, $planetrow, SUBQUE_DEFENSE);
463 463
       $template->assign_block_vars('ques', array(
464 464
         'ID'     => SUBQUE_DEFENSE,
@@ -470,12 +470,12 @@  discard block
 block discarded – undo
470 470
     $overview_planet_rows = $user['opt_int_overview_planet_rows'];
471 471
     $overview_planet_columns = $user['opt_int_overview_planet_columns'];
472 472
 
473
-    if($overview_planet_rows <= 0 && $overview_planet_columns <= 0) {
473
+    if ($overview_planet_rows <= 0 && $overview_planet_columns <= 0) {
474 474
       $overview_planet_rows = $user_option_list[OPT_INTERFACE]['opt_int_overview_planet_rows'];
475 475
       $overview_planet_columns = $user_option_list[OPT_INTERFACE]['opt_int_overview_planet_columns'];
476 476
     }
477 477
 
478
-    if($overview_planet_rows > 0 && $overview_planet_columns <= 0) {
478
+    if ($overview_planet_rows > 0 && $overview_planet_columns <= 0) {
479 479
       $overview_planet_columns = ceil($planet_count / $overview_planet_rows);
480 480
     }
481 481
 
@@ -532,7 +532,7 @@  discard block
 block discarded – undo
532 532
     ));
533 533
     tpl_set_resource_info($template, $planetrow, $fleets_to_planet, 2);
534 534
 
535
-    foreach($result as &$a_result) {
535
+    foreach ($result as &$a_result) {
536 536
       $template->assign_block_vars('result', $a_result);
537 537
     }
538 538
 
Please login to merge, or discard this patch.