Standards: Rename App methods

[friendica.git] / index.php

diff --git a/index.php b/index.php
index f65867feb6c9cf876e7b1930949b54130552c9da..5da31f100e6b8ffda0c9b36f4b29db06fa4a5cfe 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,17 +24,11 @@ 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
 $a->backend = false;
 
-// Only load config if found, don't suppress errors
-if (!$a->mode == App::MODE_INSTALL) {
-       include ".htconfig.php";
-}
-
 /**
  * Try to open the database;
  */
@@ -43,20 +36,13 @@ 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) {
-               System::unavailable();
-       }
-
        /**
-        * Load configs from db. Overwrite configs from .htconfig.php
+        * Load configs from db. Overwrite configs from config/local.ini.php
         */
 
        Config::load();
 
-       if ($a->max_processes_reached() || $a->maxload_reached()) {
+if ($a->isMaxProcessesReached() || $a->isMaxLoadReached()) {
                header($_SERVER["SERVER_PROTOCOL"] . ' 503 Service Temporarily Unavailable');
                header('Retry-After: 120');
                header('Refresh: 120; url=' . System::baseUrl() . "/" . $a->query_string);
@@ -76,8 +62,6 @@ if (!$a->mode == App::MODE_INSTALL) {
        Session::init();
        Addon::loadHooks();
        Addon::callHooks('init_1');
-
-       $a->checkMaintenanceMode();
 }
 
 $lang = L10n::getBrowserLanguage();
@@ -128,7 +112,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;
                        }