Merge pull request #4243 from MrPetovan/task/switch-to-array-new-style

[friendica.git] / index.php

diff --git a/index.php b/index.php
index e1995016bab66276d1e96b44800c58c560f602b6..bfd5cda64abb1cc3494113a34eeba7798a4190ff 100644 (file)
--- a/index.php
+++ b/index.php
@@ -14,6 +14,8 @@ use Friendica\Core\System;
 use Friendica\Core\Config;
 use Friendica\Core\Worker;
 use Friendica\Database\DBM;
+use Friendica\Model\Profile;
+use Friendica\Module\Login;
 
 require_once 'boot.php';
 
@@ -106,11 +108,11 @@ if (!$a->is_backend()) {
  * We have to do it here because the session was just now opened.
  */
 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));
+       // we haven't loaded user data yet, but we need user language
+       $user = dba::selectFirst('user', ['language'], ['uid' => $_SESSION['uid']]);
        $_SESSION['language'] = $lang;
-       if (DBM::is_result($r)) {
-               $_SESSION['language'] = $r['language'];
+       if (DBM::is_result($user)) {
+               $_SESSION['language'] = $user['language'];
        }
 }
 
@@ -127,7 +129,7 @@ if ((x($_GET, 'zrl')) && (!$install && !$maintenance)) {
        ) {
                $_SESSION['my_url'] = $_GET['zrl'];
                $a->query_string = preg_replace('/[\?&]zrl=(.*?)([\?&]|$)/is', '', $a->query_string);
-               zrl_init($a);
+               Profile::zrlInit($a);
        } else {
                // Someone came with an invalid parameter, maybe as a DDoS attempt
                // We simply stop processing here
@@ -149,9 +151,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');
@@ -163,16 +163,16 @@ $a->page['end'] = '';
 
 
 if (! x($_SESSION, 'sysmsg')) {
-       $_SESSION['sysmsg'] = array();
+       $_SESSION['sysmsg'] = [];
 }
 
 if (! x($_SESSION, 'sysmsg_info')) {
-       $_SESSION['sysmsg_info'] = array();
+       $_SESSION['sysmsg_info'] = [];
 }
 
 // Array for informations about last received items
 if (! x($_SESSION, 'last_updated')) {
-       $_SESSION['last_updated'] = array();
+       $_SESSION['last_updated'] = [];
 }
 /*
  * check_config() is responsible for running update scripts. These automatically
@@ -197,7 +197,7 @@ nav_set_selected('nothing');
 //Don't populate apps_menu if apps are private
 $privateapps = Config::get('config', 'private_addons');
 if ((local_user()) || (! $privateapps === "1")) {
-       $arr = array('app_menu' => $a->apps);
+       $arr = ['app_menu' => $a->apps];
 
        call_hooks('app_menu', $arr);
 
@@ -253,13 +253,9 @@ if (strlen($a->module)) {
        }
 
        // Controller class routing
-       $classes = ['Friendica\\Module\\' . ucfirst($a->module), 'Friendica\\Module\\' . ucfirst($a->module) . 'Module'];
-       foreach ($classes as $class) {
-               if (!$a->module_loaded && class_exists($class)) {
-                       $a->module_class = $class;
-                       $a->module_loaded = true;
-                       break;
-               }
+       if (! $a->module_loaded && class_exists('Friendica\\Module\\' . ucfirst($a->module))) {
+               $a->module_class = 'Friendica\\Module\\' . ucfirst($a->module);
+               $a->module_loaded = true;
        }
 
        /**
@@ -298,8 +294,8 @@ if (strlen($a->module)) {
                $tpl = get_markup_template("404.tpl");
                $a->page['content'] = replace_macros(
                        $tpl,
-                       array(
-                       '$message' =>  t('Page not found.'))
+                       [
+                       '$message' =>  t('Page not found.')]
                );
        }
 }
@@ -366,14 +362,14 @@ if ($a->module_loaded) {
        }
 
        if (! $a->error) {
-               $arr = array('content' => $a->page['content']);
+               $arr = ['content' => $a->page['content']];
                call_hooks($a->module . '_mod_content', $arr);
                $a->page['content'] = $arr['content'];
                if ($a->module_class) {
-                       $arr = array('content' => call_user_func([$a->module_class, 'content']));
+                       $arr = ['content' => call_user_func([$a->module_class, 'content'])];
                } else if (function_exists($a->module . '_content')) {
                        $func = $a->module . '_content';
-                       $arr = array('content' => $func($a));
+                       $arr = ['content' => $func($a)];
                }
                call_hooks($a->module . '_mod_aftercontent', $arr);
                $a->page['content'] .= $arr['content'];
@@ -444,9 +440,9 @@ if ($a->is_mobile || $a->is_tablet) {
        }
        $a->page['footer'] = replace_macros(
                get_markup_template("toggle_mobile_footer.tpl"),
-               array(
+               [
                        '$toggle_link' => $link,
-                       '$toggle_text' => t('toggle mobile'))
+                       '$toggle_text' => t('toggle mobile')]
        );
 }