Fixes:

[friendica.git] / index.php

diff --git a/index.php b/index.php
index f65867feb6c9cf876e7b1930949b54130552c9da..f3655ff723ae36e4af9b395919f59084e3612efa 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;
@@ -18,6 +17,7 @@ use Friendica\Core\Session;
 use Friendica\Core\System;
 use Friendica\Core\Theme;
 use Friendica\Core\Worker;
+use Friendica\Database\DBA;
 use Friendica\Database\DBM;
 use Friendica\Model\Profile;
 use Friendica\Module\Login;
@@ -25,44 +25,31 @@ 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;
  */
 
 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
-        */
+// Missing DB connection: ERROR
+if ($a->mode & App::MODE_LOCALCONFIGPRESENT && !($a->mode & App::MODE_DBAVAILABLE)) {
+       System::httpExit(500, ['title' => 'Error 500 - Internal Server Error', 'description' => 'Apologies but the website is unavailable at the moment.']);
+}
 
-       Config::load();
+// Max Load Average reached: ERROR
+if ($a->isMaxProcessesReached() || $a->isMaxLoadReached()) {
+       header('Retry-After: 120');
+       header('Refresh: 120; url=' . System::baseUrl() . "/" . $a->query_string);
 
-       if ($a->max_processes_reached() || $a->maxload_reached()) {
-               header($_SERVER["SERVER_PROTOCOL"] . ' 503 Service Temporarily Unavailable');
-               header('Retry-After: 120');
-               header('Refresh: 120; url=' . System::baseUrl() . "/" . $a->query_string);
-               die("System is currently unavailable. Please try again later");
-       }
+       System::httpExit(503, ['title' => 'Error 503 - Service Temporarily Unavailable', 'description' => 'System is currently overloaded. Please try again later.']);
+}
 
+if ($a->isInstallMode()) {
        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://")
@@ -76,8 +63,6 @@ if (!$a->mode == App::MODE_INSTALL) {
        Session::init();
        Addon::loadHooks();
        Addon::callHooks('init_1');
-
-       $a->checkMaintenanceMode();
 }
 
 $lang = L10n::getBrowserLanguage();
@@ -109,7 +94,7 @@ if (!$a->is_backend()) {
  */
 if (x($_SESSION, 'authenticated') && !x($_SESSION, 'language')) {
        // we haven't loaded user data yet, but we need user language
-       $user = dba::selectFirst('user', ['language'], ['uid' => $_SESSION['uid']]);
+       $user = DBA::selectFirst('user', ['language'], ['uid' => $_SESSION['uid']]);
        $_SESSION['language'] = $lang;
        if (DBM::is_result($user)) {
                $_SESSION['language'] = $user['language'];
@@ -128,7 +113,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;
                        }
@@ -183,9 +168,9 @@ $_SESSION['last_updated'] = defaults($_SESSION, 'last_updated', []);
 
 // in install mode, any url loads install module
 // but we need "view" module for stylesheet
-if ($a->mode == App::MODE_INSTALL && $a->module!="view") {
+if ($a->isInstallMode() && $a->module!="view") {
        $a->module = 'install';
-} elseif ($a->mode == App::MODE_MAINTENANCE && $a->module!="view") {
+} elseif (!($a->mode & App::MODE_MAINTENANCEDISABLED) && $a->module != "view") {
        $a->module = 'maintenance';
 } else {
        check_url($a);