X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=index.php;h=5915498904d477720ee2313cee02674470b30dea;hb=3b2cd854837e5df38f75f323aab24e31098812d4;hp=49a3b216da6624fe4623c80cc43adf2bcd813835;hpb=2bcd5b3243004b0659be06a5370016d080b23e87;p=friendica.git

diff --git a/index.php b/index.php
index 49a3b216da..5915498904 100644
--- a/index.php
+++ b/index.php
@@ -16,11 +16,15 @@
 use Friendica\App;
 use Friendica\Core\System;
 use Friendica\Core\Config;
+use Friendica\Core\Worker;
+use Friendica\Database\DBM;
 
 require_once 'boot.php';
 require_once 'object/BaseObject.php';
 
-$a = new App(__DIR__);
+if (empty($a)) {
+	$a = new App(__DIR__);
+}
 BaseObject::set_app($a);
 
 // We assume that the index.php is called by a frontend process
@@ -51,7 +55,7 @@ if (!$install) {
 require_once "include/dba.php";
 
 if (!$install) {
-	$db = new dba($db_host, $db_user, $db_pass, $db_data, $install);
+	dba::connect($db_host, $db_user, $db_pass, $db_data, $install);
 	unset($db_host, $db_user, $db_pass, $db_data);
 
 	/**
@@ -67,8 +71,8 @@ if (!$install) {
 		die("System is currently unavailable. Please try again later");
 	}
 
-	if (get_config('system', 'force_ssl') && ($a->get_scheme() == "http") &&
-		(intval(get_config('system', 'ssl_policy')) == SSL_POLICY_FULL) &&
+	if (Config::get('system', 'force_ssl') && ($a->get_scheme() == "http") &&
+		(intval(Config::get('system', 'ssl_policy')) == SSL_POLICY_FULL) &&
 		(substr(System::baseUrl(), 0, 8) == "https://")) {
 		header("HTTP/1.1 302 Moved Temporarily");
 		header("Location: " . System::baseUrl() . "/" . $a->query_string);
@@ -79,7 +83,7 @@ if (!$install) {
 	load_hooks();
 	call_hooks('init_1');
 
-	$maintenance = get_config('system', 'maintenance');
+	$maintenance = Config::get('system', 'maintenance');
 }
 
 $lang = get_browser_language();
@@ -103,9 +107,7 @@ if (!$a->is_backend()) {
 	session_start();
 	$a->save_timestamp($stamp1, "parser");
 } else {
-	require_once "include/poller.php";
-
-	call_worker_if_idle();
+	Worker::executeIfIdle();
 }
 
 /**
@@ -116,7 +118,7 @@ if (x($_SESSION,'authenticated') && !x($_SESSION,'language')) {
 	// we didn't loaded user data yet, but we need user language
 	$r = dba::select('user', array('language'), array('uid' => $_SESSION['uid']), array('limit' => 1));
 	$_SESSION['language'] = $lang;
-	if (dbm::is_result($r)) {
+	if (DBM::is_result($r)) {
 		$_SESSION['language'] = $r['language'];
 	}
 }
@@ -203,7 +205,7 @@ if ($install && $a->module!="view") {
 nav_set_selected('nothing');
 
 //Don't populate apps_menu if apps are private
-$privateapps = get_config('config','private_addons');
+$privateapps = Config::get('config','private_addons');
 if ((local_user()) || (! $privateapps === "1")) {
 	$arr = array('app_menu' => $a->apps);
 
@@ -250,7 +252,7 @@ if (strlen($a->module)) {
 		$a->module = "login";
 	}
 
-	$privateapps = get_config('config','private_addons');
+	$privateapps = Config::get('config','private_addons');
 
 	if (is_array($a->plugins) && in_array($a->module,$a->plugins) && file_exists("addon/{$a->module}/{$a->module}.php")) {
 		//Check if module is an app and if public access to apps is allowed or not