@@ -179,7 +179,7 @@ discard block |
||
179 | 179 | $template->assign_vars($quest_templatized); |
180 | 180 | if (!empty($quest_templatized['quest_rewards_list'])) { |
181 | 181 | foreach ($quest_templatized['quest_rewards_list'] as $quest_reward) { |
182 | - $template->assign_block_vars(($block_name ? $block_name . '.' : '') . 'quest_rewards_list', $quest_reward); |
|
182 | + $template->assign_block_vars(($block_name ? $block_name.'.' : '').'quest_rewards_list', $quest_reward); |
|
183 | 183 | } |
184 | 184 | } |
185 | 185 | } |
@@ -249,10 +249,10 @@ discard block |
||
249 | 249 | |
250 | 250 | $comment_reward = array(); |
251 | 251 | foreach ($reward_list as $unit_id => $unit_amount) { |
252 | - $comment_reward[] = $unit_amount . ' ' . classLocale::$lang['tech'][$unit_id]; |
|
252 | + $comment_reward[] = $unit_amount.' '.classLocale::$lang['tech'][$unit_id]; |
|
253 | 253 | $total_rewards[$user_id][$planet_id][$unit_id] += $unit_amount; |
254 | 254 | } |
255 | - $comment .= " {$classLocale['qst_msg_your_reward']} " . implode(',', $comment_reward); |
|
255 | + $comment .= " {$classLocale['qst_msg_your_reward']} ".implode(',', $comment_reward); |
|
256 | 256 | |
257 | 257 | msg_send_simple_message($user['id'], 0, SN_TIME_NOW, MSG_TYPE_ADMIN, classLocale::$lang['msg_from_admin'], classLocale::$lang['qst_msg_complete_subject'], $comment); |
258 | 258 |
@@ -54,7 +54,7 @@ |
||
54 | 54 | $comment = call_user_func_array('sprintf', $comment); |
55 | 55 | } |
56 | 56 | // mm_points_change($user_id, $change_type, -$metamatter_to_reduce, 'ММ в ТМ: ' . (-$dark_matter) . ' ТМ = ' . $dark_matter_exists . ' ТМ + ' . $metamatter_to_reduce . ' ММ. ' . $comment); |
57 | - classSupernova::$auth->account->metamatter_change($change_type, -$metamatter_to_reduce, 'ММ в ТМ: ' . (-$dark_matter) . ' ТМ = ' . $dark_matter_exists . ' ТМ + ' . $metamatter_to_reduce . ' ММ. ' . $comment); |
|
57 | + classSupernova::$auth->account->metamatter_change($change_type, -$metamatter_to_reduce, 'ММ в ТМ: '.(-$dark_matter).' ТМ = '.$dark_matter_exists.' ТМ + '.$metamatter_to_reduce.' ММ. '.$comment); |
|
58 | 58 | $dark_matter = -$dark_matter_exists; |
59 | 59 | } |
60 | 60 | } else { |
@@ -15,10 +15,10 @@ discard block |
||
15 | 15 | // classSupernova::$db->sn_db_connect(); |
16 | 16 | if (!(strpos($query, '{{') === false)) { |
17 | 17 | foreach ($update_tables as $tableName => $cork) { |
18 | - $query = str_replace("{{{$tableName}}}", classSupernova::$db->db_prefix . $tableName, $query); |
|
18 | + $query = str_replace("{{{$tableName}}}", classSupernova::$db->db_prefix.$tableName, $query); |
|
19 | 19 | } |
20 | 20 | } |
21 | - !($result = classSupernova::$db->db_sql_query($query)) ? die('Query error for ' . $query . ': ' . db_error()) : false; |
|
21 | + !($result = classSupernova::$db->db_sql_query($query)) ? die('Query error for '.$query.': '.db_error()) : false; |
|
22 | 22 | |
23 | 23 | return $result; |
24 | 24 | } |
@@ -85,7 +85,7 @@ discard block |
||
85 | 85 | global $update_tables, $update_indexes, $update_indexes_full, $update_foreigns; |
86 | 86 | |
87 | 87 | $tableName = $prefixed ? str_replace(classSupernova::$config->db_prefix, '', $prefix_table_name) : $prefix_table_name; |
88 | - $prefix_table_name = $prefixed ? $prefix_table_name : classSupernova::$config->db_prefix . $prefix_table_name; |
|
88 | + $prefix_table_name = $prefixed ? $prefix_table_name : classSupernova::$config->db_prefix.$prefix_table_name; |
|
89 | 89 | |
90 | 90 | upd_unset_table_info($tableName); |
91 | 91 | |
@@ -100,7 +100,7 @@ discard block |
||
100 | 100 | $update_indexes_full[$tableName][$r1['Key_name']][$r1['Column_name']] = $r1; |
101 | 101 | } |
102 | 102 | |
103 | - $q1 = upd_do_query("SELECT * FROM `information_schema`.`KEY_COLUMN_USAGE` WHERE `TABLE_SCHEMA` = '" . db_escape(classSupernova::$db_name) . "' AND TABLE_NAME = '{$prefix_table_name}' AND REFERENCED_TABLE_NAME is not null;", true); |
|
103 | + $q1 = upd_do_query("SELECT * FROM `information_schema`.`KEY_COLUMN_USAGE` WHERE `TABLE_SCHEMA` = '".db_escape(classSupernova::$db_name)."' AND TABLE_NAME = '{$prefix_table_name}' AND REFERENCED_TABLE_NAME is not null;", true); |
|
104 | 104 | while ($r1 = db_fetch($q1)) { |
105 | 105 | $table_referenced = str_replace(classSupernova::$config->db_prefix, '', $r1['REFERENCED_TABLE_NAME']); |
106 | 106 | |
@@ -160,7 +160,7 @@ discard block |
||
160 | 160 | $result = upd_do_query("CREATE TABLE IF NOT EXISTS `{$db_prefix}{$table_name}` {$declaration}"); |
161 | 161 | $error = db_error(); |
162 | 162 | if ($error) { |
163 | - die("Creating error for table `{$table_name}`: {$error}<br />" . dump($declaration)); |
|
163 | + die("Creating error for table `{$table_name}`: {$error}<br />".dump($declaration)); |
|
164 | 164 | } |
165 | 165 | upd_do_query('set foreign_key_checks = 1;', true); |
166 | 166 | upd_load_table_info($table_name, false); |
@@ -175,10 +175,10 @@ discard block |
||
175 | 175 | "SELECT {$fields} |
176 | 176 | FROM {{unit}} |
177 | 177 | WHERE |
178 | - `unit_location_type` = {$location_type} AND `unit_location_id` = {$location_id} AND " . db_unit_time_restrictions() . |
|
179 | - ($user_id = intval($user_id) ? " AND `unit_player_id` = {$user_id}" : '') . |
|
180 | - ($unit_snid = intval($unit_snid) ? " AND `unit_snid` = {$unit_snid}" : '') . |
|
181 | - " LIMIT 1" . |
|
178 | + `unit_location_type` = {$location_type} AND `unit_location_id` = {$location_id} AND ".db_unit_time_restrictions(). |
|
179 | + ($user_id = intval($user_id) ? " AND `unit_player_id` = {$user_id}" : ''). |
|
180 | + ($unit_snid = intval($unit_snid) ? " AND `unit_snid` = {$unit_snid}" : ''). |
|
181 | + " LIMIT 1". |
|
182 | 182 | ($for_update ? ' FOR UPDATE' : '') |
183 | 183 | )); |
184 | 184 | } |
@@ -259,7 +259,7 @@ discard block |
||
259 | 259 | foreach ($table_data as $record_id => $conditions) { |
260 | 260 | $where = ''; |
261 | 261 | if (!empty($conditions['where'])) { |
262 | - $where = 'WHERE ' . implode(' AND ', $conditions['where']); |
|
262 | + $where = 'WHERE '.implode(' AND ', $conditions['where']); |
|
263 | 263 | } |
264 | 264 | |
265 | 265 | $fields = array(); |
@@ -268,12 +268,12 @@ discard block |
||
268 | 268 | $condition = "`{$field_name}` = "; |
269 | 269 | $value = ''; |
270 | 270 | if ($field_data['delta']) { |
271 | - $value = "`{$field_name}`" . ($field_data['delta'] >= 0 ? '+' : '') . $field_data['delta']; |
|
271 | + $value = "`{$field_name}`".($field_data['delta'] >= 0 ? '+' : '').$field_data['delta']; |
|
272 | 272 | } elseif ($field_data['set']) { |
273 | 273 | $value = (is_string($field_data['set']) ? "'{$field_data['set']}'" : $field_data['set']); |
274 | 274 | } |
275 | 275 | if ($value) { |
276 | - $fields[] = $condition . $value; |
|
276 | + $fields[] = $condition.$value; |
|
277 | 277 | } |
278 | 278 | } |
279 | 279 | } |
@@ -68,11 +68,11 @@ discard block |
||
68 | 68 | } |
69 | 69 | $build_unit_list = sn_get_groups('tech'); |
70 | 70 | $artifact_id = ART_HEURISTIC_CHIP; |
71 | - $page_header = classLocale::$lang['tech'][UNIT_TECHNOLOGIES] . ($user['user_as_ally'] ? " {$classLocale['sys_of_ally']} {$user['username']}" : ''); |
|
71 | + $page_header = classLocale::$lang['tech'][UNIT_TECHNOLOGIES].($user['user_as_ally'] ? " {$classLocale['sys_of_ally']} {$user['username']}" : ''); |
|
72 | 72 | } elseif ($que_type == QUE_MERCENARY) { |
73 | 73 | $build_unit_list = sn_get_groups('mercenaries'); |
74 | 74 | $artifact_id = 0; |
75 | - $page_header = classLocale::$lang['tech'][UNIT_MERCENARIES] . ($user['user_as_ally'] ? " {$classLocale['sys_of_ally']} {$user['username']}" : ''); |
|
75 | + $page_header = classLocale::$lang['tech'][UNIT_MERCENARIES].($user['user_as_ally'] ? " {$classLocale['sys_of_ally']} {$user['username']}" : ''); |
|
76 | 76 | } else { |
77 | 77 | if (mrc_get_level($user, $planet, STRUC_FACTORY_HANGAR) == 0) { |
78 | 78 | message(classLocale::$lang['need_hangar'], classLocale::$lang['tech'][STRUC_FACTORY_HANGAR]); |
@@ -245,7 +245,7 @@ discard block |
||
245 | 245 | * ($resource_id == RES_ENERGY ? $config_resource_multiplier_plain : $config_resource_multiplier) |
246 | 246 | * (isset($density_info[$resource_id]) ? $density_info[$resource_id] : 1))) |
247 | 247 | ) { |
248 | - $level_production_base['R' . $resource_id] = $resource_income; |
|
248 | + $level_production_base['R'.$resource_id] = $resource_income; |
|
249 | 249 | } |
250 | 250 | } |
251 | 251 | } |
@@ -272,8 +272,8 @@ discard block |
||
272 | 272 | * ($resource_id == RES_ENERGY ? $config_resource_multiplier_plain : $config_resource_multiplier) |
273 | 273 | * (isset($density_info[$resource_id]) ? $density_info[$resource_id] : 1))) |
274 | 274 | ) { |
275 | - $level_production['R' . $resource_id] = $resource_income; |
|
276 | - $level_production['D' . $resource_id] = $resource_income - $level_production_base[$resource_id]; |
|
275 | + $level_production['R'.$resource_id] = $resource_income; |
|
276 | + $level_production['D'.$resource_id] = $resource_income - $level_production_base[$resource_id]; |
|
277 | 277 | } |
278 | 278 | } |
279 | 279 | $production['.']['resource'][] = $level_production; |
@@ -288,15 +288,15 @@ discard block |
||
288 | 288 | $level_start = $level_base_and_que > 1 ? $level_effective + $level_in_que - 1 : 1; |
289 | 289 | for ($i = 0; $i < 6; $i++) { |
290 | 290 | $level_production = array('LEVEL' => $level_start + $i); |
291 | - $level_production['R' . UNIT_PLAYER_EXPEDITIONS_MAX] = get_player_max_expeditons($user, $level_start + $i); |
|
292 | - $level_production['D' . UNIT_PLAYER_EXPEDITIONS_MAX] = $level_production['R' . UNIT_PLAYER_EXPEDITIONS_MAX] - $level_production_base[UNIT_PLAYER_EXPEDITIONS_MAX]; |
|
293 | - $level_production['R' . UNIT_PLAYER_COLONIES_MAX] = get_player_max_colonies($user, $level_start + $i); |
|
294 | - $level_production['D' . UNIT_PLAYER_COLONIES_MAX] = $level_production['R' . UNIT_PLAYER_COLONIES_MAX] - $level_production_base[UNIT_PLAYER_COLONIES_MAX]; |
|
291 | + $level_production['R'.UNIT_PLAYER_EXPEDITIONS_MAX] = get_player_max_expeditons($user, $level_start + $i); |
|
292 | + $level_production['D'.UNIT_PLAYER_EXPEDITIONS_MAX] = $level_production['R'.UNIT_PLAYER_EXPEDITIONS_MAX] - $level_production_base[UNIT_PLAYER_EXPEDITIONS_MAX]; |
|
293 | + $level_production['R'.UNIT_PLAYER_COLONIES_MAX] = get_player_max_colonies($user, $level_start + $i); |
|
294 | + $level_production['D'.UNIT_PLAYER_COLONIES_MAX] = $level_production['R'.UNIT_PLAYER_COLONIES_MAX] - $level_production_base[UNIT_PLAYER_COLONIES_MAX]; |
|
295 | 295 | $production['.']['resource'][] = $level_production; |
296 | 296 | |
297 | 297 | $level_production_base = array( |
298 | - UNIT_PLAYER_EXPEDITIONS_MAX => $level_production['R' . UNIT_PLAYER_EXPEDITIONS_MAX], |
|
299 | - UNIT_PLAYER_COLONIES_MAX => $level_production['R' . UNIT_PLAYER_COLONIES_MAX], |
|
298 | + UNIT_PLAYER_EXPEDITIONS_MAX => $level_production['R'.UNIT_PLAYER_EXPEDITIONS_MAX], |
|
299 | + UNIT_PLAYER_COLONIES_MAX => $level_production['R'.UNIT_PLAYER_COLONIES_MAX], |
|
300 | 300 | ); |
301 | 301 | } |
302 | 302 | } |
@@ -98,11 +98,11 @@ discard block |
||
98 | 98 | default: |
99 | 99 | switch (self::$mode) { |
100 | 100 | case CACHER_NO_CACHE: |
101 | - self::$data[$this->prefix . $name] = $value; |
|
101 | + self::$data[$this->prefix.$name] = $value; |
|
102 | 102 | break; |
103 | 103 | |
104 | 104 | case CACHER_XCACHE: |
105 | - xcache_set($this->prefix . $name, $value); |
|
105 | + xcache_set($this->prefix.$name, $value); |
|
106 | 106 | break; |
107 | 107 | } |
108 | 108 | break; |
@@ -122,11 +122,11 @@ discard block |
||
122 | 122 | default: |
123 | 123 | switch (self::$mode) { |
124 | 124 | case CACHER_NO_CACHE: |
125 | - return self::$data[$this->prefix . $name]; |
|
125 | + return self::$data[$this->prefix.$name]; |
|
126 | 126 | break; |
127 | 127 | |
128 | 128 | case CACHER_XCACHE: |
129 | - return xcache_get($this->prefix . $name); |
|
129 | + return xcache_get($this->prefix.$name); |
|
130 | 130 | break; |
131 | 131 | |
132 | 132 | } |
@@ -139,11 +139,11 @@ discard block |
||
139 | 139 | public function __isset($name) { |
140 | 140 | switch (self::$mode) { |
141 | 141 | case CACHER_NO_CACHE: |
142 | - return isset(self::$data[$this->prefix . $name]); |
|
142 | + return isset(self::$data[$this->prefix.$name]); |
|
143 | 143 | break; |
144 | 144 | |
145 | 145 | case CACHER_XCACHE: |
146 | - return xcache_isset($this->prefix . $name) && ($this->__get($name) !== null); |
|
146 | + return xcache_isset($this->prefix.$name) && ($this->__get($name) !== null); |
|
147 | 147 | break; |
148 | 148 | } |
149 | 149 | |
@@ -153,25 +153,25 @@ discard block |
||
153 | 153 | public function __unset($name) { |
154 | 154 | switch (self::$mode) { |
155 | 155 | case CACHER_NO_CACHE: |
156 | - unset(self::$data[$this->prefix . $name]); |
|
156 | + unset(self::$data[$this->prefix.$name]); |
|
157 | 157 | break; |
158 | 158 | |
159 | 159 | case CACHER_XCACHE: |
160 | - xcache_unset($this->prefix . $name); |
|
160 | + xcache_unset($this->prefix.$name); |
|
161 | 161 | break; |
162 | 162 | } |
163 | 163 | } |
164 | 164 | |
165 | 165 | public function unset_by_prefix($prefix_unset = '') { |
166 | 166 | static $array_clear; |
167 | - !$array_clear ? $array_clear = function (&$v, $k, $p) { |
|
167 | + !$array_clear ? $array_clear = function(&$v, $k, $p) { |
|
168 | 168 | strpos($k, $p) === 0 ? $v = null : false; |
169 | 169 | } : false; |
170 | 170 | |
171 | 171 | switch (self::$mode) { |
172 | 172 | case CACHER_NO_CACHE: |
173 | 173 | // array_walk(self::$data, create_function('&$v,$k,$p', 'if(strpos($k, $p) === 0)$v = NULL;'), $this->prefix.$prefix_unset); |
174 | - array_walk(self::$data, $array_clear, $this->prefix . $prefix_unset); |
|
174 | + array_walk(self::$data, $array_clear, $this->prefix.$prefix_unset); |
|
175 | 175 | |
176 | 176 | return true; |
177 | 177 | break; |
@@ -181,7 +181,7 @@ discard block |
||
181 | 181 | return false; |
182 | 182 | } |
183 | 183 | |
184 | - return xcache_unset_by_prefix($this->prefix . $prefix_unset); |
|
184 | + return xcache_unset_by_prefix($this->prefix.$prefix_unset); |
|
185 | 185 | break; |
186 | 186 | } |
187 | 187 | |
@@ -219,7 +219,7 @@ discard block |
||
219 | 219 | if ($this->$name[0] === null) { |
220 | 220 | for ($i = count($name) - 1; $i > 0; $i--) { |
221 | 221 | $cName = "{$name[$i]}_COUNT"; |
222 | - $cName1 = "{$name[$i-1]}_COUNT"; |
|
222 | + $cName1 = "{$name[$i - 1]}_COUNT"; |
|
223 | 223 | if ($this->$cName1 == null || $i == 1) { |
224 | 224 | $this->$cName++; |
225 | 225 | } |
@@ -264,7 +264,7 @@ discard block |
||
264 | 264 | |
265 | 265 | for ($i = 1; $i < count($name); $i++) { |
266 | 266 | $cName = "{$name[$i]}_COUNT"; |
267 | - $cName1 = "{$name[$i-1]}_COUNT"; |
|
267 | + $cName1 = "{$name[$i - 1]}_COUNT"; |
|
268 | 268 | |
269 | 269 | if ($i == 1 || $this->$cName1 === null) { |
270 | 270 | $this->$cName--; |
@@ -400,7 +400,7 @@ discard block |
||
400 | 400 | $qry[] = "('{$item_name}', '{$item_value}')"; |
401 | 401 | } |
402 | 402 | } |
403 | - doquery("REPLACE INTO `{{" . $this->table_name . "}}` (`{$this->sql_index_field}`, `{$this->sql_value_field}`) VALUES " . implode(',', $qry) . ";"); |
|
403 | + doquery("REPLACE INTO `{{".$this->table_name."}}` (`{$this->sql_index_field}`, `{$this->sql_value_field}`) VALUES ".implode(',', $qry).";"); |
|
404 | 404 | |
405 | 405 | // И только после взятия блокировок - меняем значения в кэше |
406 | 406 | foreach ($item_list as $item_name => $item_value) { |
@@ -600,9 +600,9 @@ discard block |
||
600 | 600 | 'advGoogleLeftMenuCode' => '(Place here code for banner)', |
601 | 601 | |
602 | 602 | // Alliance bonus calculations |
603 | - 'ali_bonus_algorithm' => 0, // Bonus calculation algorithm |
|
603 | + 'ali_bonus_algorithm' => 0, // Bonus calculation algorithm |
|
604 | 604 | 'ali_bonus_brackets' => 10, // Brackets count for ALI_BONUS_BY_RANK |
605 | - 'ali_bonus_brackets_divisor' => 10,// Bonus divisor for ALI_BONUS_BY_RANK |
|
605 | + 'ali_bonus_brackets_divisor' => 10, // Bonus divisor for ALI_BONUS_BY_RANK |
|
606 | 606 | 'ali_bonus_divisor' => 10000000, // Rank divisor for ALI_BONUS_BY_POINTS |
607 | 607 | 'ali_bonus_members' => 10, // Minumum alliace size to start using bonus |
608 | 608 | |
@@ -633,25 +633,25 @@ discard block |
||
633 | 633 | 'deuterium_basic_income' => 0, |
634 | 634 | 'eco_scale_storage' => 1, |
635 | 635 | 'eco_stockman_fleet' => '', // Black Market - Starting amount of s/h ship merchant to sell |
636 | - 'eco_stockman_fleet_populate' => 1, // Populate empty Stockman fleet with ships or not |
|
636 | + 'eco_stockman_fleet_populate' => 1, // Populate empty Stockman fleet with ships or not |
|
637 | 637 | 'empire_mercenary_base_period' => PERIOD_MONTH, // Base |
638 | 638 | 'empire_mercenary_temporary' => 0, // Temporary empire-wide mercenaries |
639 | 639 | 'energy_basic_income' => 0, |
640 | 640 | |
641 | 641 | // Bashing protection settings |
642 | - 'fleet_bashing_attacks' => 3, // Max amount of attack per wave - 3 by default |
|
643 | - 'fleet_bashing_interval' => 1800, // Maximum interval between attacks when they still count as one wave - 30m by default |
|
644 | - 'fleet_bashing_scope' => 86400, // Interval on which bashing waves counts - 24h by default |
|
645 | - 'fleet_bashing_war_delay' => 43200, // Delay before start bashing after declaring war to alliance - 12h by default |
|
646 | - 'fleet_bashing_waves' => 3, // Max amount of waves per day - 3 by default |
|
642 | + 'fleet_bashing_attacks' => 3, // Max amount of attack per wave - 3 by default |
|
643 | + 'fleet_bashing_interval' => 1800, // Maximum interval between attacks when they still count as one wave - 30m by default |
|
644 | + 'fleet_bashing_scope' => 86400, // Interval on which bashing waves counts - 24h by default |
|
645 | + 'fleet_bashing_war_delay' => 43200, // Delay before start bashing after declaring war to alliance - 12h by default |
|
646 | + 'fleet_bashing_waves' => 3, // Max amount of waves per day - 3 by default |
|
647 | 647 | |
648 | 648 | 'Fleet_Cdr' => 30, |
649 | 649 | 'fleet_speed' => 1, |
650 | 650 | |
651 | 651 | 'fleet_update_interval' => 4, |
652 | 652 | |
653 | - 'game_adminEmail' => 'root@localhost', // Admin's email to show to users |
|
654 | - 'game_counter' => 0, // Does built-in page hit counter is on? |
|
653 | + 'game_adminEmail' => 'root@localhost', // Admin's email to show to users |
|
654 | + 'game_counter' => 0, // Does built-in page hit counter is on? |
|
655 | 655 | // Defaults |
656 | 656 | 'game_default_language' => 'ru', |
657 | 657 | 'game_default_skin' => 'skins/EpicBlue/', |
@@ -665,13 +665,13 @@ discard block |
||
665 | 665 | 'game_maxSystem' => 199, |
666 | 666 | 'game_maxPlanet' => 15, |
667 | 667 | // Game global settings |
668 | - 'game_mode' => 0, // 0 - SuperNova, 1 - oGame |
|
668 | + 'game_mode' => 0, // 0 - SuperNova, 1 - oGame |
|
669 | 669 | 'game_name' => 'SuperNova', // Server name (would be on banners and on top of left menu) |
670 | 670 | |
671 | 671 | 'game_news_actual' => 259200, // How long announcement would be marked as "New". In seconds. Default - 3 days |
672 | - 'game_news_overview' => 3, // How much last news to show in Overview page |
|
672 | + 'game_news_overview' => 3, // How much last news to show in Overview page |
|
673 | 673 | // Noob protection |
674 | - 'game_noob_factor' => 5, // Multiplier to divide "stronger" and "weaker" users |
|
674 | + 'game_noob_factor' => 5, // Multiplier to divide "stronger" and "weaker" users |
|
675 | 675 | 'game_noob_points' => 5000, // Below this point user threated as noob. 0 to disable |
676 | 676 | |
677 | 677 | 'game_multiaccount_enabled' => 0, // 1 - allow interactions for players with same IP (multiaccounts) |
@@ -721,8 +721,8 @@ discard block |
||
721 | 721 | 'payment_currency_exchange_wmu' => 30, |
722 | 722 | 'payment_currency_exchange_wmz' => 1, |
723 | 723 | |
724 | - 'payment_lot_price' => 1, // Lot price in default currency |
|
725 | - 'payment_lot_size' => 2500, // Lot size. Also service as minimum amount of DM that could be bought with one transaction |
|
724 | + 'payment_lot_price' => 1, // Lot price in default currency |
|
725 | + 'payment_lot_size' => 2500, // Lot size. Also service as minimum amount of DM that could be bought with one transaction |
|
726 | 726 | |
727 | 727 | 'planet_teleport_cost' => 50000, // |
728 | 728 | 'planet_teleport_timeout' => 86400, // |
@@ -740,7 +740,7 @@ discard block |
||
740 | 740 | 'resource_multiplier' => 1, |
741 | 741 | |
742 | 742 | //Roleplay system |
743 | - 'rpg_bonus_divisor' => 10, // Amount of DM referral shoud get for partner have 1 DM bonus |
|
743 | + 'rpg_bonus_divisor' => 10, // Amount of DM referral shoud get for partner have 1 DM bonus |
|
744 | 744 | 'rpg_bonus_minimum' => 10000, // Minimum DM ammount for starting paying bonuses to affiliate |
745 | 745 | |
746 | 746 | // Black Market - General |
@@ -17,11 +17,11 @@ discard block |
||
17 | 17 | |
18 | 18 | function db_planet_list_admin_list($table_parent_columns, $planet_active, $active_time, $planet_type) { |
19 | 19 | return doquery( |
20 | - "SELECT p.*, u.username" . ($table_parent_columns ? ', p1.name AS parent_name' : '') . |
|
20 | + "SELECT p.*, u.username".($table_parent_columns ? ', p1.name AS parent_name' : ''). |
|
21 | 21 | " FROM {{planets}} AS p |
22 | 22 | LEFT JOIN {{users}} AS u ON u.id = p.id_owner" . |
23 | - ($table_parent_columns ? ' LEFT JOIN {{planets}} AS p1 ON p1.id = p.parent_planet' : '') . |
|
24 | - " WHERE " . ($planet_active ? "p.last_update >= {$active_time}" : "p.planet_type = {$planet_type}")); |
|
23 | + ($table_parent_columns ? ' LEFT JOIN {{planets}} AS p1 ON p1.id = p.parent_planet' : ''). |
|
24 | + " WHERE ".($planet_active ? "p.last_update >= {$active_time}" : "p.planet_type = {$planet_type}")); |
|
25 | 25 | } |
26 | 26 | |
27 | 27 | function db_planet_list_search($searchtext) { |
@@ -121,7 +121,7 @@ discard block |
||
121 | 121 | ORDER BY |
122 | 122 | sp.`{$Rank}_rank`, subject.{$source['id']} |
123 | 123 | LIMIT |
124 | - " . $start . ",100;"; |
|
124 | + ".$start.",100;"; |
|
125 | 125 | } else { // , UNIX_TIMESTAMP(CONCAT(YEAR(CURRENT_DATE), DATE_FORMAT(`user_birthday`, '-%m-%d'))) AS `nearest_birthday` |
126 | 126 | $query_str = |
127 | 127 | "SELECT |
@@ -134,7 +134,7 @@ discard block |
||
134 | 134 | ORDER BY |
135 | 135 | subject.{$Rank} DESC, subject.{$source['id']} |
136 | 136 | LIMIT |
137 | - " . $start . ",100;"; |
|
137 | + ".$start.",100;"; |
|
138 | 138 | } |
139 | 139 | } else { |
140 | 140 | // TODO |
@@ -151,7 +151,7 @@ discard block |
||
151 | 151 | ORDER BY |
152 | 152 | sp.`{$Rank}_rank`, subject.id |
153 | 153 | LIMIT |
154 | - " . $start . ",100;"; |
|
154 | + ".$start.",100;"; |
|
155 | 155 | } |
156 | 156 | |
157 | 157 | return doquery($query_str); |
@@ -374,9 +374,9 @@ discard block |
||
374 | 374 | */ |
375 | 375 | function db_payment_list_get($flt_payer, $flt_status, $flt_test, $flt_module) { |
376 | 376 | $extra_conditions = |
377 | - ($flt_payer > 0 ? "AND payment_user_id = {$flt_payer} " : '') . |
|
378 | - ($flt_status >= 0 ? "AND payment_status = {$flt_status} " : '') . |
|
379 | - ($flt_test >= 0 ? "AND payment_test = {$flt_test} " : '') . |
|
377 | + ($flt_payer > 0 ? "AND payment_user_id = {$flt_payer} " : ''). |
|
378 | + ($flt_status >= 0 ? "AND payment_status = {$flt_status} " : ''). |
|
379 | + ($flt_test >= 0 ? "AND payment_test = {$flt_test} " : ''). |
|
380 | 380 | ($flt_module ? "AND payment_module_name = '{$flt_module}' " : ''); |
381 | 381 | $query = doquery("SELECT * FROM `{{payment}}` WHERE 1 {$extra_conditions} ORDER BY payment_id DESC;"); |
382 | 382 | |
@@ -404,7 +404,7 @@ discard block |
||
404 | 404 | |
405 | 405 | // Log Online ************************************************************************************************************* |
406 | 406 | function db_log_online_insert() { |
407 | - doquery("INSERT IGNORE INTO {{log_users_online}} SET online_count = " . classSupernova::$config->var_online_user_count); |
|
407 | + doquery("INSERT IGNORE INTO {{log_users_online}} SET online_count = ".classSupernova::$config->var_online_user_count); |
|
408 | 408 | } |
409 | 409 | |
410 | 410 | // Log ************************************************************************************************************* |
@@ -612,7 +612,7 @@ discard block |
||
612 | 612 | `ban_user_id` = '{$banned['id']}', |
613 | 613 | `ban_user_name` = '{$banned['username']}', |
614 | 614 | `ban_reason` = '{$reason}', |
615 | - `ban_time` = " . SN_TIME_NOW . ", |
|
615 | + `ban_time` = ".SN_TIME_NOW.", |
|
616 | 616 | `ban_until` = {$ban_until}, |
617 | 617 | `ban_issuer_id` = '{$banner['id']}', |
618 | 618 | `ban_issuer_name` = '{$banner['username']}', |
@@ -634,7 +634,7 @@ discard block |
||
634 | 634 | `ban_user_name` = '{$banned['username']}', |
635 | 635 | `ban_reason` = '{$reason}', |
636 | 636 | `ban_time` = 0, |
637 | - `ban_until` = " . SN_TIME_NOW . ", |
|
637 | + `ban_until` = ".SN_TIME_NOW.", |
|
638 | 638 | `ban_issuer_id` = '{$banner['id']}', |
639 | 639 | `ban_issuer_name` = '{$banner['username']}', |
640 | 640 | `ban_issuer_email` = '{$banner['email']}' |
@@ -693,9 +693,9 @@ discard block |
||
693 | 693 | function db_ube_report_get_best_battles() { |
694 | 694 | $query = doquery("SELECT * |
695 | 695 | FROM {{ube_report}} |
696 | - WHERE `ube_report_time_process` < DATE(DATE_SUB(NOW(), INTERVAL " . MODULE_INFO_BEST_BATTLES_LOCK_DAYS . " DAY)) |
|
696 | + WHERE `ube_report_time_process` < DATE(DATE_SUB(NOW(), INTERVAL " . MODULE_INFO_BEST_BATTLES_LOCK_DAYS." DAY)) |
|
697 | 697 | ORDER BY `ube_report_debris_total_in_metal` DESC, `ube_report_id` ASC |
698 | - LIMIT " . MODULE_INFO_BEST_BATTLES_REPORT_VIEW . ";"); |
|
698 | + LIMIT " . MODULE_INFO_BEST_BATTLES_REPORT_VIEW.";"); |
|
699 | 699 | |
700 | 700 | return $query; |
701 | 701 | } |
@@ -1,6 +1,6 @@ |
||
1 | 1 | <?php |
2 | 2 | |
3 | -include('common.' . substr(strrchr(__FILE__, '.'), 1)); |
|
3 | +include('common.'.substr(strrchr(__FILE__, '.'), 1)); |
|
4 | 4 | |
5 | 5 | $template = gettemplate('viewreport', true); |
6 | 6 | $template->assign_var('PAGE_HINT', classLocale::$lang['cr_view_hint']); |