@@ -3,7 +3,7 @@ |
||
3 | 3 | // ---------------------------------------------------------------------------------------------------------------- |
4 | 4 | function lng_try_filepath($path, $file_path_relative) |
5 | 5 | { |
6 | - $file_path = SN_ROOT_PHYSICAL . ($path && file_exists(SN_ROOT_PHYSICAL . $path . $file_path_relative) ? $path : '') . $file_path_relative; |
|
6 | + $file_path = SN_ROOT_PHYSICAL.($path && file_exists(SN_ROOT_PHYSICAL.$path.$file_path_relative) ? $path : '').$file_path_relative; |
|
7 | 7 | return file_exists($file_path) ? $file_path : false; |
8 | 8 | } |
9 | 9 |
@@ -22,10 +22,10 @@ discard block |
||
22 | 22 | ), |
23 | 23 | ); |
24 | 24 | |
25 | - foreach($queries as &$query) { |
|
26 | - if(!empty($query['query'])) { |
|
25 | + foreach ($queries as &$query) { |
|
26 | + if (!empty($query['query'])) { |
|
27 | 27 | $query['result'] = doquery($query['query']); |
28 | - } elseif(!empty($query['callable']) && is_callable($query['callable'])) { |
|
28 | + } elseif (!empty($query['callable']) && is_callable($query['callable'])) { |
|
29 | 29 | call_user_func($query['callable']); |
30 | 30 | } |
31 | 31 | $query['error'] = classSupernova::$db->db_error(); |
@@ -69,7 +69,7 @@ discard block |
||
69 | 69 | $today_array = array($today_array['seconds'], $today_array['minutes'], $today_array['hours'], $today_array['mday'], $today_array['mon'], $today_array['year']); |
70 | 70 | // pdump($prev_run_array); |
71 | 71 | $scheduleList = explode(',', $scheduleList); |
72 | - array_walk($scheduleList, function (&$schedule) use ($prev_run_array, $today_array, $date_part_names_reverse, &$possible_schedules) { |
|
72 | + array_walk($scheduleList, function(&$schedule) use ($prev_run_array, $today_array, $date_part_names_reverse, &$possible_schedules) { |
|
73 | 73 | // pdump($schedule); |
74 | 74 | $schedule = array('schedule_array' => array_reverse(explode(':', trim($schedule)))); |
75 | 75 | |
@@ -81,21 +81,21 @@ discard block |
||
81 | 81 | */ |
82 | 82 | // pdump($schedule); |
83 | 83 | |
84 | - foreach($prev_run_array as $index => $date_part) { |
|
84 | + foreach ($prev_run_array as $index => $date_part) { |
|
85 | 85 | $schedule['array']['recorded'][$index] = isset($schedule['schedule_array'][$index]) ? intval($schedule['schedule_array'][$index]) : $date_part; |
86 | 86 | $schedule['array']['now'][$index] = isset($schedule['schedule_array'][$index]) ? intval($schedule['schedule_array'][$index]) : $today_array[$index]; |
87 | 87 | } |
88 | - if($schedule['array']['recorded'] == $schedule['array']['now']) { |
|
88 | + if ($schedule['array']['recorded'] == $schedule['array']['now']) { |
|
89 | 89 | unset($schedule['array']['now']); |
90 | 90 | } |
91 | 91 | |
92 | - foreach($schedule['array'] as $name => $array) { |
|
92 | + foreach ($schedule['array'] as $name => $array) { |
|
93 | 93 | $schedule['string'][$name] = "{$array[5]}-{$array[4]}-{$array[3]} {$array[2]}:{$array[1]}:{$array[0]}"; |
94 | - $schedule['string'][$name . '_next'] = $schedule['string'][$name] . ' +1 ' . $interval; |
|
95 | - $schedule['string'][$name . '_prev'] = $schedule['string'][$name] . ' -1 ' . $interval; |
|
94 | + $schedule['string'][$name.'_next'] = $schedule['string'][$name].' +1 '.$interval; |
|
95 | + $schedule['string'][$name.'_prev'] = $schedule['string'][$name].' -1 '.$interval; |
|
96 | 96 | } |
97 | 97 | |
98 | - foreach($schedule['string'] as $string) { |
|
98 | + foreach ($schedule['string'] as $string) { |
|
99 | 99 | $timestamp = strtotime($string); |
100 | 100 | $schedule['timestamp'][$timestamp] = $possible_schedules[$timestamp] = date(FMT_DATE_TIME_SQL, strtotime($string)); |
101 | 101 | } |
@@ -127,7 +127,7 @@ discard block |
||
127 | 127 | |
128 | 128 | $prev_run = 0; |
129 | 129 | $next_run = 0; |
130 | - foreach($possible_schedules as $timestamp => $string_date) { |
|
130 | + foreach ($possible_schedules as $timestamp => $string_date) { |
|
131 | 131 | $prev_run = SN_TIME_NOW >= $timestamp ? $timestamp : $prev_run; |
132 | 132 | $next_run = SN_TIME_NOW < $timestamp && !$next_run ? $timestamp : $next_run; |
133 | 133 | // pdump($schedule, '$schedule ' . date(FMT_DATE_TIME_SQL, $schedule)); |
@@ -9,19 +9,19 @@ discard block |
||
9 | 9 | $ts_var_stat_update = strtotime(classSupernova::$config->db_loadItem('var_stat_update')); |
10 | 10 | $ts_scheduled_update = sys_schedule_get_prev_run(classSupernova::$config->db_loadItem('stats_schedule'), classSupernova::$config->var_stat_update); |
11 | 11 | |
12 | - if(sys_get_param_int('admin_update')) { |
|
12 | + if (sys_get_param_int('admin_update')) { |
|
13 | 13 | define('USER_LEVEL', isset($user['authlevel']) ? $user['authlevel'] : -1); |
14 | - if(USER_LEVEL > 0) { |
|
14 | + if (USER_LEVEL > 0) { |
|
15 | 15 | $is_admin_request = true; |
16 | 16 | $ts_scheduled_update = SN_TIME_NOW; |
17 | 17 | } |
18 | 18 | } |
19 | 19 | |
20 | - if($ts_scheduled_update > $ts_var_stat_update) { |
|
20 | + if ($ts_scheduled_update > $ts_var_stat_update) { |
|
21 | 21 | lng_include('admin'); |
22 | 22 | sn_db_transaction_start(); |
23 | 23 | $ts_var_stat_update_end = strtotime(classSupernova::$config->db_loadItem('var_stat_update_end')); |
24 | - if(SN_TIME_NOW > $ts_var_stat_update_end) { |
|
24 | + if (SN_TIME_NOW > $ts_var_stat_update_end) { |
|
25 | 25 | $old_server_status = classSupernova::$config->db_loadItem('game_disable'); |
26 | 26 | classSupernova::$config->db_saveItem('game_disable', GAME_DISABLE_STAT); |
27 | 27 | |
@@ -31,14 +31,14 @@ discard block |
||
31 | 31 | |
32 | 32 | $msg = $is_admin_request ? 'admin request' : 'scheduler'; |
33 | 33 | $next_run = date(FMT_DATE_TIME_SQL, sys_schedule_get_prev_run(classSupernova::$config->stats_schedule, classSupernova::$config->var_stat_update, true)); |
34 | - $msg = "Running stat updates: {$msg}. Config->var_stat_update = " . classSupernova::$config->var_stat_update . |
|
35 | - ', $ts_scheduled_update = ' . date(FMT_DATE_TIME_SQL, $ts_scheduled_update) . |
|
36 | - ', next_stat_update = ' . $next_run; |
|
34 | + $msg = "Running stat updates: {$msg}. Config->var_stat_update = ".classSupernova::$config->var_stat_update. |
|
35 | + ', $ts_scheduled_update = '.date(FMT_DATE_TIME_SQL, $ts_scheduled_update). |
|
36 | + ', next_stat_update = '.$next_run; |
|
37 | 37 | classSupernova::$debug->warning($msg, 'Stat update', LOG_INFO_STAT_PROCESS); |
38 | 38 | $total_time = microtime(true); |
39 | 39 | |
40 | 40 | // require_once('../includes/sys_stat.php'); |
41 | - require_once(SN_ROOT_PHYSICAL . 'includes/includes/sys_stat.php'); |
|
41 | + require_once(SN_ROOT_PHYSICAL.'includes/includes/sys_stat.php'); |
|
42 | 42 | sys_stat_calculate(); |
43 | 43 | |
44 | 44 | $total_time = microtime(true) - $total_time; |
@@ -57,13 +57,13 @@ discard block |
||
57 | 57 | classSupernova::$config->db_saveItem('var_stat_update_end', SN_TIME_SQL); |
58 | 58 | |
59 | 59 | classSupernova::$config->db_saveItem('game_disable', $old_server_status); |
60 | - } elseif($ts_scheduled_update > $ts_var_stat_update) { |
|
60 | + } elseif ($ts_scheduled_update > $ts_var_stat_update) { |
|
61 | 61 | $timeout = strtotime(classSupernova::$config->db_loadItem('var_stat_update_end')) - SN_TIME_NOW; |
62 | 62 | $msg = classSupernova::$config->db_loadItem('var_stat_update_msg'); |
63 | 63 | $msg = "{$msg} ETA {$timeout} seconds. Please wait..."; |
64 | 64 | } |
65 | 65 | sn_db_transaction_rollback(); |
66 | - } elseif($is_admin_request) { |
|
66 | + } elseif ($is_admin_request) { |
|
67 | 67 | $msg = 'Stat is up to date'; |
68 | 68 | } |
69 | 69 |
@@ -10,8 +10,8 @@ discard block |
||
10 | 10 | function gettemplatename($u_dpath) { |
11 | 11 | static $template_names = array(); |
12 | 12 | |
13 | - if(!isset($template_names[$u_dpath])) { |
|
14 | - $template_names[$u_dpath] = file_exists(SN_ROOT_PHYSICAL . $u_dpath . 'tmpl.ini') ? sys_file_read(SN_ROOT_PHYSICAL . $u_dpath . 'tmpl.ini') : TEMPLATE_NAME; |
|
13 | + if (!isset($template_names[$u_dpath])) { |
|
14 | + $template_names[$u_dpath] = file_exists(SN_ROOT_PHYSICAL.$u_dpath.'tmpl.ini') ? sys_file_read(SN_ROOT_PHYSICAL.$u_dpath.'tmpl.ini') : TEMPLATE_NAME; |
|
15 | 15 | } |
16 | 16 | |
17 | 17 | return $template_names[$u_dpath]; |
@@ -52,12 +52,12 @@ discard block |
||
52 | 52 | * @param $sn_menu_extra |
53 | 53 | */ |
54 | 54 | function tpl_menu_merge_extra(&$sn_menu, &$sn_menu_extra) { |
55 | - if(empty($sn_menu) || empty($sn_menu_extra)) { |
|
55 | + if (empty($sn_menu) || empty($sn_menu_extra)) { |
|
56 | 56 | return; |
57 | 57 | } |
58 | 58 | |
59 | - foreach($sn_menu_extra as $menu_item_id => $menu_item) { |
|
60 | - if(empty($menu_item['LOCATION'])) { |
|
59 | + foreach ($sn_menu_extra as $menu_item_id => $menu_item) { |
|
60 | + if (empty($menu_item['LOCATION'])) { |
|
61 | 61 | $sn_menu[$menu_item_id] = $menu_item; |
62 | 62 | continue; |
63 | 63 | } |
@@ -66,16 +66,16 @@ discard block |
||
66 | 66 | unset($menu_item['LOCATION']); |
67 | 67 | |
68 | 68 | $is_positioned = $item_location[0]; |
69 | - if($is_positioned == '+' || $is_positioned == '-') { |
|
69 | + if ($is_positioned == '+' || $is_positioned == '-') { |
|
70 | 70 | $item_location = substr($item_location, 1); |
71 | 71 | } else { |
72 | 72 | $is_positioned = ''; |
73 | 73 | } |
74 | 74 | |
75 | - if($item_location) { |
|
75 | + if ($item_location) { |
|
76 | 76 | $menu_keys = array_keys($sn_menu); |
77 | 77 | $insert_position = array_search($item_location, $menu_keys); |
78 | - if($insert_position === false) { |
|
78 | + if ($insert_position === false) { |
|
79 | 79 | $insert_position = count($sn_menu) - 1; |
80 | 80 | $is_positioned = '+'; |
81 | 81 | $item_location = ''; |
@@ -88,7 +88,7 @@ discard block |
||
88 | 88 | $spliced = array_splice($sn_menu, $insert_position, count($sn_menu) - $insert_position); |
89 | 89 | $sn_menu[$menu_item_id] = $menu_item; |
90 | 90 | |
91 | - if(!$is_positioned && $item_location) { |
|
91 | + if (!$is_positioned && $item_location) { |
|
92 | 92 | unset($spliced[$item_location]); |
93 | 93 | } |
94 | 94 | $sn_menu = array_merge($sn_menu, $spliced); |
@@ -102,24 +102,24 @@ discard block |
||
102 | 102 | * @param template $template |
103 | 103 | */ |
104 | 104 | function tpl_menu_assign_to_template(&$sn_menu, &$template) { |
105 | - if(empty($sn_menu) || !is_array($sn_menu)) { |
|
105 | + if (empty($sn_menu) || !is_array($sn_menu)) { |
|
106 | 106 | return; |
107 | 107 | } |
108 | 108 | |
109 | - foreach($sn_menu as $menu_item_id => $menu_item) { |
|
110 | - if(!$menu_item) { |
|
109 | + foreach ($sn_menu as $menu_item_id => $menu_item) { |
|
110 | + if (!$menu_item) { |
|
111 | 111 | continue; |
112 | 112 | } |
113 | 113 | |
114 | - if(is_string($menu_item_id)) { |
|
114 | + if (is_string($menu_item_id)) { |
|
115 | 115 | $menu_item['ID'] = $menu_item_id; |
116 | 116 | } |
117 | 117 | |
118 | - if($menu_item['TYPE'] == 'lang') { |
|
118 | + if ($menu_item['TYPE'] == 'lang') { |
|
119 | 119 | $lang_string = &classLocale::$lang; |
120 | - if(preg_match('#(\w+)(?:\[(\w+)\])?(?:\[(\w+)\])?(?:\[(\w+)\])?(?:\[(\w+)\])?#', $menu_item['ITEM'], $matches) && count($matches) > 1) { |
|
121 | - for($i = 1; $i < count($matches); $i++) { |
|
122 | - if(defined($matches[$i])) { |
|
120 | + if (preg_match('#(\w+)(?:\[(\w+)\])?(?:\[(\w+)\])?(?:\[(\w+)\])?(?:\[(\w+)\])?#', $menu_item['ITEM'], $matches) && count($matches) > 1) { |
|
121 | + for ($i = 1; $i < count($matches); $i++) { |
|
122 | + if (defined($matches[$i])) { |
|
123 | 123 | $matches[$i] = constant($matches[$i]); |
124 | 124 | } |
125 | 125 | $lang_string = &$lang_string[$matches[$i]]; |
@@ -131,8 +131,8 @@ discard block |
||
131 | 131 | $menu_item['ALT'] = htmlentities($menu_item['ALT']); |
132 | 132 | $menu_item['TITLE'] = htmlentities($menu_item['TITLE']); |
133 | 133 | |
134 | - if(!empty($menu_item['ICON'])) { |
|
135 | - if(is_string($menu_item['ICON'])) { |
|
134 | + if (!empty($menu_item['ICON'])) { |
|
135 | + if (is_string($menu_item['ICON'])) { |
|
136 | 136 | $menu_item['ICON_PATH'] = $menu_item['ICON']; |
137 | 137 | } else { |
138 | 138 | $menu_item['ICON'] = $menu_item_id; |
@@ -159,10 +159,10 @@ discard block |
||
159 | 159 | 'USER_AUTHLEVEL_NAME' => classLocale::$lang['user_level'][$user['authlevel']], |
160 | 160 | // 'USER_IMPERSONATOR' => $template_result[F_IMPERSONATE_STATUS] != LOGIN_UNDEFINED, |
161 | 161 | 'PAYMENT' => sn_module_get_active_count('payment'), |
162 | - 'MENU_START_HIDE' => !empty($_COOKIE[SN_COOKIE . '_menu_hidden']) || defined('SN_GOOGLE'), |
|
162 | + 'MENU_START_HIDE' => !empty($_COOKIE[SN_COOKIE.'_menu_hidden']) || defined('SN_GOOGLE'), |
|
163 | 163 | )); |
164 | 164 | |
165 | - if(isset($template_result['MENU_CUSTOMIZE'])) { |
|
165 | + if (isset($template_result['MENU_CUSTOMIZE'])) { |
|
166 | 166 | $template->assign_vars(array( |
167 | 167 | 'PLAYER_OPTION_MENU_SHOW_ON_BUTTON' => classSupernova::$user_options[PLAYER_OPTION_MENU_SHOW_ON_BUTTON], |
168 | 168 | 'PLAYER_OPTION_MENU_HIDE_ON_BUTTON' => classSupernova::$user_options[PLAYER_OPTION_MENU_HIDE_ON_BUTTON], |
@@ -171,12 +171,12 @@ discard block |
||
171 | 171 | 'PLAYER_OPTION_MENU_ITEMS_AS_BUTTONS' => classSupernova::$user_options[PLAYER_OPTION_MENU_ITEMS_AS_BUTTONS], |
172 | 172 | 'PLAYER_OPTION_MENU_WHITE_TEXT' => classSupernova::$user_options[PLAYER_OPTION_MENU_WHITE_TEXT], |
173 | 173 | 'PLAYER_OPTION_MENU_OLD' => classSupernova::$user_options[PLAYER_OPTION_MENU_OLD], |
174 | - 'PLAYER_OPTION_MENU_HIDE_SHOW_BUTTON' => empty($_COOKIE[SN_COOKIE . '_menu_hidden']) && !defined('SN_GOOGLE') |
|
174 | + 'PLAYER_OPTION_MENU_HIDE_SHOW_BUTTON' => empty($_COOKIE[SN_COOKIE.'_menu_hidden']) && !defined('SN_GOOGLE') |
|
175 | 175 | ? classSupernova::$user_options[PLAYER_OPTION_MENU_HIDE_SHOW_BUTTON] : 1, |
176 | 176 | )); |
177 | 177 | } |
178 | 178 | |
179 | - if(defined('IN_ADMIN') && IN_ADMIN === true && !empty($user['authlevel']) && $user['authlevel'] > 0) { |
|
179 | + if (defined('IN_ADMIN') && IN_ADMIN === true && !empty($user['authlevel']) && $user['authlevel'] > 0) { |
|
180 | 180 | tpl_menu_merge_extra($sn_menu_admin, $sn_menu_admin_extra); |
181 | 181 | tpl_menu_assign_to_template($sn_menu_admin, $template); |
182 | 182 | } else { |
@@ -216,7 +216,7 @@ discard block |
||
216 | 216 | $in_admin = defined('IN_ADMIN') && IN_ADMIN === true; |
217 | 217 | $is_login = defined('LOGIN_LOGOUT') && LOGIN_LOGOUT === true; |
218 | 218 | |
219 | - if(is_object($page)) { |
|
219 | + if (is_object($page)) { |
|
220 | 220 | isset($page->_rootref['MENU']) ? $isDisplayMenu = $page->_rootref['MENU'] : false; |
221 | 221 | isset($page->_rootref['NAVBAR']) ? $isDisplayTopNav = $page->_rootref['NAVBAR'] : false; |
222 | 222 | |
@@ -224,7 +224,7 @@ discard block |
||
224 | 224 | !isset($page->_rootref['PAGE_HEADER']) && $title ? $page->assign_var('PAGE_HEADER', $title) : false; |
225 | 225 | } |
226 | 226 | |
227 | - if(empty($user['id']) || !is_numeric($user['id'])) { |
|
227 | + if (empty($user['id']) || !is_numeric($user['id'])) { |
|
228 | 228 | $isDisplayMenu = false; |
229 | 229 | $isDisplayTopNav = false; |
230 | 230 | } |
@@ -236,12 +236,12 @@ discard block |
||
236 | 236 | $user_time_measured_unix = intval(isset($user_time_diff[PLAYER_OPTION_TIME_DIFF_MEASURE_TIME]) ? strtotime($user_time_diff[PLAYER_OPTION_TIME_DIFF_MEASURE_TIME]) : 0); |
237 | 237 | |
238 | 238 | $font_size = !empty($_COOKIE[SN_COOKIE_F]) ? $_COOKIE[SN_COOKIE_F] : classSupernova::$user_options[PLAYER_OPTION_BASE_FONT_SIZE]; |
239 | - if(strpos($font_size, '%') !== false) { |
|
239 | + if (strpos($font_size, '%') !== false) { |
|
240 | 240 | // Размер шрифта в процентах |
241 | - $font_size = min(max(floatval($font_size), FONT_SIZE_PERCENT_MIN), FONT_SIZE_PERCENT_MAX) . '%'; |
|
242 | - } elseif(strpos($font_size, 'px') !== false) { |
|
241 | + $font_size = min(max(floatval($font_size), FONT_SIZE_PERCENT_MIN), FONT_SIZE_PERCENT_MAX).'%'; |
|
242 | + } elseif (strpos($font_size, 'px') !== false) { |
|
243 | 243 | // Размер шрифта в пикселях |
244 | - $font_size = min(max(floatval($font_size), FONT_SIZE_PIXELS_MIN), FONT_SIZE_PIXELS_MAX) . 'px'; |
|
244 | + $font_size = min(max(floatval($font_size), FONT_SIZE_PIXELS_MIN), FONT_SIZE_PIXELS_MAX).'px'; |
|
245 | 245 | } else { |
246 | 246 | // Не мышонка, не лягушка... |
247 | 247 | $font_size = FONT_SIZE_PERCENT_DEFAULT_STRING; |
@@ -251,10 +251,10 @@ discard block |
||
251 | 251 | |
252 | 252 | $template = gettemplate('_global_header', true); |
253 | 253 | |
254 | - if(!empty(classSupernova::$sn_mvc['javascript'])) { |
|
255 | - foreach(classSupernova::$sn_mvc['javascript'] as $page_name => $script_list) { |
|
256 | - if(empty($page_name) || $page_name == $sn_page_name) { |
|
257 | - foreach($script_list as $filename => $content) { |
|
254 | + if (!empty(classSupernova::$sn_mvc['javascript'])) { |
|
255 | + foreach (classSupernova::$sn_mvc['javascript'] as $page_name => $script_list) { |
|
256 | + if (empty($page_name) || $page_name == $sn_page_name) { |
|
257 | + foreach ($script_list as $filename => $content) { |
|
258 | 258 | $template_result['.']['javascript'][] = array( |
259 | 259 | 'FILE' => $filename, |
260 | 260 | 'CONTENT' => $content, |
@@ -272,17 +272,17 @@ discard block |
||
272 | 272 | $is_login ? $standard_css['design/css/login.min.css'] = '' : false; |
273 | 273 | $standard_css += array( |
274 | 274 | // 'design/css/design/css/global-ie.min.css' => '', // TODO |
275 | - TEMPLATE_PATH . '/_template.min.css' => '', |
|
276 | - ($user['dpath'] ? $user['dpath'] : DEFAULT_SKINPATH) . 'skin.min.css' => '', |
|
275 | + TEMPLATE_PATH.'/_template.min.css' => '', |
|
276 | + ($user['dpath'] ? $user['dpath'] : DEFAULT_SKINPATH).'skin.min.css' => '', |
|
277 | 277 | ); |
278 | 278 | |
279 | 279 | // Prepending standard CSS files |
280 | 280 | classSupernova::$sn_mvc['css'][''] = array_merge($standard_css, classSupernova::$sn_mvc['css']['']); |
281 | 281 | |
282 | 282 | |
283 | - foreach(classSupernova::$sn_mvc['css'] as $page_name => $script_list) { |
|
284 | - if(empty($page_name) || $page_name == $sn_page_name) { |
|
285 | - foreach($script_list as $filename => $content) { |
|
283 | + foreach (classSupernova::$sn_mvc['css'] as $page_name => $script_list) { |
|
284 | + if (empty($page_name) || $page_name == $sn_page_name) { |
|
285 | + foreach ($script_list as $filename => $content) { |
|
286 | 286 | $template_result['.']['css'][] = array( |
287 | 287 | 'FILE' => $filename, |
288 | 288 | 'CONTENT' => $content, |
@@ -309,7 +309,7 @@ discard block |
||
309 | 309 | ), // Проводить замер только если не выставлен флаг форсированного замера И (иссяк интервал замера ИЛИ замера еще не было) |
310 | 310 | //'TIME_UTC_OFFSET' => defined('SN_CLIENT_TIME_UTC_OFFSET') ? SN_CLIENT_TIME_UTC_OFFSET : '', |
311 | 311 | |
312 | - 'title' => ($title ? "{$title} - " : '') . classLocale::$lang['sys_server'] . " {$classConfig->game_name} - " . classLocale::$lang['sys_supernova'], |
|
312 | + 'title' => ($title ? "{$title} - " : '').classLocale::$lang['sys_server']." {$classConfig->game_name} - ".classLocale::$lang['sys_supernova'], |
|
313 | 313 | '-meta-' => $metatags, |
314 | 314 | 'ADV_SEO_META_DESCRIPTION' => classSupernova::$config->adv_seo_meta_description, |
315 | 315 | 'ADV_SEO_META_KEYWORDS' => classSupernova::$config->adv_seo_meta_keywords, |
@@ -329,12 +329,12 @@ discard block |
||
329 | 329 | $template->assign_recursive($template_result); |
330 | 330 | displayP(parsetemplate($template)); |
331 | 331 | |
332 | - if(($isDisplayMenu || $in_admin) && !isset($_COOKIE['menu_disable'])) { |
|
332 | + if (($isDisplayMenu || $in_admin) && !isset($_COOKIE['menu_disable'])) { |
|
333 | 333 | // $AdminPage = $AdminPage ? $user['authlevel'] : 0; |
334 | 334 | displayP(parsetemplate(tpl_render_menu())); |
335 | 335 | } |
336 | 336 | |
337 | - if($isDisplayTopNav && !$in_admin) { |
|
337 | + if ($isDisplayTopNav && !$in_admin) { |
|
338 | 338 | displayP(parsetemplate(tpl_render_topnav($user, $planetrow))); |
339 | 339 | } |
340 | 340 | |
@@ -342,8 +342,8 @@ discard block |
||
342 | 342 | |
343 | 343 | !is_array($page) ? $page = array($page) : false; |
344 | 344 | $result_added = false; |
345 | - foreach($page as $page_item) { |
|
346 | - if(!$result_added && is_object($page_item) && isset($page_item->_tpldata['result'])) { |
|
345 | + foreach ($page as $page_item) { |
|
346 | + if (!$result_added && is_object($page_item) && isset($page_item->_tpldata['result'])) { |
|
347 | 347 | $page_item = gettemplate('_result_message', $page_item); |
348 | 348 | $temp = $page_item->files['_result_message']; |
349 | 349 | unset($page_item->files['_result_message']); |
@@ -366,7 +366,7 @@ discard block |
||
366 | 366 | )); |
367 | 367 | displayP(parsetemplate($template)); |
368 | 368 | |
369 | - $user['authlevel'] >= 3 && classSupernova::$config->debug ? classSupernova::$debug->echo_log() : false;; |
|
369 | + $user['authlevel'] >= 3 && classSupernova::$config->debug ? classSupernova::$debug->echo_log() : false; ; |
|
370 | 370 | |
371 | 371 | classSupernova::$db->db_disconnect(); |
372 | 372 | |
@@ -404,7 +404,7 @@ discard block |
||
404 | 404 | * @param string $type |
405 | 405 | */ |
406 | 406 | function tpl_topnav_event_build(&$template, $FleetList, $type = 'fleet') { |
407 | - if(empty($FleetList)) { |
|
407 | + if (empty($FleetList)) { |
|
408 | 408 | return; |
409 | 409 | } |
410 | 410 | |
@@ -413,19 +413,19 @@ discard block |
||
413 | 413 | $fleet_event_count = 0; |
414 | 414 | $fleet_flying_sorter = array(); |
415 | 415 | $fleet_flying_events = array(); |
416 | - foreach($FleetList->_container as $objFleet) { |
|
416 | + foreach ($FleetList->_container as $objFleet) { |
|
417 | 417 | $will_return = true; |
418 | - if(!$objFleet->isReturning()) { |
|
418 | + if (!$objFleet->isReturning()) { |
|
419 | 419 | // cut fleets on Hold and Expedition |
420 | - if($objFleet->time_arrive_to_target >= SN_TIME_NOW) { |
|
420 | + if ($objFleet->time_arrive_to_target >= SN_TIME_NOW) { |
|
421 | 421 | $objFleet->mission_type == MT_RELOCATE ? $will_return = false : false; |
422 | 422 | tpl_topnav_event_build_helper($objFleet->time_arrive_to_target, EVENT_FLEET_ARRIVE, classLocale::$lang['sys_event_arrive'], $objFleet->target_coordinates_typed(), !$will_return, $objFleet, $fleet_flying_sorter, $fleet_flying_events, $fleet_event_count); |
423 | 423 | } |
424 | - if($objFleet->time_mission_job_complete) { |
|
424 | + if ($objFleet->time_mission_job_complete) { |
|
425 | 425 | tpl_topnav_event_build_helper($objFleet->time_mission_job_complete, EVENT_FLEET_STAY, classLocale::$lang['sys_event_stay'], $objFleet->target_coordinates_typed(), false, $objFleet, $fleet_flying_sorter, $fleet_flying_events, $fleet_event_count); |
426 | 426 | } |
427 | 427 | } |
428 | - if($will_return) { |
|
428 | + if ($will_return) { |
|
429 | 429 | tpl_topnav_event_build_helper($objFleet->time_return_to_source, EVENT_FLEET_RETURN, classLocale::$lang['sys_event_return'], $objFleet->launch_coordinates_typed(), true, $objFleet, $fleet_flying_sorter, $fleet_flying_events, $fleet_event_count); |
430 | 430 | } |
431 | 431 | } |
@@ -433,12 +433,12 @@ discard block |
||
433 | 433 | asort($fleet_flying_sorter); |
434 | 434 | |
435 | 435 | $fleet_flying_count = $FleetList->count(); |
436 | - foreach($fleet_flying_sorter as $fleet_event_id => $fleet_time) { |
|
436 | + foreach ($fleet_flying_sorter as $fleet_event_id => $fleet_time) { |
|
437 | 437 | $fleet_event = &$fleet_flying_events[$fleet_event_id]; |
438 | 438 | $template->assign_block_vars("flying_{$type}s", array( |
439 | 439 | 'TIME' => max(0, $fleet_time - SN_TIME_NOW), |
440 | 440 | 'TEXT' => $fleet_flying_count, |
441 | - 'HINT' => date(FMT_DATE_TIME, $fleet_time + SN_CLIENT_TIME_DIFF) . " - {$classLocale['sys_fleet']} {$fleet_event['TEXT']} {$fleet_event['COORDINATES']} {$classLocale['sys_planet_type_sh'][$fleet_event['COORDINATES_TYPE']]} {$classLocale['type_mission'][$fleet_event['OBJECT']->mission_type]}", |
|
441 | + 'HINT' => date(FMT_DATE_TIME, $fleet_time + SN_CLIENT_TIME_DIFF)." - {$classLocale['sys_fleet']} {$fleet_event['TEXT']} {$fleet_event['COORDINATES']} {$classLocale['sys_planet_type_sh'][$fleet_event['COORDINATES_TYPE']]} {$classLocale['type_mission'][$fleet_event['OBJECT']->mission_type]}", |
|
442 | 442 | )); |
443 | 443 | $fleet_event['DECREASE'] ? $fleet_flying_count-- : false; |
444 | 444 | } |
@@ -462,7 +462,7 @@ discard block |
||
462 | 462 | global $template_result; |
463 | 463 | $classLocale = classLocale::$lang; |
464 | 464 | |
465 | - if(!is_array($user)) { |
|
465 | + if (!is_array($user)) { |
|
466 | 466 | return ''; |
467 | 467 | } |
468 | 468 | |
@@ -483,8 +483,8 @@ discard block |
||
483 | 483 | |
484 | 484 | $ThisUsersPlanets = db_planet_list_sorted($user); |
485 | 485 | // while ($CurPlanet = db_fetch($ThisUsersPlanets)) |
486 | - foreach($ThisUsersPlanets as $CurPlanet) { |
|
487 | - if($CurPlanet['destruyed']) { |
|
486 | + foreach ($ThisUsersPlanets as $CurPlanet) { |
|
487 | + if ($CurPlanet['destruyed']) { |
|
488 | 488 | continue; |
489 | 489 | } |
490 | 490 | |
@@ -508,8 +508,8 @@ discard block |
||
508 | 508 | */ |
509 | 509 | $fleet_flying_list = array(); |
510 | 510 | $fleet_flying_list[0] = FleetList::dbGetFleetListByOwnerId($user['id']); |
511 | - foreach($fleet_flying_list[0]->_container as $fleet_id => $objFleet) { |
|
512 | - if(empty($fleet_flying_list[$objFleet->mission_type])) { |
|
511 | + foreach ($fleet_flying_list[0]->_container as $fleet_id => $objFleet) { |
|
512 | + if (empty($fleet_flying_list[$objFleet->mission_type])) { |
|
513 | 513 | $fleet_flying_list[$objFleet->mission_type] = new FleetList(); |
514 | 514 | } |
515 | 515 | $fleet_flying_list[$objFleet->mission_type][$fleet_id] = $objFleet; |
@@ -521,8 +521,8 @@ discard block |
||
521 | 521 | que_tpl_parse($template, QUE_RESEARCH, $user, array(), null, !classSupernova::$user_options[PLAYER_OPTION_NAVBAR_RESEARCH_WIDE]); |
522 | 522 | que_tpl_parse($template, SUBQUE_FLEET, $user, $planetrow, null, true); |
523 | 523 | |
524 | - if(!empty(classSupernova::$sn_mvc['navbar_prefix_button']) && is_array(classSupernova::$sn_mvc['navbar_prefix_button'])) { |
|
525 | - foreach(classSupernova::$sn_mvc['navbar_prefix_button'] as $navbar_button_image => $navbar_button_url) { |
|
524 | + if (!empty(classSupernova::$sn_mvc['navbar_prefix_button']) && is_array(classSupernova::$sn_mvc['navbar_prefix_button'])) { |
|
525 | + foreach (classSupernova::$sn_mvc['navbar_prefix_button'] as $navbar_button_image => $navbar_button_url) { |
|
526 | 526 | $template->assign_block_vars('navbar_prefix_button', array( |
527 | 527 | 'IMAGE' => $navbar_button_image, |
528 | 528 | 'URL_RELATIVE' => $navbar_button_url, |
@@ -536,13 +536,13 @@ discard block |
||
536 | 536 | $time_now_parsed = getdate(SN_TIME_NOW); |
537 | 537 | $time_local_parsed = getdate(defined('SN_CLIENT_TIME_LOCAL') ? SN_CLIENT_TIME_LOCAL : SN_TIME_NOW); |
538 | 538 | |
539 | - if(classSupernova::$config->game_news_overview) { |
|
539 | + if (classSupernova::$config->game_news_overview) { |
|
540 | 540 | $user_last_read_safe = intval($user['news_lastread']); |
541 | 541 | nws_render($template, "WHERE UNIX_TIMESTAMP(`tsTimeStamp`) >= {$user_last_read_safe}", classSupernova::$config->game_news_overview); |
542 | 542 | } |
543 | 543 | |
544 | 544 | $notes_query = db_note_list_by_owner($user['id'], true); |
545 | - while($note_row = db_fetch($notes_query)) { |
|
545 | + while ($note_row = db_fetch($notes_query)) { |
|
546 | 546 | note_assign($template, $note_row); |
547 | 547 | } |
548 | 548 | |
@@ -556,7 +556,7 @@ discard block |
||
556 | 556 | 'QUE_ID' => QUE_RESEARCH, |
557 | 557 | 'QUE_HTML' => 'topnav', |
558 | 558 | |
559 | - 'RESEARCH_ONGOING' => (boolean)$user['que'], |
|
559 | + 'RESEARCH_ONGOING' => (boolean) $user['que'], |
|
560 | 560 | |
561 | 561 | 'TIME_TEXT' => sprintf($str_date_format, $time_now_parsed['year'], classLocale::$lang['months'][$time_now_parsed['mon']], $time_now_parsed['mday'], |
562 | 562 | $time_now_parsed['hours'], $time_now_parsed['minutes'], $time_now_parsed['seconds'] |
@@ -633,7 +633,7 @@ discard block |
||
633 | 633 | 'QUE_STRUCTURES' => QUE_STRUCTURES, |
634 | 634 | )); |
635 | 635 | |
636 | - if((defined('SN_RENDER_NAVBAR_PLANET') && SN_RENDER_NAVBAR_PLANET === true) || ($user['option_list'][OPT_INTERFACE]['opt_int_navbar_resource_force'] && SN_RENDER_NAVBAR_PLANET !== false)) { |
|
636 | + if ((defined('SN_RENDER_NAVBAR_PLANET') && SN_RENDER_NAVBAR_PLANET === true) || ($user['option_list'][OPT_INTERFACE]['opt_int_navbar_resource_force'] && SN_RENDER_NAVBAR_PLANET !== false)) { |
|
637 | 637 | tpl_set_resource_info($template, $planetrow); |
638 | 638 | $template->assign_vars(array( |
639 | 639 | 'SN_RENDER_NAVBAR_PLANET' => true, |
@@ -648,12 +648,12 @@ discard block |
||
648 | 648 | * @param template|string $template |
649 | 649 | */ |
650 | 650 | function displayP($template) { |
651 | - if(is_object($template)) { |
|
652 | - if(empty($template->parsed)) { |
|
651 | + if (is_object($template)) { |
|
652 | + if (empty($template->parsed)) { |
|
653 | 653 | parsetemplate($template); |
654 | 654 | } |
655 | 655 | |
656 | - foreach($template->files as $section => $filename) { |
|
656 | + foreach ($template->files as $section => $filename) { |
|
657 | 657 | $template->display($section); |
658 | 658 | } |
659 | 659 | } else { |
@@ -668,11 +668,11 @@ discard block |
||
668 | 668 | * @return mixed |
669 | 669 | */ |
670 | 670 | function parsetemplate($template, $array = false) { |
671 | - if(is_object($template)) { |
|
671 | + if (is_object($template)) { |
|
672 | 672 | global $user; |
673 | 673 | |
674 | - if(!empty($array) && is_array($array)) { |
|
675 | - foreach($array as $key => $data) { |
|
674 | + if (!empty($array) && is_array($array)) { |
|
675 | + foreach ($array as $key => $data) { |
|
676 | 676 | $template->assign_var($key, $data); |
677 | 677 | } |
678 | 678 | } |
@@ -713,8 +713,8 @@ discard block |
||
713 | 713 | |
714 | 714 | $template_ex = '.tpl.html'; |
715 | 715 | |
716 | - if($template === false) { |
|
717 | - return sys_file_read(TEMPLATE_DIR . '/' . $files . $template_ex); |
|
716 | + if ($template === false) { |
|
717 | + return sys_file_read(TEMPLATE_DIR.'/'.$files.$template_ex); |
|
718 | 718 | } |
719 | 719 | |
720 | 720 | is_string($files) ? $files = array(basename($files) => $files) : false; |
@@ -723,7 +723,7 @@ discard block |
||
723 | 723 | //$template->set_custom_template($template_path ? $template_path : TEMPLATE_DIR, TEMPLATE_NAME, TEMPLATE_DIR); |
724 | 724 | |
725 | 725 | $tmpl_name = gettemplatename($user['dpath']); |
726 | - $template->set_custom_template(($template_path ? $template_path : SN_ROOT_PHYSICAL . 'design/templates/') . $tmpl_name . '/', $tmpl_name, TEMPLATE_DIR); |
|
726 | + $template->set_custom_template(($template_path ? $template_path : SN_ROOT_PHYSICAL.'design/templates/').$tmpl_name.'/', $tmpl_name, TEMPLATE_DIR); |
|
727 | 727 | |
728 | 728 | // TODO ГРЯЗНЫЙ ХАК! Это нужно, что бы по возможности перезаписать инфу из языковых пакетов модулей там, где она была перезаписана раньше инфой из основного пакета. Почему? |
729 | 729 | // - сначала грузятся модули и их языковые пакеты |
@@ -733,8 +733,8 @@ discard block |
||
733 | 733 | !empty(classSupernova::$sn_mvc['i18n']['']) ? lng_load_i18n(classSupernova::$sn_mvc['i18n']['']) : false; |
734 | 734 | $sn_page_name ? lng_load_i18n(classSupernova::$sn_mvc['i18n'][$sn_page_name]) : false; |
735 | 735 | |
736 | - foreach($files as &$filename) { |
|
737 | - $filename = $filename . $template_ex; |
|
736 | + foreach ($files as &$filename) { |
|
737 | + $filename = $filename.$template_ex; |
|
738 | 738 | } |
739 | 739 | |
740 | 740 | $template->set_filenames($files); |
@@ -756,15 +756,15 @@ discard block |
||
756 | 756 | |
757 | 757 | $template->assign_vars($q = array( |
758 | 758 | 'LANG' => $language ? $language : '', |
759 | - 'referral' => $id_ref ? '&id_ref=' . $id_ref : '', |
|
759 | + 'referral' => $id_ref ? '&id_ref='.$id_ref : '', |
|
760 | 760 | |
761 | - 'REQUEST_PARAMS' => !empty($url_params) ? '?' . implode('&', $url_params) : '',// "?lang={$language}" . ($id_ref ? "&id_ref={$id_ref}" : ''), |
|
761 | + 'REQUEST_PARAMS' => !empty($url_params) ? '?'.implode('&', $url_params) : '', // "?lang={$language}" . ($id_ref ? "&id_ref={$id_ref}" : ''), |
|
762 | 762 | 'FILENAME' => basename($_SERVER['PHP_SELF']), |
763 | 763 | )); |
764 | 764 | |
765 | - foreach(lng_get_list() as $lng_id => $lng_data) { |
|
766 | - if(isset($lng_data['LANG_VARIANTS']) && is_array($lng_data['LANG_VARIANTS'])) { |
|
767 | - foreach($lng_data['LANG_VARIANTS'] as $lang_variant) { |
|
765 | + foreach (lng_get_list() as $lng_id => $lng_data) { |
|
766 | + if (isset($lng_data['LANG_VARIANTS']) && is_array($lng_data['LANG_VARIANTS'])) { |
|
767 | + foreach ($lng_data['LANG_VARIANTS'] as $lang_variant) { |
|
768 | 768 | $lng_data1 = $lng_data; |
769 | 769 | $lng_data1 = array_merge($lng_data1, $lang_variant); |
770 | 770 | $template->assign_block_vars('language', $lng_data1); |
@@ -787,8 +787,8 @@ discard block |
||
787 | 787 | $que = $que['ques'][$que_type][$planet['id_owner']][$planet['id']]; |
788 | 788 | |
789 | 789 | $que_length = 0; |
790 | - if(!empty($que)) { |
|
791 | - foreach($que as $que_item) { |
|
790 | + if (!empty($que)) { |
|
791 | + foreach ($que as $que_item) { |
|
792 | 792 | $template->assign_block_vars('que', que_tpl_parse_element($que_item)); |
793 | 793 | } |
794 | 794 | $que_length = count($que); |
@@ -803,7 +803,7 @@ discard block |
||
803 | 803 | * @param int $user_dark_matter |
804 | 804 | */ |
805 | 805 | function tpl_planet_density_info(&$template, &$density_price_chart, $user_dark_matter) { |
806 | - foreach($density_price_chart as $density_price_index => &$density_price_data) { |
|
806 | + foreach ($density_price_chart as $density_price_index => &$density_price_data) { |
|
807 | 807 | $density_cost = $density_price_data; |
808 | 808 | $density_number_style = pretty_number($density_cost, true, $user_dark_matter, false, false); |
809 | 809 | |
@@ -827,7 +827,7 @@ discard block |
||
827 | 827 | function tpl_assign_select(&$template, $name, $values) { |
828 | 828 | !is_array($values) ? $values = array($values => $values) : false; |
829 | 829 | |
830 | - foreach($values as $key => $value) { |
|
830 | + foreach ($values as $key => $value) { |
|
831 | 831 | $template->assign_block_vars($name, array( |
832 | 832 | 'KEY' => htmlentities($key, ENT_COMPAT, 'UTF-8'), |
833 | 833 | 'VALUE' => htmlentities($value, ENT_COMPAT, 'UTF-8'), |
@@ -1,37 +1,37 @@ discard block |
||
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 | 7 | $template = gettemplate('ali_info', true); |
8 | 8 | |
9 | -if($mode == 'exit') { |
|
10 | - if($ally['ally_owner'] == $user['id']) { |
|
9 | +if ($mode == 'exit') { |
|
10 | + if ($ally['ally_owner'] == $user['id']) { |
|
11 | 11 | message(classLocale::$lang['Owner_cant_go_out'], classLocale::$lang['Alliance']); |
12 | 12 | } |
13 | 13 | |
14 | - if(sys_get_param_int('ali_info_leave_confirm')) { |
|
14 | + if (sys_get_param_int('ali_info_leave_confirm')) { |
|
15 | 15 | sn_db_transaction_start(); |
16 | 16 | db_user_set_by_id($user['id'], "`ally_id` = null, `ally_name` = null, `ally_tag` = null, `ally_register_time` = 0, `ally_rank_id` = 0"); |
17 | 17 | db_ally_list_recalc_counts(); |
18 | 18 | sn_db_transaction_commit(); |
19 | 19 | message(sprintf(classLocale::$lang['ali_info_leave_success'], $ally['ally_name']), classLocale::$lang['sys_alliance']); |
20 | 20 | } |
21 | -} elseif($mode == 'ainfo') { |
|
21 | +} elseif ($mode == 'ainfo') { |
|
22 | 22 | $tag = sys_get_param_str('tag'); |
23 | 23 | $id_ally = sys_get_param_id('a'); |
24 | - if($tag) { |
|
24 | + if ($tag) { |
|
25 | 25 | $ally = db_ally_get_by_tag($tag); |
26 | - } elseif($id_ally) { |
|
26 | + } elseif ($id_ally) { |
|
27 | 27 | $ally = db_ally_get_by_id($id_ally); |
28 | 28 | } |
29 | 29 | |
30 | - if(!$ally) { |
|
30 | + if (!$ally) { |
|
31 | 31 | message(classLocale::$lang['ali_sys_notFound'], classLocale::$lang['Ally_info_1']); |
32 | 32 | } |
33 | 33 | |
34 | - if(!$ally['ally_description']) { |
|
34 | + if (!$ally['ally_description']) { |
|
35 | 35 | $ally['ally_description'] = classLocale::$lang['Ally_nodescription']; |
36 | 36 | } |
37 | 37 | |
@@ -43,9 +43,9 @@ discard block |
||
43 | 43 | } else { |
44 | 44 | $page_header = classLocale::$lang['your_alliance']; |
45 | 45 | |
46 | - if($ally['ally_owner'] == $user['id']) { |
|
46 | + if ($ally['ally_owner'] == $user['id']) { |
|
47 | 47 | $range = $ally['ally_owner_range'] ? $ally['ally_owner_range'] : classLocale::$lang['Founder']; |
48 | - } elseif($user['ally_rank_id'] != 0 && isset($ranks[$user['ally_rank_id']]['name'])) { |
|
48 | + } elseif ($user['ally_rank_id'] != 0 && isset($ranks[$user['ally_rank_id']]['name'])) { |
|
49 | 49 | $range = $ranks[$user['ally_rank_id']]['name']; |
50 | 50 | } else { |
51 | 51 | $range = classLocale::$lang['member']; |
@@ -86,8 +86,8 @@ discard block |
||
86 | 86 | )); |
87 | 87 | |
88 | 88 | $relations = ali_relations($ally['id']); |
89 | -foreach($relations as $relation) { |
|
90 | - if($relation['alliance_diplomacy_contr_ally_id'] && $relation['alliance_diplomacy_ally_id']) { |
|
89 | +foreach ($relations as $relation) { |
|
90 | + if ($relation['alliance_diplomacy_contr_ally_id'] && $relation['alliance_diplomacy_ally_id']) { |
|
91 | 91 | $template->assign_block_vars('relation', array( |
92 | 92 | 'NAME' => $relation['alliance_diplomacy_contr_ally_name'], |
93 | 93 | 'RELATION' => classLocale::$lang['ali_dip_relations'][$relation['alliance_diplomacy_relation']], |
@@ -106,4 +106,4 @@ discard block |
||
106 | 106 | |
107 | 107 | ali_render(); |
108 | 108 | |
109 | -display($template, classLocale::$lang['your_alliance'] . ' [' . $ally['ally_name'] . ']'); |
|
109 | +display($template, classLocale::$lang['your_alliance'].' ['.$ally['ally_name'].']'); |
@@ -1,6 +1,6 @@ discard block |
||
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 | { |
5 | 5 | classSupernova::$debug->error("Attempt to call ALLIANCE page mode {$mode} directly - not from alliance.php", 'Forbidden', 403); |
6 | 6 | } |
@@ -14,7 +14,7 @@ discard block |
||
14 | 14 | $new_rank_name = sys_get_param_str('newRankName'); |
15 | 15 | if ($new_rank_name) |
16 | 16 | { |
17 | - foreach($ally_rights as $fieldName) |
|
17 | + foreach ($ally_rights as $fieldName) |
|
18 | 18 | { |
19 | 19 | $newRank[$fieldName] = 0; |
20 | 20 | } |
@@ -28,9 +28,9 @@ discard block |
||
28 | 28 | { |
29 | 29 | unset($ranks); |
30 | 30 | |
31 | - foreach($rankListInput as $rankID => $rank) |
|
31 | + foreach ($rankListInput as $rankID => $rank) |
|
32 | 32 | { |
33 | - foreach($ally_rights as $rightName) |
|
33 | + foreach ($ally_rights as $rightName) |
|
34 | 34 | { |
35 | 35 | $ranks[$rankID][$rightName] = $rank[$rightName] ? 1 : 0; |
36 | 36 | } |
@@ -41,7 +41,7 @@ discard block |
||
41 | 41 | $d = sys_get_param_int('d'); |
42 | 42 | if ($d && isset($ranks[$d])) |
43 | 43 | { |
44 | - if(count($ranks) == 1) |
|
44 | + if (count($ranks) == 1) |
|
45 | 45 | { |
46 | 46 | message(classLocale::$lang['ali_adm_lastRank'], classLocale::$lang['ali_adm_rights_title']); |
47 | 47 | } |
@@ -53,17 +53,17 @@ discard block |
||
53 | 53 | |
54 | 54 | if (count($ranks)) |
55 | 55 | { |
56 | - foreach($ranks as $rankID => $rank) |
|
56 | + foreach ($ranks as $rankID => $rank) |
|
57 | 57 | { |
58 | 58 | $rank_data = array( |
59 | 59 | 'ID' => $rankID, |
60 | 60 | 'NAME' => $rank['name'], |
61 | 61 | ); |
62 | 62 | |
63 | - for($i = 1; $i < count($rank); $i++) |
|
63 | + for ($i = 1; $i < count($rank); $i++) |
|
64 | 64 | { |
65 | - $rank_data['R' . $i] = (($rank[$ally_rights[$i]] == 1) ? ' checked' : '') ; |
|
66 | - $rank_data['N' . $i] = $ally_rights[$i]; |
|
65 | + $rank_data['R'.$i] = (($rank[$ally_rights[$i]] == 1) ? ' checked' : ''); |
|
66 | + $rank_data['N'.$i] = $ally_rights[$i]; |
|
67 | 67 | } |
68 | 68 | |
69 | 69 | $template->assign_block_vars('rank', $rank_data); |
@@ -27,19 +27,19 @@ |
||
27 | 27 | */ |
28 | 28 | function db_set_make_safe_string($set, $delta = false) { |
29 | 29 | $set_safe = array(); |
30 | - foreach($set as $field => $value) { |
|
31 | - if(empty($field)) { |
|
30 | + foreach ($set as $field => $value) { |
|
31 | + if (empty($field)) { |
|
32 | 32 | continue; |
33 | 33 | } |
34 | 34 | |
35 | - $field = '`' . db_escape($field) . '`'; |
|
35 | + $field = '`'.db_escape($field).'`'; |
|
36 | 36 | $new_value = $value; |
37 | - if($value === null) { |
|
37 | + if ($value === null) { |
|
38 | 38 | $new_value = 'NULL'; |
39 | - } elseif(is_string($value) && (string)($new_value = floatval($value)) != (string)$value) { |
|
39 | + } elseif (is_string($value) && (string) ($new_value = floatval($value)) != (string) $value) { |
|
40 | 40 | // non-float |
41 | - $new_value = '"' . db_escape($value) . '"'; |
|
42 | - } elseif($delta) { |
|
41 | + $new_value = '"'.db_escape($value).'"'; |
|
42 | + } elseif ($delta) { |
|
43 | 43 | // float and DELTA-set |
44 | 44 | $new_value = "{$field} + ({$new_value})"; |
45 | 45 | } |
@@ -2,19 +2,19 @@ discard block |
||
2 | 2 | |
3 | 3 | $classLocale = classLocale::$lang; |
4 | 4 | |
5 | -if(classSupernova::$config->server_updater_check_auto && classSupernova::$config->server_updater_check_last + classSupernova::$config->server_updater_check_period <= SN_TIME_NOW) { |
|
6 | - include(SN_ROOT_PHYSICAL . 'ajax_version_check' . DOT_PHP_EX); |
|
5 | +if (classSupernova::$config->server_updater_check_auto && classSupernova::$config->server_updater_check_last + classSupernova::$config->server_updater_check_period <= SN_TIME_NOW) { |
|
6 | + include(SN_ROOT_PHYSICAL.'ajax_version_check'.DOT_PHP_EX); |
|
7 | 7 | } |
8 | 8 | |
9 | -if(classSupernova::$config->user_birthday_gift && SN_TIME_NOW - classSupernova::$config->user_birthday_celebrate > PERIOD_DAY) { |
|
10 | - require_once(SN_ROOT_PHYSICAL . "includes/includes/user_birthday_celebrate" . DOT_PHP_EX); |
|
9 | +if (classSupernova::$config->user_birthday_gift && SN_TIME_NOW - classSupernova::$config->user_birthday_celebrate > PERIOD_DAY) { |
|
10 | + require_once(SN_ROOT_PHYSICAL."includes/includes/user_birthday_celebrate".DOT_PHP_EX); |
|
11 | 11 | sn_user_birthday_celebrate(); |
12 | 12 | } |
13 | 13 | |
14 | -if(!classSupernova::$config->var_online_user_count || classSupernova::$config->var_online_user_time + 30 < SN_TIME_NOW) { |
|
14 | +if (!classSupernova::$config->var_online_user_count || classSupernova::$config->var_online_user_time + 30 < SN_TIME_NOW) { |
|
15 | 15 | classSupernova::$config->db_saveItem('var_online_user_count', db_user_count(true)); |
16 | 16 | classSupernova::$config->db_saveItem('var_online_user_time', SN_TIME_NOW); |
17 | - if(classSupernova::$config->server_log_online) { |
|
17 | + if (classSupernova::$config->server_log_online) { |
|
18 | 18 | db_log_online_insert(); |
19 | 19 | } |
20 | 20 | } |
@@ -41,7 +41,7 @@ discard block |
||
41 | 41 | $template_result[F_ACCOUNT_IS_AUTHORIZED] = $sys_user_logged_in = !empty($user) && isset($user['id']) && $user['id']; |
42 | 42 | //pdump($template_result[F_ACCOUNT_IS_AUTHORIZED]);die(); |
43 | 43 | |
44 | -if(!empty($user['id'])) { |
|
44 | +if (!empty($user['id'])) { |
|
45 | 45 | classSupernova::$user_options->user_change($user['id']); |
46 | 46 | } |
47 | 47 | |
@@ -54,15 +54,15 @@ discard block |
||
54 | 54 | : false |
55 | 55 | ); |
56 | 56 | |
57 | -if($template_result[F_LOGIN_STATUS] == LOGIN_ERROR_USERNAME_RESTRICTED_CHARACTERS) { |
|
58 | - $prohibited_characters = array_map(function ($value) { |
|
59 | - return "'" . htmlentities($value, ENT_QUOTES, 'UTF-8') . "'"; |
|
57 | +if ($template_result[F_LOGIN_STATUS] == LOGIN_ERROR_USERNAME_RESTRICTED_CHARACTERS) { |
|
58 | + $prohibited_characters = array_map(function($value) { |
|
59 | + return "'".htmlentities($value, ENT_QUOTES, 'UTF-8')."'"; |
|
60 | 60 | }, str_split(LOGIN_REGISTER_CHARACTERS_PROHIBITED)); |
61 | 61 | $template_result[F_LOGIN_MESSAGE] .= implode(', ', $prohibited_characters); |
62 | 62 | } |
63 | 63 | |
64 | 64 | |
65 | -if(defined('DEBUG_AUTH') && DEBUG_AUTH && !defined('IN_AJAX')) { |
|
65 | +if (defined('DEBUG_AUTH') && DEBUG_AUTH && !defined('IN_AJAX')) { |
|
66 | 66 | pdump("Отключи отладку перед продакшном!"); |
67 | 67 | } |
68 | 68 | |
@@ -76,17 +76,17 @@ discard block |
||
76 | 76 | ? define('INSTALL_MODE', GAME_DISABLE_INSTALL) |
77 | 77 | : false; |
78 | 78 | |
79 | -if($template_result[F_GAME_DISABLE] = classSupernova::$config->game_disable) { |
|
79 | +if ($template_result[F_GAME_DISABLE] = classSupernova::$config->game_disable) { |
|
80 | 80 | $template_result[F_GAME_DISABLE_REASON] = sys_bbcodeParse( |
81 | 81 | classSupernova::$config->game_disable == GAME_DISABLE_REASON |
82 | 82 | ? classSupernova::$config->game_disable_reason |
83 | 83 | : classLocale::$lang['sys_game_disable_reason'][classSupernova::$config->game_disable] |
84 | 84 | ); |
85 | - if(defined('IN_API')) { |
|
85 | + if (defined('IN_API')) { |
|
86 | 86 | return; |
87 | 87 | } |
88 | 88 | |
89 | - if( |
|
89 | + if ( |
|
90 | 90 | ($user['authlevel'] < 1 || !(defined('IN_ADMIN') && IN_ADMIN)) |
91 | 91 | && |
92 | 92 | !(defined('INSTALL_MODE') && defined('LOGIN_LOGOUT')) |
@@ -100,8 +100,8 @@ discard block |
||
100 | 100 | |
101 | 101 | // TODO ban |
102 | 102 | // TODO $skip_ban_check |
103 | -if($template_result[F_BANNED_STATUS] && !$skip_ban_check) { |
|
104 | - if(defined('IN_API')) { |
|
103 | +if ($template_result[F_BANNED_STATUS] && !$skip_ban_check) { |
|
104 | + if (defined('IN_API')) { |
|
105 | 105 | return; |
106 | 106 | } |
107 | 107 | |
@@ -119,15 +119,15 @@ discard block |
||
119 | 119 | // pdump($allow_anonymous, '$allow_anonymous'); |
120 | 120 | // pdump($sys_user_logged_in, '$sys_user_logged_in'); |
121 | 121 | |
122 | -if($sys_user_logged_in && INITIAL_PAGE == 'login') { |
|
123 | - sys_redirect(SN_ROOT_VIRTUAL . 'overview.php'); |
|
124 | -} elseif($account_logged_in && !$sys_user_logged_in) { // empty(core_auth::$user['id']) |
|
122 | +if ($sys_user_logged_in && INITIAL_PAGE == 'login') { |
|
123 | + sys_redirect(SN_ROOT_VIRTUAL.'overview.php'); |
|
124 | +} elseif ($account_logged_in && !$sys_user_logged_in) { // empty(core_auth::$user['id']) |
|
125 | 125 | // pdump($sn_page_name); |
126 | 126 | // pdump(INITIAL_PAGE); |
127 | 127 | // die('{Тут должна быть ваша реклама. Точнее - ввод имени игрока}'); |
128 | -} elseif(!$allow_anonymous && !$sys_user_logged_in) { |
|
128 | +} elseif (!$allow_anonymous && !$sys_user_logged_in) { |
|
129 | 129 | // sn_setcookie(SN_COOKIE, '', time() - PERIOD_WEEK, SN_ROOT_RELATIVE); |
130 | - sys_redirect(SN_ROOT_VIRTUAL . 'login.php'); |
|
130 | + sys_redirect(SN_ROOT_VIRTUAL.'login.php'); |
|
131 | 131 | } |
132 | 132 | |
133 | 133 | $user_time_diff = playerTimeDiff::user_time_diff_get(); |
@@ -146,16 +146,16 @@ discard block |
||
146 | 146 | |
147 | 147 | global $skip_fleet_update; |
148 | 148 | $skip_fleet_update = $skip_fleet_update || $supernova->options['fleet_update_skip'] || defined('IN_ADMIN'); |
149 | -if( |
|
149 | +if ( |
|
150 | 150 | !$skip_fleet_update |
151 | 151 | && !(defined('IN_AJAX') && IN_AJAX === true) |
152 | 152 | && SN_TIME_NOW - strtotime(classSupernova::$config->fleet_update_last) > classSupernova::$config->fleet_update_interval |
153 | 153 | ) { |
154 | - require_once(SN_ROOT_PHYSICAL . "includes/includes/flt_flying_fleet_handler2" . DOT_PHP_EX); |
|
154 | + require_once(SN_ROOT_PHYSICAL."includes/includes/flt_flying_fleet_handler2".DOT_PHP_EX); |
|
155 | 155 | flt_flying_fleet_handler($skip_fleet_update); |
156 | 156 | } |
157 | 157 | |
158 | -if(!defined('IN_AJAX')) { |
|
158 | +if (!defined('IN_AJAX')) { |
|
159 | 159 | print("Scheduled processes is disabled<br />"); |
160 | 160 | } |
161 | 161 | // scheduler_process(); |
@@ -4,7 +4,7 @@ |
||
4 | 4 | |
5 | 5 | function pname_factory_production_field_name($factory_unit_id) |
6 | 6 | { |
7 | - return get_unit_param($factory_unit_id, P_NAME) . '_porcent'; |
|
7 | + return get_unit_param($factory_unit_id, P_NAME).'_porcent'; |
|
8 | 8 | } |
9 | 9 | |
10 | 10 | /** |