Completed
Push — trunk ( 433e05...76e427 )
by SuperNova.WS
06:21
created
includes/includes/flt_mission_hold.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -2,8 +2,7 @@
 block discarded – undo
2 2
 
3 3
 use Fleet\DbFleetStatic;
4 4
 
5
-function flt_mission_hold(&$mission_data)
6
-{
5
+function flt_mission_hold(&$mission_data) {
7 6
   if($mission_data['fleet']['fleet_end_stay'] < SN_TIME_NOW)
8 7
   {
9 8
     DbFleetStatic::fleet_send_back($mission_data['fleet']);
Please login to merge, or discard this patch.
includes/db/db_queries.php 1 patch
Braces   +11 added lines, -22 removed lines patch added patch discarded remove patch
@@ -5,8 +5,7 @@  discard block
 block discarded – undo
5 5
 require_once('db_queries_users.php');
6 6
 
7 7
 
8
-function db_planet_list_admin_list($table_parent_columns, $planet_active, $active_time, $planet_type)
9
-{
8
+function db_planet_list_admin_list($table_parent_columns, $planet_active, $active_time, $planet_type) {
10 9
   return doquery(
11 10
     "SELECT p.*, u.username" . ($table_parent_columns ? ', p1.name AS parent_name' : '') .
12 11
     " FROM {{planets}} AS p
@@ -15,8 +14,7 @@  discard block
 block discarded – undo
15 14
     " WHERE " . ($planet_active ? "p.last_update >= {$active_time}" : "p.planet_type = {$planet_type}"));
16 15
 }
17 16
 
18
-function db_planet_list_search($searchtext)
19
-{
17
+function db_planet_list_search($searchtext) {
20 18
   return doquery(
21 19
     "SELECT
22 20
       p.galaxy, p.system, p.planet, p.planet_type, p.name as planet_name,
@@ -36,8 +34,7 @@  discard block
 block discarded – undo
36 34
 
37 35
 
38 36
 
39
-function db_user_list_search($searchtext)
40
-{
37
+function db_user_list_search($searchtext) {
41 38
   return doquery(
42 39
     "SELECT
43 40
       pn.player_name, u.id as uid, u.username, u.ally_id, u.id_planet, u.total_points, u.total_rank,
@@ -55,8 +52,7 @@  discard block
 block discarded – undo
55 52
   );
56 53
 }
57 54
 
58
-function db_buddy_list_by_user($user_id)
59
-{
55
+function db_buddy_list_by_user($user_id) {
60 56
 //  return ($user_id = intval($user_id)) ? doquery(
61 57
   return ($user_id = idval($user_id)) ? doquery(
62 58
     "SELECT
@@ -86,8 +82,7 @@  discard block
 block discarded – undo
86 82
 
87 83
 
88 84
 
89
-function db_unit_records_sum($unit_id, $user_skip_list_unit)
90
-{
85
+function db_unit_records_sum($unit_id, $user_skip_list_unit) {
91 86
   return doquery (
92 87
     "SELECT unit_player_id, username, sum(unit_level) as unit_level
93 88
           FROM {{unit}} JOIN {{users}} AS u ON u.id = unit_player_id
@@ -98,8 +93,7 @@  discard block
 block discarded – undo
98 93
     , true);
99 94
 }
100 95
 
101
-function db_unit_records_plain($unit_id, $user_skip_list_unit)
102
-{
96
+function db_unit_records_plain($unit_id, $user_skip_list_unit) {
103 97
   return doquery (
104 98
     "SELECT unit_player_id, username, unit_level
105 99
           FROM {{unit}} JOIN {{users}} AS u ON u.id = unit_player_id
@@ -183,15 +177,13 @@  discard block
 block discarded – undo
183 177
 }
184 178
 
185 179
 
186
-function db_stat_list_delete_ally_player()
187
-{
180
+function db_stat_list_delete_ally_player() {
188 181
   return doquery('DELETE s FROM `{{statpoints}}` AS s JOIN `{{users}}` AS u ON u.id = s.id_owner WHERE s.id_ally IS NULL AND u.user_as_ally IS NOT NULL');
189 182
 }
190 183
 
191 184
 
192 185
 
193
-function db_chat_player_list_online($chat_refresh_rate, $ally_add)
194
-{
186
+function db_chat_player_list_online($chat_refresh_rate, $ally_add) {
195 187
   $sql_date = SN_TIME_NOW - $chat_refresh_rate * 2;
196 188
 
197 189
   return doquery(
@@ -205,13 +197,11 @@  discard block
 block discarded – undo
205 197
     ORDER BY authlevel DESC, `username`");
206 198
 }
207 199
 
208
-function db_referrals_list_by_id($user_id)
209
-{
200
+function db_referrals_list_by_id($user_id) {
210 201
   return doquery("SELECT r.*, u.username, u.register_time FROM {{referrals}} AS r LEFT JOIN {{users}} AS u ON u.id = r.id WHERE id_partner = {$user_id}");
211 202
 }
212 203
 
213
-function db_message_list_admin_by_type($int_type_selected, $StartRec)
214
-{
204
+function db_message_list_admin_by_type($int_type_selected, $StartRec) {
215 205
   return doquery("SELECT
216 206
   message_id as `ID`,
217 207
   message_from as `FROM`,
@@ -230,8 +220,7 @@  discard block
 block discarded – undo
230 220
 }
231 221
 
232 222
 
233
-function db_message_insert_all($message_type, $from, $subject, $text)
234
-{
223
+function db_message_insert_all($message_type, $from, $subject, $text) {
235 224
   return doquery($QryInsertMessage = 'INSERT INTO {{messages}} (`message_owner`, `message_sender`, `message_time`, `message_type`, `message_from`, `message_subject`, `message_text`) ' .
236 225
     "SELECT `id`, 0, unix_timestamp(now()), {$message_type}, '{$from}', '{$subject}', '{$text}' FROM {{users}}");
237 226
 }
Please login to merge, or discard this patch.