From 096fdfc61b5381bd3f7918a7c5f6004461354f32 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Thu, 26 May 2016 16:33:01 -0700 Subject: consolidate all the sys_boot functionality that is common between the web server and the cli daemon manager. Get rid of yet another global variable ($default_timezone) whilst doing so. --- include/cli_startup.php | 28 +--------------------------- 1 file changed, 1 insertion(+), 27 deletions(-) (limited to 'include') diff --git a/include/cli_startup.php b/include/cli_startup.php index 792598c6c..a4c1f629a 100644 --- a/include/cli_startup.php +++ b/include/cli_startup.php @@ -6,33 +6,7 @@ require_once('boot.php'); function cli_startup() { - global $default_timezone; - - $a = new miniApp; - - App::init(); - - @include(".htconfig.php"); - - $a->convert(); - - if(! defined('UNO')) - define('UNO', 0); - - App::$timezone = ((x($default_timezone)) ? $default_timezone : 'UTC'); - date_default_timezone_set(App::$timezone); - - require_once('include/dba/dba_driver.php'); - DBA::dba_factory($db_host, $db_port, $db_user, $db_pass, $db_data, $db_type); - unset($db_host, $db_port, $db_user, $db_pass, $db_data, $db_type); - - App::$session = new Zotlabs\Web\Session(); - App::$session->init(); - - load_config('system'); - + sys_boot(); App::set_baseurl(get_config('system','baseurl')); - load_hooks(); - } \ No newline at end of file -- cgit v1.2.3