From 2dcedd69519a40ca0f40bf7b8b86423e98c778c9 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Mon, 16 May 2016 17:07:39 -0700 Subject: more work on sessions and cookies, as some anomalies appeared in caldav and firefox which suggested deeper issues --- include/cli_startup.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'include/cli_startup.php') diff --git a/include/cli_startup.php b/include/cli_startup.php index a99164d4c..a33f7acb0 100644 --- a/include/cli_startup.php +++ b/include/cli_startup.php @@ -30,7 +30,8 @@ function cli_startup() { unset($db_host, $db_port, $db_user, $db_pass, $db_data, $db_type); }; - \Zotlabs\Web\Session::init(); + App::$session = new Zotlabs\Web\Session(); + App::$session->init(); load_config('system'); -- cgit v1.2.3 From 84ba6393ad32406a9875044aef2d031c7d0d7a46 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Tue, 24 May 2016 16:36:55 -0700 Subject: relocate index and db --- include/cli_startup.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include/cli_startup.php') diff --git a/include/cli_startup.php b/include/cli_startup.php index a33f7acb0..b89d5f1bb 100644 --- a/include/cli_startup.php +++ b/include/cli_startup.php @@ -14,7 +14,7 @@ function cli_startup() { App::init(); - if(is_null($db)) { + if(! DBA::$connected) { @include(".htconfig.php"); $a->convert(); @@ -26,7 +26,7 @@ function cli_startup() { date_default_timezone_set(App::$timezone); require_once('include/dba/dba_driver.php'); - $db = dba_factory($db_host, $db_port, $db_user, $db_pass, $db_data, $db_type); + $db = 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); }; -- cgit v1.2.3 From 516c43ba154dc43ec0ef6135fb0a9732d0185a6f Mon Sep 17 00:00:00 2001 From: redmatrix Date: Tue, 24 May 2016 17:54:45 -0700 Subject: more work associated with DBA and index.php shuffle --- include/cli_startup.php | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) (limited to 'include/cli_startup.php') diff --git a/include/cli_startup.php b/include/cli_startup.php index b89d5f1bb..1436fe1ef 100644 --- a/include/cli_startup.php +++ b/include/cli_startup.php @@ -6,7 +6,7 @@ require_once('boot.php'); function cli_startup() { - global $a, $db, $default_timezone; + global $default_timezone; if(is_null($a)) { $a = new miniApp; @@ -14,21 +14,19 @@ function cli_startup() { App::init(); - if(! DBA::$connected) { - @include(".htconfig.php"); + @include(".htconfig.php"); - $a->convert(); + $a->convert(); - if(! defined('UNO')) - define('UNO', 0); + if(! defined('UNO')) + define('UNO', 0); - App::$timezone = ((x($default_timezone)) ? $default_timezone : 'UTC'); - date_default_timezone_set(App::$timezone); + App::$timezone = ((x($default_timezone)) ? $default_timezone : 'UTC'); + date_default_timezone_set(App::$timezone); - require_once('include/dba/dba_driver.php'); - $db = 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); - }; + 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(); -- cgit v1.2.3 From da19ac98dd871216d23bef08b33dc4313446c883 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Wed, 25 May 2016 13:46:19 -0700 Subject: Just set it and forget it. --- include/cli_startup.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'include/cli_startup.php') diff --git a/include/cli_startup.php b/include/cli_startup.php index 1436fe1ef..792598c6c 100644 --- a/include/cli_startup.php +++ b/include/cli_startup.php @@ -8,9 +8,7 @@ function cli_startup() { global $default_timezone; - if(is_null($a)) { - $a = new miniApp; - } + $a = new miniApp; App::init(); -- cgit v1.2.3 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/cli_startup.php') 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