more work associated with DBA and index.php shuffle

This commit is contained in:
redmatrix
2016-05-24 17:54:45 -07:00
parent 84ba6393ad
commit 516c43ba15
6 changed files with 106 additions and 140 deletions

View File

@@ -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();