Completed
Branch master (ab4e85)
by SuperNova.WS
04:58
created
resources.php 1 patch
Indentation   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -92,9 +92,9 @@  discard block
 block discarded – undo
92 92
 
93 93
 for ($Option = 10; $Option >= 0; $Option--)
94 94
 {
95
- $template->assign_block_vars('option', array(
96
-   'VALUE' => $Option * 10,
97
- ));
95
+  $template->assign_block_vars('option', array(
96
+    'VALUE' => $Option * 10,
97
+  ));
98 98
 }
99 99
 
100 100
 $caps_real = eco_get_planet_caps($user, $planetrow, 3600);
@@ -163,14 +163,14 @@  discard block
 block discarded – undo
163 163
 int_calc_storage_bar(RES_DEUTERIUM);
164 164
 
165 165
 $template->assign_vars(array(
166
- 'PLANET_NAME'          => $planetrow['name'],
167
- 'PLANET_TYPE'          => $planetrow['planet_type'],
168
- 'PLANET_DENSITY_INDEX' => $planet_density_index,
169
- 'PLANET_CORE_TEXT'     => $lang['uni_planet_density_types'][$planet_density_index],
166
+  'PLANET_NAME'          => $planetrow['name'],
167
+  'PLANET_TYPE'          => $planetrow['planet_type'],
168
+  'PLANET_DENSITY_INDEX' => $planet_density_index,
169
+  'PLANET_CORE_TEXT'     => $lang['uni_planet_density_types'][$planet_density_index],
170 170
 
171
- 'PRODUCTION_LEVEL'     => floor($caps_real['efficiency'] * 100),
171
+  'PRODUCTION_LEVEL'     => floor($caps_real['efficiency'] * 100),
172 172
 
173
- 'PAGE_HINT'            => $lang['res_hint'],
173
+  'PAGE_HINT'            => $lang['res_hint'],
174 174
 ));
175 175
 
176 176
 display($template, $lang['res_planet_production']);
Please login to merge, or discard this patch.
admin/adm_user_analyze.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -39,8 +39,8 @@
 block discarded – undo
39 39
     0 => $row['visit_time'], // start
40 40
     1 => $row['visit_time'], // end
41 41
   )
42
-   //: false
43
-   ;
42
+    //: false
43
+    ;
44 44
 }
45 45
 
46 46
 $session_list = array();
Please login to merge, or discard this patch.
stat.php 1 patch
Indentation   +30 added lines, -30 removed lines patch added patch discarded remove patch
@@ -50,52 +50,52 @@
 block discarded – undo
50 50
 stat_tpl_assign($template, $who, 'subject', $subject_list, $sn_group_stat_common);
51 51
 
52 52
 $stat_types = array(
53
-   STAT_TOTAL => array(
54
-     'type' => 'total',
55
-   ),
53
+    STAT_TOTAL => array(
54
+      'type' => 'total',
55
+    ),
56 56
 
57
-   STAT_FLEET => array(
58
-     'type' => 'fleet',
59
-   ),
57
+    STAT_FLEET => array(
58
+      'type' => 'fleet',
59
+    ),
60 60
 
61
-   STAT_TECH => array(
62
-     'type' => 'tech',
63
-   ),
61
+    STAT_TECH => array(
62
+      'type' => 'tech',
63
+    ),
64 64
 
65
-   STAT_BUILDING => array(
66
-     'type' => 'build',
67
-   ),
65
+    STAT_BUILDING => array(
66
+      'type' => 'build',
67
+    ),
68 68
 
69
-   STAT_DEFENSE => array(
70
-     'type' => 'defs',
71
-   ),
69
+    STAT_DEFENSE => array(
70
+      'type' => 'defs',
71
+    ),
72 72
 
73
-   STAT_RESOURCE => array(
74
-     'type' => 'res',
75
-   ),
73
+    STAT_RESOURCE => array(
74
+      'type' => 'res',
75
+    ),
76 76
 
77
-   STAT_RAID_TOTAL => array(
78
-     'type' => 'raids',
79
-   ),
77
+    STAT_RAID_TOTAL => array(
78
+      'type' => 'raids',
79
+    ),
80 80
 
81
-   STAT_RAID_WON => array(
82
-     'type' => 'raidswin',
83
-   ),
81
+    STAT_RAID_WON => array(
82
+      'type' => 'raidswin',
83
+    ),
84 84
 
85
-   STAT_RAID_LOST => array(
86
-     'type' => 'raidsloose',
87
-   ),
85
+    STAT_RAID_LOST => array(
86
+      'type' => 'raidsloose',
87
+    ),
88 88
 
89 89
   STAT_LVL_BUILDING => array(
90
-     'type' => 'lvl_minier',
90
+      'type' => 'lvl_minier',
91 91
   ),
92 92
 
93 93
   STAT_LVL_TECH => array(
94
-     'type' => 'player_rpg_tech_level',
94
+      'type' => 'player_rpg_tech_level',
95 95
   ),
96 96
 
97 97
   STAT_LVL_RAID => array(
98
-     'type' => 'lvl_raid',
98
+      'type' => 'lvl_raid',
99 99
   ),
100 100
 );
101 101
 stat_tpl_assign($template, $type, 'type', $stat_types, $sn_group_stat_common);
Please login to merge, or discard this patch.
language/en/language.mo.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -28,7 +28,7 @@
 block discarded – undo
28 28
 */
29 29
 if (!defined('INSIDE')) 
30 30
 {
31
-	die('Hack attempt!');
31
+  die('Hack attempt!');
32 32
 }
33 33
 
34 34
 $lang_info = array(
Please login to merge, or discard this patch.
language/ru/system.mo.php 1 patch
Indentation   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -689,15 +689,15 @@  discard block
 block discarded – undo
689 689
   ),
690 690
 
691 691
   'months' => array(
692
-     1 =>'января',
693
-     2 =>'февраля',
694
-     3 =>'марта',
695
-     4 =>'апреля',
696
-     5 =>'мая',
697
-     6 =>'июня',
698
-     7 =>'июля',
699
-     8 =>'августа',
700
-     9 =>'сентября',
692
+      1 =>'января',
693
+      2 =>'февраля',
694
+      3 =>'марта',
695
+      4 =>'апреля',
696
+      5 =>'мая',
697
+      6 =>'июня',
698
+      7 =>'июля',
699
+      8 =>'августа',
700
+      9 =>'сентября',
701 701
     10 =>'октября',
702 702
     11 =>'ноября',
703 703
     12 =>'декабря'
@@ -993,7 +993,7 @@  discard block
 block discarded – undo
993 993
     PASSWORD_RESTORE_ERROR_ACCOUNT_NOT_EXISTS => 'Внутренняя ошибка - при смене пароля аккаунт не найден! Сообщите об этой ошибке Администрации!',
994 994
     AUTH_PASSWORD_RESET_INSIDE_ERROR_NO_ACCOUNT_FOR_CONFIRMATION => 'ВНУТРЕННЯЯ ОШИБКА! Нет аккаунтов для сброса пароля при корректном коде подтверждения! Пожалуйста, сообщите об этой ошибке Администрации Вселенной!',
995 995
     LOGIN_ERROR_NO_ACCOUNT_FOR_COOKIE_SET => 'ВНУТРЕННЯЯ ОШИБКА! СООБЩИТЕ АДМИНИСТРАЦИИ! Не установлен аккаунт при cookie_set()! Пожалуйста, сообщите об этой ошибке Администрации Вселенной!',
996
- ),
996
+  ),
997 997
 
998 998
   'log_reg_email_title' => "Ваша регистрация на сервере %1\$s игры СуперНова",
999 999
   'log_reg_email_text' => "Подтверждение регистрации для %3\$s\r\n\r\n
Please login to merge, or discard this patch.
galaxy.php 1 patch
Indentation   +94 added lines, -94 removed lines patch added patch discarded remove patch
@@ -230,53 +230,53 @@  discard block
 block discarded – undo
230 230
   $birthday_array = $uni_galaxyRowUser['user_birthday'] ? date_parse($uni_galaxyRowUser['user_birthday']) : array();
231 231
   $user_activity = floor((SN_TIME_NOW - $uni_galaxyRowUser['onlinetime'])/(60*60*24));
232 232
   $template->assign_block_vars('galaxyrow', array(
233
-     'PLANET_ID'        => $uni_galaxyRowPlanet['id'],
234
-     'PLANET_NUM'       => $Planet,
235
-     'PLANET_NAME'      => $uni_galaxyRowPlanet['name'],
236
-     'PLANET_NAME_JS'   => js_safe_string($uni_galaxyRowPlanet['name']),
237
-     'PLANET_DESTROYED' => $uni_galaxyRowPlanet["destruyed"],
238
-     'PLANET_TYPE'      => $uni_galaxyRowPlanet["planet_type"],
239
-     'PLANET_ACTIVITY'  => floor((SN_TIME_NOW - $uni_galaxyRowPlanet['last_update'])/60),
240
-     'PLANET_IMAGE'     => $uni_galaxyRowPlanet['image'],
241
-     'PLANET_FLEET_ID'  => $planet_fleet_id,
242
-     'PLANET_DIAMETER'  => number_format($uni_galaxyRowPlanet['diameter'], 0, '', '.'),
243
-
244
-     'MOON_NAME_JS'   => js_safe_string($uni_galaxyRowMoon['name']),
245
-     'MOON_IMAGE'     => $uni_galaxyRowMoon['image'],
246
-     'MOON_DIAMETER'  => number_format($uni_galaxyRowMoon['diameter'], 0, '', '.'),
247
-     'MOON_TEMP'      => number_format($uni_galaxyRowMoon['temp_min'], 0, '', '.'),
248
-     'MOON_FLEET_ID'  => $moon_fleet_id,
249
-
250
-     'DEBRIS'         => $uni_galaxyRowPlanet['debris'],
251
-     'DEBRIS_METAL'   => $uni_galaxyRowPlanet['debris_metal'],
252
-     'DEBRIS_CRYSTAL' => $uni_galaxyRowPlanet['debris_crystal'],
253
-     'DEBRIS_REST_PERCENT' => $uni_galaxyRowPlanet["debris_rest_percent"],
254
-
255
-     'DEBRIS_RESERVED' => $uni_galaxyRowPlanet['debris_reserved'],
256
-     'DEBRIS_RESERVED_PERCENT' => $uni_galaxyRowPlanet['debris_reserved_percent'],
257
-     'DEBRIS_WILL_GATHER' => $uni_galaxyRowPlanet['debris_will_gather'],
258
-     'DEBRIS_WILL_GATHER_PERCENT' => $uni_galaxyRowPlanet['debris_will_gather_percent'],
259
-     'DEBRIS_GATHER_TOTAL' => $uni_galaxyRowPlanet['debris_gather_total'],
260
-     'DEBRIS_GATHER_TOTAL_PERCENT' => $uni_galaxyRowPlanet['debris_gather_total_percent'],
261
-
262
-     'USER_ID'       => $uni_galaxyRowUser['id'],
263
-     'USER_NAME'     => player_nick_render_to_html($uni_galaxyRowUser),
264
-     'USER_NAME_JS'  => js_safe_string(player_nick_render_to_html($uni_galaxyRowUser)),
265
-     'USER_RANK'     => in_array($uni_galaxyRowUser['id'], $user_skip_list) ? '-' : $uni_galaxyRowUser['total_rank'],
266
-     'USER_BANNED'   => $uni_galaxyRowUser['banaday'],
267
-     'USER_VACATION' => $uni_galaxyRowUser['vacation'],
268
-     'USER_ACTIVITY' => $user_activity,
269
-     'USER_ATTACKABLE' => $user_activity >= 7,
270
-     'USER_INACTIVE' => $user_activity >= 28,
271
-     'USER_PROTECTED'=> $RowUserPoints <= $config->game_noob_points,
272
-     'USER_NOOB'     => $RowUserPoints * $config->game_noob_factor < $CurrentPoints && $config->game_noob_factor,
273
-     'USER_STRONG'   => $CurrentPoints * $config->game_noob_factor < $RowUserPoints && $config->game_noob_factor,
274
-     'USER_AUTH'     => $uni_galaxyRowUser['authlevel'],
275
-     'USER_ADMIN'    => $lang['user_level_shortcut'][$uni_galaxyRowUser['authlevel']],
276
-     'USER_BIRTHDAY' => $birthday_array['month'] == $time_now_parsed['mon'] && $birthday_array['day'] == $time_now_parsed['mday'] ? date(FMT_DATE, SN_TIME_NOW) : 0,
277
-
278
-     'ALLY_ID'       => $uni_galaxyRowUser['ally_id'],
279
-     'ALLY_TAG'      => $uni_galaxyRowUser['ally_tag'],
233
+      'PLANET_ID'        => $uni_galaxyRowPlanet['id'],
234
+      'PLANET_NUM'       => $Planet,
235
+      'PLANET_NAME'      => $uni_galaxyRowPlanet['name'],
236
+      'PLANET_NAME_JS'   => js_safe_string($uni_galaxyRowPlanet['name']),
237
+      'PLANET_DESTROYED' => $uni_galaxyRowPlanet["destruyed"],
238
+      'PLANET_TYPE'      => $uni_galaxyRowPlanet["planet_type"],
239
+      'PLANET_ACTIVITY'  => floor((SN_TIME_NOW - $uni_galaxyRowPlanet['last_update'])/60),
240
+      'PLANET_IMAGE'     => $uni_galaxyRowPlanet['image'],
241
+      'PLANET_FLEET_ID'  => $planet_fleet_id,
242
+      'PLANET_DIAMETER'  => number_format($uni_galaxyRowPlanet['diameter'], 0, '', '.'),
243
+
244
+      'MOON_NAME_JS'   => js_safe_string($uni_galaxyRowMoon['name']),
245
+      'MOON_IMAGE'     => $uni_galaxyRowMoon['image'],
246
+      'MOON_DIAMETER'  => number_format($uni_galaxyRowMoon['diameter'], 0, '', '.'),
247
+      'MOON_TEMP'      => number_format($uni_galaxyRowMoon['temp_min'], 0, '', '.'),
248
+      'MOON_FLEET_ID'  => $moon_fleet_id,
249
+
250
+      'DEBRIS'         => $uni_galaxyRowPlanet['debris'],
251
+      'DEBRIS_METAL'   => $uni_galaxyRowPlanet['debris_metal'],
252
+      'DEBRIS_CRYSTAL' => $uni_galaxyRowPlanet['debris_crystal'],
253
+      'DEBRIS_REST_PERCENT' => $uni_galaxyRowPlanet["debris_rest_percent"],
254
+
255
+      'DEBRIS_RESERVED' => $uni_galaxyRowPlanet['debris_reserved'],
256
+      'DEBRIS_RESERVED_PERCENT' => $uni_galaxyRowPlanet['debris_reserved_percent'],
257
+      'DEBRIS_WILL_GATHER' => $uni_galaxyRowPlanet['debris_will_gather'],
258
+      'DEBRIS_WILL_GATHER_PERCENT' => $uni_galaxyRowPlanet['debris_will_gather_percent'],
259
+      'DEBRIS_GATHER_TOTAL' => $uni_galaxyRowPlanet['debris_gather_total'],
260
+      'DEBRIS_GATHER_TOTAL_PERCENT' => $uni_galaxyRowPlanet['debris_gather_total_percent'],
261
+
262
+      'USER_ID'       => $uni_galaxyRowUser['id'],
263
+      'USER_NAME'     => player_nick_render_to_html($uni_galaxyRowUser),
264
+      'USER_NAME_JS'  => js_safe_string(player_nick_render_to_html($uni_galaxyRowUser)),
265
+      'USER_RANK'     => in_array($uni_galaxyRowUser['id'], $user_skip_list) ? '-' : $uni_galaxyRowUser['total_rank'],
266
+      'USER_BANNED'   => $uni_galaxyRowUser['banaday'],
267
+      'USER_VACATION' => $uni_galaxyRowUser['vacation'],
268
+      'USER_ACTIVITY' => $user_activity,
269
+      'USER_ATTACKABLE' => $user_activity >= 7,
270
+      'USER_INACTIVE' => $user_activity >= 28,
271
+      'USER_PROTECTED'=> $RowUserPoints <= $config->game_noob_points,
272
+      'USER_NOOB'     => $RowUserPoints * $config->game_noob_factor < $CurrentPoints && $config->game_noob_factor,
273
+      'USER_STRONG'   => $CurrentPoints * $config->game_noob_factor < $RowUserPoints && $config->game_noob_factor,
274
+      'USER_AUTH'     => $uni_galaxyRowUser['authlevel'],
275
+      'USER_ADMIN'    => $lang['user_level_shortcut'][$uni_galaxyRowUser['authlevel']],
276
+      'USER_BIRTHDAY' => $birthday_array['month'] == $time_now_parsed['mon'] && $birthday_array['day'] == $time_now_parsed['mday'] ? date(FMT_DATE, SN_TIME_NOW) : 0,
277
+
278
+      'ALLY_ID'       => $uni_galaxyRowUser['ally_id'],
279
+      'ALLY_TAG'      => $uni_galaxyRowUser['ally_tag'],
280 280
   ));
281 281
 }
282 282
 
@@ -342,53 +342,53 @@  discard block
 block discarded – undo
342 342
 $system_name = doquery("select `universe_name` from `{{universe}}` where `universe_galaxy` = {$uni_galaxy} and `universe_system` = {$uni_system} limit 1;", true);
343 343
 
344 344
 $template->assign_vars(array(
345
-     'rows'                => $Result,
346
-     'userCount'           => $config->users_amount,
347
-     'ALLY_COUNT'          => $ally_count['ally_count'],
348
-     'PLANET_EXPEDITION'   => $config->game_maxPlanet + 1,
349
-     'curPlanetID'         => $planetrow['id'],
350
-     'curPlanetG'          => $planetrow['galaxy'],
351
-     'curPlanetS'          => $planetrow['system'],
352
-     'curPlanetP'          => $planetrow['planet'],
353
-     'curPlanetPT'         => $planetrow['planet_type'],
354
-     'deathStars'          => mrc_get_level($user, $planetrow, SHIP_HUGE_DEATH_STAR, false, true),
355
-     'galaxy'              => $uni_galaxy,
356
-     'system'              => $uni_system,
357
-     'planet'              => $planet,
358
-     'MIPs'                => round($CurrentMIP),
359
-     'MODE'                => $mode,
360
-     'planets'             => $planetcount,
361
-     'SPs'                 => pretty_number(mrc_get_level($user, $planetrow, SHIP_SPY, false, true)),
362
-     'SHOW_ADMIN'          => SHOW_ADMIN,
363
-     'fleet_count'         => $maxfleet_count,
364
-     'fleet_max'           => $fleetmax,
365
-     'ALLY_ID'             => $user['ally_id'],
366
-     'USER_ID'             => $user['id'],
367
-     'ACT_SPIO'            => classSupernova::$user_options[PLAYER_OPTION_FLEET_SPY_DEFAULT],
368
-     'ACT_SPY'             => classSupernova::$user_options[PLAYER_OPTION_UNIVERSE_ICON_SPYING],
369
-     'ACT_WRITE'           => classSupernova::$user_options[PLAYER_OPTION_UNIVERSE_ICON_PM],
370
-     'ACT_STATISTICS'      => classSupernova::$user_options[PLAYER_OPTION_UNIVERSE_ICON_STATS],
371
-     'ACT_INFO'            => classSupernova::$user_options[PLAYER_OPTION_UNIVERSE_ICON_PROFILE],
372
-     'ACT_FRIEND'          => classSupernova::$user_options[PLAYER_OPTION_UNIVERSE_ICON_BUDDY],
373
-     'opt_uni_tooltip_time'=> classSupernova::$user_options[PLAYER_OPTION_TOOLTIP_DELAY],
374
-     'opt_uni_avatar_user' => $user['opt_uni_avatar_user'],
375
-     'opt_uni_avatar_ally' => $user['opt_uni_avatar_ally'],
376
-     'ACT_MISSILE'         => $is_missile,
377
-     'PLANET_PHALANX'      => $HavePhalanx && $uni_galaxy == $CurrentGalaxy && $uni_system >= $CurrentSystem - $PhalanxRange && $uni_system <= $CurrentSystem + $PhalanxRange,
378
-     'PAGE_HINT'           => $lang['gal_sys_hint'],
379
-     'PLANET_RECYCLERS'    => $planet_recyclers_orbiting,
380
-     'PLANET_RECYCLERS_TEXT' => pretty_number($planet_recyclers_orbiting),
381
-     'GALAXY_NAME'         => $galaxy_name['universe_name'],
382
-     'SYSTEM_NAME'         => $system_name['universe_name'],
383
-     'COL_SPAN'            => $colspan + 9,
384
-     'COL_SPAN_PLUS'       => $colspan + 3,
385
-
386
-     'COL_SPAN_NEW'        => $colspan + 4,
387
-     'COL_SPAN_NEW_COLONIZE' => $colspan - 2,
388
-
389
-     'PLAYER_OPTION_UNIVERSE_OLD' => classSupernova::$user_options[PLAYER_OPTION_UNIVERSE_OLD],
390
-     'PLAYER_OPTION_UNIVERSE_DISABLE_COLONIZE' => classSupernova::$user_options[PLAYER_OPTION_UNIVERSE_DISABLE_COLONIZE],
391
-   )
345
+      'rows'                => $Result,
346
+      'userCount'           => $config->users_amount,
347
+      'ALLY_COUNT'          => $ally_count['ally_count'],
348
+      'PLANET_EXPEDITION'   => $config->game_maxPlanet + 1,
349
+      'curPlanetID'         => $planetrow['id'],
350
+      'curPlanetG'          => $planetrow['galaxy'],
351
+      'curPlanetS'          => $planetrow['system'],
352
+      'curPlanetP'          => $planetrow['planet'],
353
+      'curPlanetPT'         => $planetrow['planet_type'],
354
+      'deathStars'          => mrc_get_level($user, $planetrow, SHIP_HUGE_DEATH_STAR, false, true),
355
+      'galaxy'              => $uni_galaxy,
356
+      'system'              => $uni_system,
357
+      'planet'              => $planet,
358
+      'MIPs'                => round($CurrentMIP),
359
+      'MODE'                => $mode,
360
+      'planets'             => $planetcount,
361
+      'SPs'                 => pretty_number(mrc_get_level($user, $planetrow, SHIP_SPY, false, true)),
362
+      'SHOW_ADMIN'          => SHOW_ADMIN,
363
+      'fleet_count'         => $maxfleet_count,
364
+      'fleet_max'           => $fleetmax,
365
+      'ALLY_ID'             => $user['ally_id'],
366
+      'USER_ID'             => $user['id'],
367
+      'ACT_SPIO'            => classSupernova::$user_options[PLAYER_OPTION_FLEET_SPY_DEFAULT],
368
+      'ACT_SPY'             => classSupernova::$user_options[PLAYER_OPTION_UNIVERSE_ICON_SPYING],
369
+      'ACT_WRITE'           => classSupernova::$user_options[PLAYER_OPTION_UNIVERSE_ICON_PM],
370
+      'ACT_STATISTICS'      => classSupernova::$user_options[PLAYER_OPTION_UNIVERSE_ICON_STATS],
371
+      'ACT_INFO'            => classSupernova::$user_options[PLAYER_OPTION_UNIVERSE_ICON_PROFILE],
372
+      'ACT_FRIEND'          => classSupernova::$user_options[PLAYER_OPTION_UNIVERSE_ICON_BUDDY],
373
+      'opt_uni_tooltip_time'=> classSupernova::$user_options[PLAYER_OPTION_TOOLTIP_DELAY],
374
+      'opt_uni_avatar_user' => $user['opt_uni_avatar_user'],
375
+      'opt_uni_avatar_ally' => $user['opt_uni_avatar_ally'],
376
+      'ACT_MISSILE'         => $is_missile,
377
+      'PLANET_PHALANX'      => $HavePhalanx && $uni_galaxy == $CurrentGalaxy && $uni_system >= $CurrentSystem - $PhalanxRange && $uni_system <= $CurrentSystem + $PhalanxRange,
378
+      'PAGE_HINT'           => $lang['gal_sys_hint'],
379
+      'PLANET_RECYCLERS'    => $planet_recyclers_orbiting,
380
+      'PLANET_RECYCLERS_TEXT' => pretty_number($planet_recyclers_orbiting),
381
+      'GALAXY_NAME'         => $galaxy_name['universe_name'],
382
+      'SYSTEM_NAME'         => $system_name['universe_name'],
383
+      'COL_SPAN'            => $colspan + 9,
384
+      'COL_SPAN_PLUS'       => $colspan + 3,
385
+
386
+      'COL_SPAN_NEW'        => $colspan + 4,
387
+      'COL_SPAN_NEW_COLONIZE' => $colspan - 2,
388
+
389
+      'PLAYER_OPTION_UNIVERSE_OLD' => classSupernova::$user_options[PLAYER_OPTION_UNIVERSE_OLD],
390
+      'PLAYER_OPTION_UNIVERSE_DISABLE_COLONIZE' => classSupernova::$user_options[PLAYER_OPTION_UNIVERSE_DISABLE_COLONIZE],
391
+    )
392 392
 );
393 393
 
394 394
 display(parsetemplate($template), $lang['sys_universe'], true, '', false);
Please login to merge, or discard this patch.
includes/db.php 1 patch
Indentation   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -169,14 +169,14 @@
 block discarded – undo
169 169
   return classSupernova::db_changeset_apply($db_changeset);
170 170
 }
171 171
 /**
172
- * Функция проверяет статус транзакции
173
- *
174
- * @param null|true|false $status Должна ли быть запущена транзакция в момент проверки
175
- *   <p>null - транзакция НЕ должна быть запущена</p>
176
- *   <p>true - транзакция должна быть запущена - для совместимости с $for_update</p>
177
- *   <p>false - всё равно - для совместимости с $for_update</p>
178
- * @return bool Текущий статус транзакции
179
- */
172
+   * Функция проверяет статус транзакции
173
+   *
174
+   * @param null|true|false $status Должна ли быть запущена транзакция в момент проверки
175
+   *   <p>null - транзакция НЕ должна быть запущена</p>
176
+   *   <p>true - транзакция должна быть запущена - для совместимости с $for_update</p>
177
+   *   <p>false - всё равно - для совместимости с $for_update</p>
178
+   * @return bool Текущий статус транзакции
179
+   */
180 180
 function sn_db_transaction_check($transaction_should_be_started = null) {
181 181
   return classSupernova::db_transaction_check($transaction_should_be_started);
182 182
 }
Please login to merge, or discard this patch.
includes/general.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -815,7 +815,7 @@
 block discarded – undo
815 815
       '%H' => '(?P<H>[0-9]{2})',
816 816
       '%M' => '(?P<M>[0-9]{2})',
817 817
       '%S' => '(?P<S>[0-9]{2})',
818
-     // usw..
818
+      // usw..
819 819
     );
820 820
 
821 821
     $rexep = "#".strtr(preg_quote($format), $masks)."#";
Please login to merge, or discard this patch.
includes/vars.php 1 patch
Indentation   +74 added lines, -74 removed lines patch added patch discarded remove patch
@@ -16,23 +16,23 @@  discard block
 block discarded – undo
16 16
 $sn_menu_admin_extra = array();
17 17
 
18 18
 $sn_mvc = array(
19
- 'model' => array(
20
-   'options' => array('sn_options_model'),
21
-   'chat' => array('sn_chat_model'),
22
-   'chat_add' => array('sn_chat_add_model'),
23
- ),
24
- 'view' => array(
25
-   'options' => array('sn_options_view'),
26
-   'chat' => array('sn_chat_view'),
27
-   'chat_msg' => array('sn_chat_msg_view'),
28
- ),
29
- 'controller' => array(),
30
- 'i18n' => array(
31
-   'options' => array(
32
-     'options' => 'options',
33
-     'messages' => 'messages',
34
-   ),
35
- ),
19
+  'model' => array(
20
+    'options' => array('sn_options_model'),
21
+    'chat' => array('sn_chat_model'),
22
+    'chat_add' => array('sn_chat_add_model'),
23
+  ),
24
+  'view' => array(
25
+    'options' => array('sn_options_view'),
26
+    'chat' => array('sn_chat_view'),
27
+    'chat_msg' => array('sn_chat_msg_view'),
28
+  ),
29
+  'controller' => array(),
30
+  'i18n' => array(
31
+    'options' => array(
32
+      'options' => 'options',
33
+      'messages' => 'messages',
34
+    ),
35
+  ),
36 36
 );
37 37
 
38 38
 $note_priority_classes = array(
@@ -120,62 +120,62 @@  discard block
 block discarded – undo
120 120
   );
121 121
 
122 122
 $sn_message_class_list = array(
123
-   MSG_TYPE_NEW => array(
124
-     'name' => 'new_message',
125
-     'switchable' => false,
126
-     'email' => false,
127
-   ),
128
-   MSG_TYPE_ADMIN => array(
129
-     'name' => 'msg_admin',
130
-     'switchable' => false,
131
-     'email' => true,
132
-   ),
133
-   MSG_TYPE_PLAYER => array(
134
-     'name' => 'mnl_joueur',
135
-     'switchable' => false,
136
-     'email' => true,
137
-   ),
138
-   MSG_TYPE_ALLIANCE => array(
139
-     'name' => 'mnl_alliance',
140
-     'switchable' => false,
141
-     'email' => true,
142
-   ),
143
-   MSG_TYPE_SPY => array(
144
-     'name' => 'mnl_spy',
145
-     'switchable' => true,
146
-     'email' => true,
147
-   ),
148
-   MSG_TYPE_COMBAT => array(
149
-     'name' => 'mnl_attaque',
150
-     'switchable' => true,
151
-     'email' => true,
152
-   ),
153
-   MSG_TYPE_TRANSPORT => array(
154
-     'name' => 'mnl_transport',
155
-     'switchable' => true,
156
-     'email' => true,
157
-   ),
158
-   MSG_TYPE_RECYCLE => array(
159
-     'name' => 'mnl_exploit',
160
-     'switchable' => true,
161
-     'email' => true,
162
-   ),
163
-   MSG_TYPE_EXPLORE => array(
164
-     'name' => 'mnl_expedition',
165
-     'switchable' => true,
166
-     'email' => true,
167
-   ),
168
-   //     97 => 'mnl_general',
169
-   MSG_TYPE_QUE => array(
170
-     'name' => 'mnl_buildlist',
171
-     'switchable' => true,
172
-     'email' => true,
173
-   ),
174
-   MSG_TYPE_OUTBOX => array(
175
-     'name' => 'mnl_outbox',
176
-     'switchable' => false,
177
-     'email' => false,
178
-   ),
123
+    MSG_TYPE_NEW => array(
124
+      'name' => 'new_message',
125
+      'switchable' => false,
126
+      'email' => false,
127
+    ),
128
+    MSG_TYPE_ADMIN => array(
129
+      'name' => 'msg_admin',
130
+      'switchable' => false,
131
+      'email' => true,
132
+    ),
133
+    MSG_TYPE_PLAYER => array(
134
+      'name' => 'mnl_joueur',
135
+      'switchable' => false,
136
+      'email' => true,
137
+    ),
138
+    MSG_TYPE_ALLIANCE => array(
139
+      'name' => 'mnl_alliance',
140
+      'switchable' => false,
141
+      'email' => true,
142
+    ),
143
+    MSG_TYPE_SPY => array(
144
+      'name' => 'mnl_spy',
145
+      'switchable' => true,
146
+      'email' => true,
147
+    ),
148
+    MSG_TYPE_COMBAT => array(
149
+      'name' => 'mnl_attaque',
150
+      'switchable' => true,
151
+      'email' => true,
152
+    ),
153
+    MSG_TYPE_TRANSPORT => array(
154
+      'name' => 'mnl_transport',
155
+      'switchable' => true,
156
+      'email' => true,
157
+    ),
158
+    MSG_TYPE_RECYCLE => array(
159
+      'name' => 'mnl_exploit',
160
+      'switchable' => true,
161
+      'email' => true,
162
+    ),
163
+    MSG_TYPE_EXPLORE => array(
164
+      'name' => 'mnl_expedition',
165
+      'switchable' => true,
166
+      'email' => true,
167
+    ),
168
+    //     97 => 'mnl_general',
169
+    MSG_TYPE_QUE => array(
170
+      'name' => 'mnl_buildlist',
171
+      'switchable' => true,
172
+      'email' => true,
173
+    ),
174
+    MSG_TYPE_OUTBOX => array(
175
+      'name' => 'mnl_outbox',
176
+      'switchable' => false,
177
+      'email' => false,
178
+    ),
179 179
 );
180 180
 
181 181
 $sn_message_groups = array(
@@ -1027,7 +1027,7 @@  discard block
 block discarded – undo
1027 1027
       SHIP_HUGE_DEATH_STAR => SHIP_HUGE_DEATH_STAR, SHIP_HUGE_SUPERNOVA => SHIP_HUGE_SUPERNOVA,
1028 1028
       SHIP_CARGO_SMALL => SHIP_CARGO_SMALL, SHIP_CARGO_BIG => SHIP_CARGO_BIG, SHIP_CARGO_SUPER => SHIP_CARGO_SUPER, SHIP_CARGO_HYPER => SHIP_CARGO_HYPER,
1029 1029
       SHIP_RECYCLER => SHIP_RECYCLER, SHIP_COLONIZER => SHIP_COLONIZER, SHIP_SPY => SHIP_SPY, SHIP_SATTELITE_SOLAR => SHIP_SATTELITE_SOLAR
1030
-     ),
1030
+      ),
1031 1031
     // Defensive building list
1032 1032
     'defense'   => array (UNIT_DEF_TURRET_MISSILE => UNIT_DEF_TURRET_MISSILE, UNIT_DEF_TURRET_LASER_SMALL => UNIT_DEF_TURRET_LASER_SMALL,
1033 1033
                           UNIT_DEF_TURRET_LASER_BIG => UNIT_DEF_TURRET_LASER_BIG, UNIT_DEF_TURRET_GAUSS => UNIT_DEF_TURRET_GAUSS,
Please login to merge, or discard this patch.