aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Web/WebServer.php
diff options
context:
space:
mode:
authorredmatrix <git@macgirvin.com>2016-05-24 17:54:45 -0700
committerredmatrix <git@macgirvin.com>2016-05-24 17:54:45 -0700
commit516c43ba154dc43ec0ef6135fb0a9732d0185a6f (patch)
tree9e8fcfbd22f6ad8013fd48ec60090be7ccf73d11 /Zotlabs/Web/WebServer.php
parent84ba6393ad32406a9875044aef2d031c7d0d7a46 (diff)
downloadvolse-hubzilla-516c43ba154dc43ec0ef6135fb0a9732d0185a6f.tar.gz
volse-hubzilla-516c43ba154dc43ec0ef6135fb0a9732d0185a6f.tar.bz2
volse-hubzilla-516c43ba154dc43ec0ef6135fb0a9732d0185a6f.zip
more work associated with DBA and index.php shuffle
Diffstat (limited to 'Zotlabs/Web/WebServer.php')
-rw-r--r--Zotlabs/Web/WebServer.php15
1 files changed, 6 insertions, 9 deletions
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 */