Merge branch '1.8RC'

1 files changed, 6 insertions, 173 deletions

diff --git a/index.php b/index.php
index 1178881ba..d47bda27e 100755
--- a/index.php
+++ b/index.php
@@ -1,182 +1,15 @@
 <?php
-/**
- * @file index.php
- *
- * @brief The main entry point to the application.
- *
- * Bootstrap the application, load configuration, load modules, load theme, etc.
- */
-
-/*
- * bootstrap the application
- */
-require_once('boot.php');
-
-if(file_exists('.htsite.php'))
-	include('.htsite.php');
-
-// our global App object
-
-$a = new miniApp;
-
-App::init();
-
-/*
- * Load the configuration file which contains our DB credentials.
- * Ignore errors. If the file doesn't exist or is empty, we are running in
- * installation mode.
- */
-
-App::$install = ((file_exists('.htconfig.php') && filesize('.htconfig.php')) ? false : true);
-
-@include('.htconfig.php');
-
-if(! defined('UNO'))
-	define('UNO', 0);
-
-$a->convert();
-
-App::$timezone = ((x($default_timezone)) ? $default_timezone : 'UTC');
-date_default_timezone_set(App::$timezone);
-
-
-/*
- * Try to open the database;
- */
-
-require_once('include/dba/dba_driver.php');
-
-if(! App::$install) {
-	$db = dba_factory($db_host, $db_port, $db_user, $db_pass, $db_data, $db_type, App::$install);
-	if(! $db->connected) {
-		system_unavailable();
-	}
-
-	unset($db_host, $db_port, $db_user, $db_pass, $db_data, $db_type);
-
-	/**
-	 * Load configs from db. Overwrite configs from .htconfig.php
-	 */
-
-	load_config('config');
-	load_config('system');
-	load_config('feature');
-
-	\Zotlabs\Web\Session::init();
-	load_hooks();
-	call_hooks('init_1');
-
-}
-
-
-	App::$language = get_best_language();
-	load_translation_table(App::$language,App::$install);
 
+namespace Zotlabs\Web;
 
 /**
+ * @file index.php
  *
- * Important stuff we always need to do.
- *
- * The order of these may be important so use caution if you think they're all
- * intertwingled with no logical order and decide to sort it out. Some of the
- * dependencies have changed, but at least at one time in the recent past - the
- * order was critical to everything working properly
- *
- */
-
-\Zotlabs\Web\Session::start();
-
-/**
- * Language was set earlier, but we can over-ride it in the session.
- * We have to do it here because the session was just now opened.
- */
-
-if(array_key_exists('system_language',$_POST)) {
-	if(strlen($_POST['system_language']))
-		$_SESSION['language'] = $_POST['system_language'];
-	else
-		unset($_SESSION['language']);
-}
-if((x($_SESSION, 'language')) && ($_SESSION['language'] !== $lang)) {
-	App::$language = $_SESSION['language'];
-	load_translation_table(App::$language);
-}
-
-if((x($_GET,'zid')) && (! App::$install)) {
-	App::$query_string = strip_zids(App::$query_string);
-	if(! local_channel()) {
-		$_SESSION['my_address'] = $_GET['zid'];
-		zid_init($a);
-	}
-}
-
-if((x($_SESSION, 'authenticated')) || (x($_POST, 'auth-params')) || (App::$module === 'login'))
-	require('include/auth.php');
-
-if(! x($_SESSION, 'sysmsg'))
-	$_SESSION['sysmsg'] = array();
-
-if(! x($_SESSION, 'sysmsg_info'))
-	$_SESSION['sysmsg_info'] = array();
-
-/*
- * check_config() is responsible for running update scripts. These automatically
- * update the DB schema whenever we push a new one out. It also checks to see if
- * any plugins have been added or removed and reacts accordingly.
+ * @brief The main entry point to the application.
  */
 
+require_once('Zotlabs/Web/WebServer.php');
 
-if(App::$install) {
-	/* Allow an exception for the view module so that pcss will be interpreted during installation */
-	if(App::$module != 'view')
-		App::$module = 'setup';
-}
-else
-	check_config($a);
-
-nav_set_selected('nothing');
-
-$arr = array('app_menu' => App::get_apps());
-
-call_hooks('app_menu', $arr);
-
-App::set_apps($arr['app_menu']);
-
-$Router = new Zotlabs\Web\Router($a);
-
-/* initialise content region */
-
-if(! x(App::$page, 'content'))
-	App::$page['content'] = '';
-
-call_hooks('page_content_top', App::$page['content']);
-
-
-$Router->Dispatch($a);
-
-
-// If you're just visiting, let javascript take you home
-
-if(x($_SESSION, 'visitor_home')) {
-	$homebase = $_SESSION['visitor_home'];
-} elseif(local_channel()) {
-	$homebase = z_root() . '/channel/' . App::$channel['channel_address'];
-}
-
-if(isset($homebase)) {
-	App::$page['content'] .= '<script>var homebase = "' . $homebase . '";</script>';
-}
-
-// now that we've been through the module content, see if the page reported
-// a permission problem and if so, a 403 response would seem to be in order.
-
-if(stristr(implode("", $_SESSION['sysmsg']), t('Permission denied'))) {
-	header($_SERVER['SERVER_PROTOCOL'] . ' 403 ' . t('Permission denied.'));
-}
-
-
-call_hooks('page_end', App::$page['content']);
-
-construct_page($a);
+$server = new WebServer();
+$server->run();
 
-killme();