Remove extraneous dba::connect calls

[friendica.git/.git] / index.php

diff --git a/index.php b/index.php
index f65867f..501235f 100644 (file)
--- a/index.php
+++ b/index.php
@@ -9,7 +9,6 @@
  */
 
 use Friendica\App;
-use Friendica\BaseObject;
 use Friendica\Content\Nav;
 use Friendica\Core\Addon;
 use Friendica\Core\Config;
@@ -25,7 +24,6 @@ use Friendica\Module\Login;
 require_once 'boot.php';
 
 $a = new App(__DIR__);
-BaseObject::setApp($a);
 
 // We assume that the index.php is called by a frontend process
 // The value is set to "true" by default in boot.php
@@ -43,15 +41,12 @@ if (!$a->mode == App::MODE_INSTALL) {
 require_once "include/dba.php";
 
 if (!$a->mode == App::MODE_INSTALL) {
-       $result = dba::connect($db_host, $db_user, $db_pass, $db_data);
-       unset($db_host, $db_user, $db_pass, $db_data);
-
-       if (!$result) {
+       if (!dba::connected()) {
                System::unavailable();
        }
 
        /**
-        * Load configs from db. Overwrite configs from .htconfig.php
+        * Load configs from db. Overwrite configs from config/local.ini.php
         */
 
        Config::load();
@@ -76,8 +71,6 @@ if (!$a->mode == App::MODE_INSTALL) {
        Session::init();
        Addon::loadHooks();
        Addon::callHooks('init_1');
-
-       $a->checkMaintenanceMode();
 }
 
 $lang = L10n::getBrowserLanguage();
@@ -128,7 +121,7 @@ if ((x($_GET,'zrl')) && $a->mode == App::MODE_NORMAL) {
                // Valid profile links contain a path with "/profile/" and no query parameters
                if ((parse_url($_GET['zrl'], PHP_URL_QUERY) == "") &&
                        strstr(parse_url($_GET['zrl'], PHP_URL_PATH), "/profile/")) {
-                       if ($_SESSION["visitor_home"] != $_GET["zrl"]) {
+                       if (defaults($_SESSION, "visitor_home", "") != $_GET["zrl"]) {
                                $_SESSION['my_url'] = $_GET['zrl'];
                                $_SESSION['authenticated'] = 0;
                        }