@@ -13,7 +13,7 @@ discard block |
||
13 | 13 | $unit_level = $artifact_level_old = mrc_get_level($user, null, $unit_id, true); |
14 | 14 | if ($unit_level > 0) { |
15 | 15 | $db_changeset = array(); |
16 | - switch($unit_id) { |
|
16 | + switch ($unit_id) { |
|
17 | 17 | case ART_LHC: |
18 | 18 | case ART_HOOK_SMALL: |
19 | 19 | case ART_HOOK_MEDIUM: |
@@ -133,6 +133,6 @@ discard block |
||
133 | 133 | |
134 | 134 | sn_db_transaction_commit(); |
135 | 135 | message($message, "{$classLocale['tech'][UNIT_ARTIFACTS]} - {$classLocale['tech'][$unit_id]}", |
136 | - ($request_uri = sys_get_param_str_unsafe('REQUEST_URI')) ? $request_uri : ('artifacts' . DOT_PHP_EX . '#' . $unit_id), |
|
136 | + ($request_uri = sys_get_param_str_unsafe('REQUEST_URI')) ? $request_uri : ('artifacts'.DOT_PHP_EX.'#'.$unit_id), |
|
137 | 137 | 5); |
138 | 138 | } |
@@ -21,11 +21,19 @@ discard block |
||
21 | 21 | return empty($result) ? null : $result; |
22 | 22 | } |
23 | 23 | |
24 | + /** |
|
25 | + * @param integer $galaxy |
|
26 | + * @param integer $system |
|
27 | + * @param integer $planet |
|
28 | + */ |
|
24 | 29 | public static function db_planet_by_gspt_safe($galaxy, $system, $planet, $planet_type, $for_update = false, $fields = '*') { |
25 | 30 | return classSupernova::db_get_record_list(LOC_PLANET, |
26 | 31 | "{{planets}}.`galaxy` = {$galaxy} AND {{planets}}.`system` = {$system} AND {{planets}}.`planet` = {$planet} AND {{planets}}.`planet_type` = {$planet_type}", true); |
27 | 32 | } |
28 | 33 | |
34 | + /** |
|
35 | + * @param integer $planet_type |
|
36 | + */ |
|
29 | 37 | public static function db_planet_by_gspt($galaxy, $system, $planet, $planet_type, $for_update = false, $fields = '*') { |
30 | 38 | $galaxy = intval($galaxy); |
31 | 39 | $system = intval($system); |
@@ -120,6 +128,9 @@ discard block |
||
120 | 128 | "`id_owner` = '{$user_row['id']}' {$conditions} ORDER BY {$order_by}"); |
121 | 129 | } |
122 | 130 | |
131 | + /** |
|
132 | + * @param integer $planet_id |
|
133 | + */ |
|
123 | 134 | public static function db_planet_list_by_user_or_planet($user_id, $planet_id) { |
124 | 135 | if(!($user_id = idval($user_id)) && !($planet_id = idval($planet_id))) { |
125 | 136 | return false; |
@@ -138,6 +149,9 @@ discard block |
||
138 | 149 | return classSupernova::db_upd_record_by_id(LOC_PLANET, $planet_id, $set); |
139 | 150 | } |
140 | 151 | |
152 | + /** |
|
153 | + * @param integer $ui_planet_type |
|
154 | + */ |
|
141 | 155 | public static function db_planet_set_by_gspt($ui_galaxy, $ui_system, $ui_planet, $ui_planet_type = PT_ALL, $set) { |
142 | 156 | if(!($set = trim($set))) { |
143 | 157 | return false; |
@@ -36,11 +36,10 @@ discard block |
||
36 | 36 | } |
37 | 37 | |
38 | 38 | public static function db_planet_by_vector($vector, $prefix = '', $for_update = false, $fields = '*') { |
39 | - $galaxy = isset($vector[$prefix . 'galaxy']) ? intval($vector[$prefix . 'galaxy']) : 0; |
|
40 | - $system = isset($vector[$prefix . 'system']) ? intval($vector[$prefix . 'system']) : 0; |
|
41 | - $planet = isset($vector[$prefix . 'planet']) ? intval($vector[$prefix . 'planet']) : 0; |
|
42 | - $planet_type = isset($vector[$prefix . 'planet_type']) ? intval($vector[$prefix . 'planet_type']) : |
|
43 | - (isset($vector[$prefix . 'type']) ? intval($vector[$prefix . 'type']) : 0); |
|
39 | + $galaxy = isset($vector[$prefix.'galaxy']) ? intval($vector[$prefix.'galaxy']) : 0; |
|
40 | + $system = isset($vector[$prefix.'system']) ? intval($vector[$prefix.'system']) : 0; |
|
41 | + $planet = isset($vector[$prefix.'planet']) ? intval($vector[$prefix.'planet']) : 0; |
|
42 | + $planet_type = isset($vector[$prefix.'planet_type']) ? intval($vector[$prefix.'planet_type']) : (isset($vector[$prefix.'type']) ? intval($vector[$prefix.'type']) : 0); |
|
44 | 43 | $planet_type = $planet_type == PT_DEBRIS ? PT_PLANET : $planet_type; |
45 | 44 | |
46 | 45 | return DBStaticPlanet::db_planet_by_gspt_safe($galaxy, $system, $planet, $planet_type, $for_update, $fields); |
@@ -61,17 +60,17 @@ discard block |
||
61 | 60 | } |
62 | 61 | |
63 | 62 | public static function db_planet_by_parent($parent_id, $for_update = false, $fields = '*') { |
64 | - if(!($parent_id = idval($parent_id))) { |
|
63 | + if (!($parent_id = idval($parent_id))) { |
|
65 | 64 | return false; |
66 | 65 | } |
67 | 66 | |
68 | 67 | return classSupernova::db_get_record_list(LOC_PLANET, |
69 | - "`parent_planet` = {$parent_id} AND `planet_type` = " . PT_MOON, true); |
|
68 | + "`parent_planet` = {$parent_id} AND `planet_type` = ".PT_MOON, true); |
|
70 | 69 | } |
71 | 70 | |
72 | 71 | public static function db_planet_by_id_and_owner($planet_id, $owner_id, $for_update = false, $fields = '*') { |
73 | 72 | //if(!($planet_id = intval($planet_id)) || !($owner_id = intval($owner_id))) return false; |
74 | - if(!($planet_id = idval($planet_id)) || !($owner_id = idval($owner_id))) { |
|
73 | + if (!($planet_id = idval($planet_id)) || !($owner_id = idval($owner_id))) { |
|
75 | 74 | return false; |
76 | 75 | } |
77 | 76 | |
@@ -82,12 +81,12 @@ discard block |
||
82 | 81 | |
83 | 82 | public static function db_planet_list_moon_other($user_id, $this_moon_id) { |
84 | 83 | // if(!($user_id = intval($user_id)) || !($this_moon_id = intval($this_moon_id))) return false; |
85 | - if(!($user_id = idval($user_id)) || !($this_moon_id = idval($this_moon_id))) { |
|
84 | + if (!($user_id = idval($user_id)) || !($this_moon_id = idval($this_moon_id))) { |
|
86 | 85 | return false; |
87 | 86 | } |
88 | 87 | |
89 | 88 | return classSupernova::db_get_record_list(LOC_PLANET, |
90 | - "`planet_type` = " . PT_MOON . " AND `id_owner` = {$user_id} AND `id` != {$this_moon_id}"); |
|
89 | + "`planet_type` = ".PT_MOON." AND `id_owner` = {$user_id} AND `id` != {$this_moon_id}"); |
|
91 | 90 | } |
92 | 91 | |
93 | 92 | public static function db_planet_list_in_system($galaxy, $system) { |
@@ -99,7 +98,7 @@ discard block |
||
99 | 98 | } |
100 | 99 | |
101 | 100 | public static function db_planet_list_sorted($user_row, $skip_planet_id = false, $field_list = '', $conditions = '') { |
102 | - if(!is_array($user_row)) { |
|
101 | + if (!is_array($user_row)) { |
|
103 | 102 | return false; |
104 | 103 | } |
105 | 104 | // $field_list = $field_list != '*' ? "{{planets}}.`id`, `name`, `image`, {{planets}}.`galaxy`, {{planets}}.`system`, {{planets}}.`planet`, `planet_type`{$field_list}" : $field_list; |
@@ -113,7 +112,7 @@ discard block |
||
113 | 112 | ); |
114 | 113 | $order_by = classSupernova::$user_options[PLAYER_OPTION_PLANET_SORT]; |
115 | 114 | empty($sort_orders[$order_by]) ? $order_by = SORT_ID : false; |
116 | - $order_by = $sort_orders[$order_by] . ' ' . (classSupernova::$user_options[PLAYER_OPTION_PLANET_SORT_INVERSE] == SORT_ASCENDING ? 'ASC' : 'DESC'); |
|
115 | + $order_by = $sort_orders[$order_by].' '.(classSupernova::$user_options[PLAYER_OPTION_PLANET_SORT_INVERSE] == SORT_ASCENDING ? 'ASC' : 'DESC'); |
|
117 | 116 | |
118 | 117 | // Compilating query |
119 | 118 | return classSupernova::db_get_record_list(LOC_PLANET, |
@@ -121,7 +120,7 @@ discard block |
||
121 | 120 | } |
122 | 121 | |
123 | 122 | public static function db_planet_list_by_user_or_planet($user_id, $planet_id) { |
124 | - if(!($user_id = idval($user_id)) && !($planet_id = idval($planet_id))) { |
|
123 | + if (!($user_id = idval($user_id)) && !($planet_id = idval($planet_id))) { |
|
125 | 124 | return false; |
126 | 125 | } |
127 | 126 | |
@@ -131,7 +130,7 @@ discard block |
||
131 | 130 | |
132 | 131 | public static function db_planet_set_by_id($planet_id, $set) { |
133 | 132 | // if(!($planet_id = intval($planet_id))) return false; |
134 | - if(!($planet_id = idval($planet_id))) { |
|
133 | + if (!($planet_id = idval($planet_id))) { |
|
135 | 134 | return false; |
136 | 135 | } |
137 | 136 | |
@@ -139,7 +138,7 @@ discard block |
||
139 | 138 | } |
140 | 139 | |
141 | 140 | public static function db_planet_set_by_gspt($ui_galaxy, $ui_system, $ui_planet, $ui_planet_type = PT_ALL, $set) { |
142 | - if(!($set = trim($set))) { |
|
141 | + if (!($set = trim($set))) { |
|
143 | 142 | return false; |
144 | 143 | } |
145 | 144 | |
@@ -153,7 +152,7 @@ discard block |
||
153 | 152 | |
154 | 153 | public static function db_planet_set_by_parent($ui_parent_id, $ss_set) { |
155 | 154 | //if(!($si_parent_id = intval($ui_parent_id)) || !($ss_set = trim($ss_set))) return false; |
156 | - if(!($si_parent_id = idval($ui_parent_id)) || !($ss_set = trim($ss_set))) { |
|
155 | + if (!($si_parent_id = idval($ui_parent_id)) || !($ss_set = trim($ss_set))) { |
|
157 | 156 | return false; |
158 | 157 | } |
159 | 158 | |
@@ -162,7 +161,7 @@ discard block |
||
162 | 161 | |
163 | 162 | public static function db_planet_set_by_owner($ui_owner_id, $ss_set) { |
164 | 163 | //if(!($si_owner_id = intval($ui_owner_id)) || !($ss_set = trim($ss_set))) return false; |
165 | - if(!($si_owner_id = idval($ui_owner_id)) || !($ss_set = trim($ss_set))) { |
|
164 | + if (!($si_owner_id = idval($ui_owner_id)) || !($ss_set = trim($ss_set))) { |
|
166 | 165 | return false; |
167 | 166 | } |
168 | 167 | |
@@ -172,11 +171,11 @@ discard block |
||
172 | 171 | |
173 | 172 | public static function db_planet_delete_by_id($planet_id) { |
174 | 173 | // if(!($planet_id = intval($planet_id))) return false; |
175 | - if(!($planet_id = idval($planet_id))) { |
|
174 | + if (!($planet_id = idval($planet_id))) { |
|
176 | 175 | return false; |
177 | 176 | } |
178 | 177 | classSupernova::db_del_record_by_id(LOC_PLANET, $planet_id); |
179 | - classSupernova::db_del_record_list(LOC_UNIT, "`unit_location_type` = " . LOC_PLANET . " AND `unit_location_id` = " . $planet_id); |
|
178 | + classSupernova::db_del_record_list(LOC_UNIT, "`unit_location_type` = ".LOC_PLANET." AND `unit_location_id` = ".$planet_id); |
|
180 | 179 | |
181 | 180 | // Очереди очистятся автоматически по FOREIGN KEY |
182 | 181 | return true; |
@@ -184,11 +183,11 @@ discard block |
||
184 | 183 | |
185 | 184 | public static function db_planet_list_delete_by_owner($ui_owner_id) { |
186 | 185 | // if(!($si_owner_id = intval($ui_owner_id))) return false; |
187 | - if(!($si_owner_id = idval($ui_owner_id))) { |
|
186 | + if (!($si_owner_id = idval($ui_owner_id))) { |
|
188 | 187 | return false; |
189 | 188 | } |
190 | 189 | classSupernova::db_del_record_list(LOC_PLANET, "`id_owner` = {$si_owner_id}"); |
191 | - classSupernova::db_del_record_list(LOC_UNIT, "`unit_location_type` = " . LOC_PLANET . " AND `unit_player_id` = " . $si_owner_id); |
|
190 | + classSupernova::db_del_record_list(LOC_UNIT, "`unit_location_type` = ".LOC_PLANET." AND `unit_player_id` = ".$si_owner_id); |
|
192 | 191 | |
193 | 192 | // Очереди очистятся автоматически по FOREIGN KEY |
194 | 193 | return true; |
@@ -56,6 +56,9 @@ discard block |
||
56 | 56 | 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 . ");"); |
57 | 57 | } |
58 | 58 | |
59 | + /** |
|
60 | + * @param string $set |
|
61 | + */ |
|
59 | 62 | public static function db_unit_set_by_id($unit_id, $set) { |
60 | 63 | return classSupernova::db_upd_record_by_id(LOC_UNIT, $unit_id, $set); |
61 | 64 | } |
@@ -69,6 +72,9 @@ discard block |
||
69 | 72 | return classSupernova::db_ins_record(LOC_UNIT, $set); |
70 | 73 | } |
71 | 74 | |
75 | + /** |
|
76 | + * @param integer $unit_location_type |
|
77 | + */ |
|
72 | 78 | public static function db_unit_list_delete($user_id = 0, $unit_location_type, $unit_location_id, $unit_snid = 0) { |
73 | 79 | return classSupernova::db_del_record_list(LOC_UNIT, |
74 | 80 | "`unit_location_type` = {$unit_location_type} AND `unit_location_id` = {$unit_location_id}" . |
@@ -21,13 +21,13 @@ discard block |
||
21 | 21 | |
22 | 22 | public static function db_unit_count_by_user_and_type_and_snid($user_id, $unit_type = 0, $unit_snid = 0) { |
23 | 23 | $query = doquery( |
24 | - "SELECT unit_snid, sum(unit_level) as `qty` FROM {{unit}} WHERE `unit_player_id` = {$user_id} " . |
|
25 | - ($unit_type ? "AND `unit_type` = {$unit_type} " : '') . |
|
26 | - ($unit_snid ? "AND `unit_snid` = {$unit_snid} " : '') . |
|
24 | + "SELECT unit_snid, sum(unit_level) as `qty` FROM {{unit}} WHERE `unit_player_id` = {$user_id} ". |
|
25 | + ($unit_type ? "AND `unit_type` = {$unit_type} " : ''). |
|
26 | + ($unit_snid ? "AND `unit_snid` = {$unit_snid} " : ''). |
|
27 | 27 | 'GROUP BY `unit_snid`' |
28 | 28 | ); |
29 | 29 | $result = array(); |
30 | - while($row = db_fetch($query)) { |
|
30 | + while ($row = db_fetch($query)) { |
|
31 | 31 | $result[$row['unit_snid']] = $row; |
32 | 32 | } |
33 | 33 | |
@@ -43,8 +43,8 @@ discard block |
||
43 | 43 | WHERE |
44 | 44 | f.fleet_owner = {$user_id} AND |
45 | 45 | (f.fleet_start_planet_id = {$location_id} OR f.fleet_end_planet_id = {$location_id}) |
46 | - AND u.unit_snid = {$unit_snid} AND u.`unit_location_type` = " . LOC_FLEET . " AND " . self::db_unit_time_restrictions() . |
|
47 | - " LIMIT 1" . |
|
46 | + AND u.unit_snid = {$unit_snid} AND u.`unit_location_type` = ".LOC_FLEET." AND ".self::db_unit_time_restrictions(). |
|
47 | + " LIMIT 1". |
|
48 | 48 | ($for_update ? ' FOR UPDATE' : '') |
49 | 49 | , true); |
50 | 50 | } |
@@ -53,7 +53,7 @@ discard block |
||
53 | 53 | public static function db_unit_list_laboratories($user_id) { |
54 | 54 | return doquery("SELECT DISTINCT unit_location_id AS `id` |
55 | 55 | FROM {{unit}} |
56 | - 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 . ");"); |
|
56 | + 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.");"); |
|
57 | 57 | } |
58 | 58 | |
59 | 59 | public static function db_unit_set_by_id($unit_id, $set) { |
@@ -71,9 +71,9 @@ discard block |
||
71 | 71 | |
72 | 72 | public static function db_unit_list_delete($user_id = 0, $unit_location_type, $unit_location_id = 0, $unit_snid = 0) { |
73 | 73 | return classSupernova::db_del_record_list(LOC_UNIT, |
74 | - "`unit_location_type` = {$unit_location_type}" . |
|
75 | - ($unit_location_id = idval($unit_location_id) ? " AND `unit_location_id` = {$unit_location_id}" : '') . |
|
76 | - ($user_id = idval($user_id) ? " AND `unit_player_id` = {$user_id}" : '') . |
|
74 | + "`unit_location_type` = {$unit_location_type}". |
|
75 | + ($unit_location_id = idval($unit_location_id) ? " AND `unit_location_id` = {$unit_location_id}" : ''). |
|
76 | + ($user_id = idval($user_id) ? " AND `unit_player_id` = {$user_id}" : ''). |
|
77 | 77 | ($unit_snid = idval($unit_snid) ? " AND `unit_snid` = {$unit_snid}" : '')); |
78 | 78 | } |
79 | 79 | |
@@ -81,7 +81,7 @@ discard block |
||
81 | 81 | return doquery( |
82 | 82 | "SELECT unit_player_id, unit_type, unit_snid, unit_level, count(*) AS unit_amount |
83 | 83 | FROM `{{unit}}` |
84 | - WHERE unit_level > 0 AND " . self::db_unit_time_restrictions() . |
|
84 | + WHERE unit_level > 0 AND " . self::db_unit_time_restrictions(). |
|
85 | 85 | " GROUP BY unit_player_id, unit_type, unit_snid, unit_level" |
86 | 86 | ); |
87 | 87 | } |
@@ -93,15 +93,15 @@ discard block |
||
93 | 93 | |
94 | 94 | |
95 | 95 | public static function db_unit_list_admin_delete_mercenaries_finished() { |
96 | - return doquery("DELETE FROM {{unit}} WHERE unit_time_finish IS NOT NULL AND unit_time_finish < FROM_UNIXTIME(" . SN_TIME_NOW . ") AND unit_type = " . UNIT_MERCENARIES); |
|
96 | + return doquery("DELETE FROM {{unit}} WHERE unit_time_finish IS NOT NULL AND unit_time_finish < FROM_UNIXTIME(".SN_TIME_NOW.") AND unit_type = ".UNIT_MERCENARIES); |
|
97 | 97 | } |
98 | 98 | |
99 | 99 | public static function db_unit_list_admin_set_mercenaries_expire_time($default_length) { |
100 | 100 | return doquery( |
101 | 101 | "UPDATE {{unit}} |
102 | 102 | SET |
103 | - unit_time_start = FROM_UNIXTIME(" . SN_TIME_NOW . "), |
|
104 | - unit_time_finish = FROM_UNIXTIME(" . (SN_TIME_NOW + $default_length) . ") |
|
103 | + unit_time_start = FROM_UNIXTIME(" . SN_TIME_NOW."), |
|
104 | + unit_time_finish = FROM_UNIXTIME(" . (SN_TIME_NOW + $default_length).") |
|
105 | 105 | WHERE unit_type = " . UNIT_MERCENARIES |
106 | 106 | ); |
107 | 107 | } |
@@ -293,7 +293,7 @@ |
||
293 | 293 | } |
294 | 294 | |
295 | 295 | /** |
296 | - * @param $ranklist |
|
296 | + * @param string $ranklist |
|
297 | 297 | * @param $user |
298 | 298 | */ |
299 | 299 | public static function db_ally_update_ranklist($ranklist, $user) { |
@@ -66,9 +66,9 @@ discard block |
||
66 | 66 | `ally_name` = '{$ally_name}', |
67 | 67 | `ally_tag` = '{$ally_tag}', |
68 | 68 | `ally_owner` = '{$user['id']}', |
69 | - `ally_owner_range` = '" . classLocale::$lang['ali_leaderRank'] . "', |
|
69 | + `ally_owner_range` = '".classLocale::$lang['ali_leaderRank']."', |
|
70 | 70 | `ally_members` = 1, |
71 | - `ranklist` = '" . classLocale::$lang['ali_defaultRankName'] . ",0,0,0,0,0', |
|
71 | + `ranklist` = '" . classLocale::$lang['ali_defaultRankName'].",0,0,0,0,0', |
|
72 | 72 | `ally_register_time`= " . SN_TIME_NOW |
73 | 73 | ); |
74 | 74 | } |
@@ -87,7 +87,7 @@ discard block |
||
87 | 87 | * @param $POST_text |
88 | 88 | */ |
89 | 89 | public static function db_ally_request_insert($user, $id_ally, $POST_text) { |
90 | - doquery("INSERT INTO {{alliance_requests}} SET `id_user` = {$user['id']}, `id_ally`='{$id_ally}', request_text ='{$POST_text}', request_time=" . SN_TIME_NOW . ";"); |
|
90 | + doquery("INSERT INTO {{alliance_requests}} SET `id_user` = {$user['id']}, `id_ally`='{$id_ally}', request_text ='{$POST_text}', request_time=".SN_TIME_NOW.";"); |
|
91 | 91 | } |
92 | 92 | |
93 | 93 | /** |
@@ -137,7 +137,7 @@ discard block |
||
137 | 137 | * @param $ally |
138 | 138 | */ |
139 | 139 | public static function db_ally_update_by_changeset($ally_changeset, $ally) { |
140 | - doquery("UPDATE {{alliance}} SET " . implode(',', $ally_changeset) . " WHERE `id`='{$ally['id']}' LIMIT 1;"); |
|
140 | + doquery("UPDATE {{alliance}} SET ".implode(',', $ally_changeset)." WHERE `id`='{$ally['id']}' LIMIT 1;"); |
|
141 | 141 | } |
142 | 142 | |
143 | 143 | /** |
@@ -248,7 +248,7 @@ discard block |
||
248 | 248 | * @param $d |
249 | 249 | */ |
250 | 250 | public static function db_ally_request_deny($d) { |
251 | - doquery("UPDATE {{alliance_requests}} SET `request_denied` = 1, `request_text` = '" . classLocale::$lang['ali_req_deny_reason'] . "' WHERE `id_user`= {$d} LIMIT 1;"); |
|
251 | + doquery("UPDATE {{alliance_requests}} SET `request_denied` = 1, `request_text` = '".classLocale::$lang['ali_req_deny_reason']."' WHERE `id_user`= {$d} LIMIT 1;"); |
|
252 | 252 | } |
253 | 253 | |
254 | 254 | /** |
@@ -19,9 +19,9 @@ discard block |
||
19 | 19 | |
20 | 20 | /** |
21 | 21 | * @param $user_id |
22 | - * @param $nick |
|
22 | + * @param string $nick |
|
23 | 23 | * @param $ally_id |
24 | - * @param $message |
|
24 | + * @param string $message |
|
25 | 25 | * @param $chat_message_sender_name |
26 | 26 | * @param $chat_message_recipient_id |
27 | 27 | * @param $chat_message_recipient_name |
@@ -57,7 +57,7 @@ discard block |
||
57 | 57 | * @param $alliance |
58 | 58 | * @param $where_add |
59 | 59 | * @param $start_row |
60 | - * @param $page_limit |
|
60 | + * @param integer $page_limit |
|
61 | 61 | * |
62 | 62 | * @return array|bool|mysqli_result|null |
63 | 63 | */ |
@@ -12,7 +12,7 @@ discard block |
||
12 | 12 | JOIN {{users}} AS u ON u.id = cp.chat_player_player_id |
13 | 13 | WHERE |
14 | 14 | `chat_player_refresh_last` >= '{$sql_date}' |
15 | - AND (`banaday` IS NULL OR `banaday` <= " . SN_TIME_NOW . ") |
|
15 | + AND (`banaday` IS NULL OR `banaday` <= ".SN_TIME_NOW.") |
|
16 | 16 | {$ally_add} |
17 | 17 | ORDER BY authlevel DESC, `username`"); |
18 | 18 | } |
@@ -35,7 +35,7 @@ discard block |
||
35 | 35 | `user` = '{$nick}', |
36 | 36 | `ally_id` = '{$ally_id}', |
37 | 37 | `message` = '{$message}', |
38 | - `timestamp` = " . SN_TIME_NOW . ", |
|
38 | + `timestamp` = ".SN_TIME_NOW.", |
|
39 | 39 | `chat_message_sender_name` = '{$chat_message_sender_name}', |
40 | 40 | `chat_message_recipient_id` = {$chat_message_recipient_id}, |
41 | 41 | `chat_message_recipient_name` = '{$chat_message_recipient_name}'" |
@@ -141,7 +141,7 @@ discard block |
||
141 | 141 | * @param $user |
142 | 142 | */ |
143 | 143 | public static function db_chat_player_update($user) { |
144 | - doquery("UPDATE {{chat_player}} SET `chat_player_refresh_last` = " . SN_TIME_NOW . " WHERE `chat_player_player_id` = {$user['id']} LIMIT 1;"); |
|
144 | + doquery("UPDATE {{chat_player}} SET `chat_player_refresh_last` = ".SN_TIME_NOW." WHERE `chat_player_player_id` = {$user['id']} LIMIT 1;"); |
|
145 | 145 | } |
146 | 146 | |
147 | 147 | |
@@ -212,7 +212,7 @@ discard block |
||
212 | 212 | * @param $user |
213 | 213 | */ |
214 | 214 | public static function db_chat_player_update_activity($user) { |
215 | - doquery("UPDATE {{chat_player}} SET `chat_player_activity` = '" . classSupernova::$db->db_escape(SN_TIME_SQL) . "' WHERE `chat_player_player_id` = {$user['id']} LIMIT 1"); |
|
215 | + doquery("UPDATE {{chat_player}} SET `chat_player_activity` = '".classSupernova::$db->db_escape(SN_TIME_SQL)."' WHERE `chat_player_player_id` = {$user['id']} LIMIT 1"); |
|
216 | 216 | } |
217 | 217 | |
218 | 218 | } |
219 | 219 | \ No newline at end of file |
@@ -75,7 +75,7 @@ |
||
75 | 75 | |
76 | 76 | |
77 | 77 | /** |
78 | - * @param $fleet_group_id_list |
|
78 | + * @param string $fleet_group_id_list |
|
79 | 79 | */ |
80 | 80 | public static function db_acs_delete_by_list($fleet_group_id_list) { |
81 | 81 | doquery("DELETE FROM {{aks}} WHERE `id` IN ({$fleet_group_id_list})"); |
@@ -51,16 +51,16 @@ |
||
51 | 51 | */ |
52 | 52 | public static function db_acs_insert($fleetid, $user, $objFleet) { |
53 | 53 | doquery("INSERT INTO {{aks}} SET |
54 | - `name` = '" . db_escape(classLocale::$lang['flt_acs_prefix'] . $fleetid) . "', |
|
55 | - `teilnehmer` = '" . $user['id'] . "', |
|
56 | - `flotten` = '" . $fleetid . "', |
|
57 | - `ankunft` = '" . $objFleet->time_arrive_to_target . "', |
|
58 | - `galaxy` = '" . $objFleet->fleet_end_galaxy . "', |
|
59 | - `system` = '" . $objFleet->fleet_end_system . "', |
|
60 | - `planet` = '" . $objFleet->fleet_end_planet . "', |
|
61 | - `planet_type` = '" . $objFleet->fleet_end_type . "', |
|
62 | - `eingeladen` = '" . $user['id'] . "', |
|
63 | - `fleet_end_time` = '" . $objFleet->time_return_to_source . "'"); |
|
54 | + `name` = '" . db_escape(classLocale::$lang['flt_acs_prefix'].$fleetid)."', |
|
55 | + `teilnehmer` = '" . $user['id']."', |
|
56 | + `flotten` = '" . $fleetid."', |
|
57 | + `ankunft` = '" . $objFleet->time_arrive_to_target."', |
|
58 | + `galaxy` = '" . $objFleet->fleet_end_galaxy."', |
|
59 | + `system` = '" . $objFleet->fleet_end_system."', |
|
60 | + `planet` = '" . $objFleet->fleet_end_planet."', |
|
61 | + `planet_type` = '" . $objFleet->fleet_end_type."', |
|
62 | + `eingeladen` = '" . $user['id']."', |
|
63 | + `fleet_end_time` = '" . $objFleet->time_return_to_source."'"); |
|
64 | 64 | } |
65 | 65 | |
66 | 66 | /** |
@@ -25,9 +25,9 @@ |
||
25 | 25 | } |
26 | 26 | |
27 | 27 | /** |
28 | - * @param $template |
|
29 | - * @param $query_where |
|
30 | - * @param $query_limit |
|
28 | + * @param template $template |
|
29 | + * @param string $query_where |
|
30 | + * @param integer $query_limit |
|
31 | 31 | * |
32 | 32 | * @return array|bool|mysqli_result|null |
33 | 33 | */ |
@@ -12,7 +12,7 @@ discard block |
||
12 | 12 | function db_news_insert_set($announce_time, $text, $detail_url, $user) { |
13 | 13 | doquery("INSERT INTO {{announce}} |
14 | 14 | SET `tsTimeStamp` = FROM_UNIXTIME({$announce_time}), `strAnnounce`='{$text}', detail_url = '{$detail_url}', |
15 | - `user_id` = {$user['id']}, `user_name` = '" . db_escape($user['username']) . "'"); |
|
15 | + `user_id` = {$user['id']}, `user_name` = '".db_escape($user['username'])."'"); |
|
16 | 16 | } |
17 | 17 | |
18 | 18 | function db_survey_insert($announce_id, $survey_question, $survey_until) { |
@@ -93,7 +93,7 @@ discard block |
||
93 | 93 | LEFT JOIN {{survey}} AS s ON s.survey_announce_id = a.idAnnounce |
94 | 94 | LEFT JOIN {{users}} AS u ON u.id = a.user_id |
95 | 95 | {$query_where} |
96 | - ORDER BY `tsTimeStamp` DESC, idAnnounce" . |
|
96 | + ORDER BY `tsTimeStamp` DESC, idAnnounce". |
|
97 | 97 | ($query_limit ? " LIMIT {$query_limit}" : '')); |
98 | 98 | |
99 | 99 | $template->assign_var('NEWS_COUNT', db_num_rows($announce_list)); |
@@ -17,7 +17,7 @@ |
||
17 | 17 | * @param $user |
18 | 18 | * @param $survey_id |
19 | 19 | * @param $survey_vote_id |
20 | - * @param $user_name_safe |
|
20 | + * @param string $user_name_safe |
|
21 | 21 | */ |
22 | 22 | public static function db_survey_vote_insert(&$user, $survey_id, $survey_vote_id, $user_name_safe) { |
23 | 23 | doquery("INSERT INTO {{survey_votes}} SET `survey_parent_id` = {$survey_id}, `survey_parent_answer_id` = {$survey_vote_id}, `survey_vote_user_id` = {$user['id']}, `survey_vote_user_name` = '{$user_name_safe}';"); |
@@ -23,7 +23,7 @@ |
||
23 | 23 | * @return array|bool|mysqli_result|null |
24 | 24 | */ |
25 | 25 | public static function db_missile_list_by_arrival() { |
26 | - $iraks = doquery("SELECT * FROM {{iraks}} WHERE `fleet_end_time` <= " . SN_TIME_NOW . " FOR UPDATE;"); |
|
26 | + $iraks = doquery("SELECT * FROM {{iraks}} WHERE `fleet_end_time` <= ".SN_TIME_NOW." FOR UPDATE;"); |
|
27 | 27 | |
28 | 28 | return $iraks; |
29 | 29 | } |