Merge pull request #4269 from MrPetovan/task/4265-move-base64-to-composer

[friendica.git] / index.php

diff --git a/index.php b/index.php
index 74a88eb7eb111ab56d50e02a08aadc1def8a8ad9..dcb25cc3a37d513998914d1aab4c887b0cc8d22f 100644 (file)
--- a/index.php
+++ b/index.php
@@ -10,6 +10,7 @@
 
 use Friendica\App;
 use Friendica\BaseObject;
+use Friendica\Content\Nav;
 use Friendica\Core\System;
 use Friendica\Core\Config;
 use Friendica\Core\Worker;
@@ -111,7 +112,7 @@ 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']]);
        $_SESSION['language'] = $lang;
-       if (DBM::is_result($r)) {
+       if (DBM::is_result($user)) {
                $_SESSION['language'] = $user['language'];
        }
 }
@@ -163,16 +164,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
@@ -192,12 +193,12 @@ if ($install && $a->module!="view") {
        check_plugins($a);
 }
 
-nav_set_selected('nothing');
+Nav::setSelected('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);
 
@@ -294,8 +295,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.')]
                );
        }
 }
@@ -362,14 +363,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'];
@@ -426,7 +427,7 @@ call_hooks('page_end', $a->page['content']);
  * Add the navigation (menu) template
  */
 if ($a->module != 'install' && $a->module != 'maintenance') {
-       nav($a);
+       Nav::build($a);
 }
 
 /*
@@ -440,9 +441,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')]
        );
 }