Merge pull request #4203 from annando/dbupdate-food

[friendica.git] / index.php

diff --git a/index.php b/index.php
index 9cbbad605aefe62d85753b59d32e9991fae272f2..f966279940ac87e53e349803d227538097bf26fb 100644 (file)
--- a/index.php
+++ b/index.php
@@ -14,6 +14,7 @@ use Friendica\Core\System;
 use Friendica\Core\Config;
 use Friendica\Core\Worker;
 use Friendica\Database\DBM;
+use Friendica\Module\Login;
 
 require_once 'boot.php';
 
@@ -97,6 +98,7 @@ if (!$a->is_backend()) {
        session_start();
        $a->save_timestamp($stamp1, "parser");
 } else {
+       $_SESSION = [];
        Worker::executeIfIdle();
 }
 
@@ -106,7 +108,7 @@ if (!$a->is_backend()) {
  */
 if (x($_SESSION, 'authenticated') && !x($_SESSION, 'language')) {
        // we didn't loaded user data yet, but we need user language
-       $r = dba::select('user', array('language'), array('uid' => $_SESSION['uid']), array('limit' => 1));
+       $r = dba::selectFirst('user', ['language'], ['uid' => $_SESSION['uid']]);
        $_SESSION['language'] = $lang;
        if (DBM::is_result($r)) {
                $_SESSION['language'] = $r['language'];
@@ -148,9 +150,7 @@ if ((x($_GET, 'zrl')) && (!$install && !$maintenance)) {
 
 // header('Link: <' . System::baseUrl() . '/amcd>; rel="acct-mgmt";');
 
-if (x($_COOKIE["Friendica"]) || (x($_SESSION, 'authenticated')) || (x($_POST, 'auth-params')) || ($a->module === 'login')) {
-       require "include/auth.php";
-}
+Login::sessionAuth();
 
 if (! x($_SESSION, 'authenticated')) {
        header('X-Account-Management-Status: none');