harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

server roles

Browse Source
This commit is contained in:
redmatrix 2016-08-07 17:40:56 -07:00
parent 5243dd153b
commit de455e4cd0
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
boot.php
View File

@ -602,6 +602,12 @@ function sys_boot() {
@include('.htconfig.php'); @include('.htconfig.php');
if(array_key_exists('default_timezone',get_defined_vars())) {
App::$config['system']['timezone'] = $default_timezone;
}
$a->convert();
if(defined('UNO')) { if(defined('UNO')) {
if(UNO) if(UNO)
App::$config['system']['server_role'] = 'basic'; App::$config['system']['server_role'] = 'basic';
@ -609,11 +615,8 @@ function sys_boot() {
App::$config['system']['server_role'] = 'pro'; App::$config['system']['server_role'] = 'pro';
} }
if(array_key_exists('default_timezone',get_defined_vars())) { if(! (array_key_exists('server_role',App::$config['system']) && App::$config['system']['server_role']))
App::$config['system']['timezone'] = $default_timezone; App::$config['system']['server_role'] = 'pro';
}
$a->convert();
App::$timezone = ((App::$config['system']['timezone']) ? App::$config['system']['timezone'] : 'UTC'); App::$timezone = ((App::$config['system']['timezone']) ? App::$config['system']['timezone'] : 'UTC');
date_default_timezone_set(App::$timezone); date_default_timezone_set(App::$timezone);
@ -637,7 +640,6 @@ function sys_boot() {
* Load configs from db. Overwrite configs from .htconfig.php * Load configs from db. Overwrite configs from .htconfig.php
*/ */
load_config('config');
load_config('system'); load_config('system');
load_config('feature'); load_config('feature');