Merge pull request #4852 from tobiasd/20180417-fi

[friendica.git] / index.php

diff --git a/index.php b/index.php
index ef84400990198b36bfe6c43ce0c530fdeaa22219..e3ab16469b17f75d07a6e522b7206a18efec9229 100644 (file)
--- a/index.php
+++ b/index.php
@@ -24,9 +24,7 @@ use Friendica\Module\Login;
 
 require_once 'boot.php';
 
-if (empty($a)) {
-       $a = new App(__DIR__);
-}
+$a = new App(__DIR__);
 BaseObject::setApp($a);
 
 // We assume that the index.php is called by a frontend process
@@ -53,9 +51,13 @@ if (!$install) {
 require_once "include/dba.php";
 
 if (!$install) {
-       dba::connect($db_host, $db_user, $db_pass, $db_data, $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
         */
@@ -72,12 +74,13 @@ if (!$install) {
        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://")
-       ) {
+               && ($_SERVER['REQUEST_METHOD'] == 'GET')) {
                header("HTTP/1.1 302 Moved Temporarily");
                header("Location: " . System::baseUrl() . "/" . $a->query_string);
                exit();
        }
 
+       Config::init();
        Session::init();
        Addon::loadHooks();
        Addon::callHooks('init_1');