From 516c43ba154dc43ec0ef6135fb0a9732d0185a6f Mon Sep 17 00:00:00 2001
From: redmatrix <git@macgirvin.com>
Date: Tue, 24 May 2016 17:54:45 -0700
Subject: more work associated with DBA and index.php shuffle

---
 Zotlabs/Web/WebServer.php | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

(limited to 'Zotlabs/Web/WebServer.php')

diff --git a/Zotlabs/Web/WebServer.php b/Zotlabs/Web/WebServer.php
index 98bf62c9a..5237bf667 100644
--- a/Zotlabs/Web/WebServer.php
+++ b/Zotlabs/Web/WebServer.php
@@ -1,19 +1,16 @@
 <?php /** @file */
 
+namespace Zotlabs\Web;
+
 class WebServer {
 
 	public function run() {
 
-		global $db;
 
 		/*
 		 * Bootstrap the application, load configuration, load modules, load theme, etc.
 		 */
 
-		/*
-		 * bootstrap the application
-		 */
-
 		require_once('boot.php');
 
 		if(file_exists('.htsite.php'))
@@ -54,8 +51,8 @@ class WebServer {
 		require_once('include/dba/dba_driver.php');
 
 		if(! \App::$install) {
-			$db = DBA::dba_factory($db_host, $db_port, $db_user, $db_pass, $db_data, $db_type, \App::$install);
-			if(! $db->connected) {
+			\DBA::dba_factory($db_host, $db_port, $db_user, $db_pass, $db_data, $db_type, \App::$install);
+			if(! \DBA::$dba->connected) {
 				system_unavailable();
 			}
 
@@ -69,7 +66,7 @@ class WebServer {
 			load_config('system');
 			load_config('feature');
 
-			\App::$session = new Zotlabs\Web\Session();
+			\App::$session = new Session();
 			\App::$session->init();
 			load_hooks();
 			call_hooks('init_1');
@@ -150,7 +147,7 @@ class WebServer {
 
 		nav_set_selected('nothing');
 
-		$Router = new Zotlabs\Web\Router($a);
+		$Router = new Router($a);
 
 		/* initialise content region */
 
-- 
cgit v1.2.3