X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=index.php;h=e3ab16469b17f75d07a6e522b7206a18efec9229;hb=4d0fb022267fa6349aad26b6e7f564ea8e6153d0;hp=4fad08da83ca2a5a53e0c6f89c4be21ffdb08467;hpb=6fec0433758ec1df4f798941939250dd169269a7;p=friendica.git

diff --git a/index.php b/index.php
index 4fad08da83..e3ab16469b 100644
--- 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,7 +74,7 @@ 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();