Add defuse/php-encryption 2.0 to Composer dependencies

[friendica.git] / index.php

diff --git a/index.php b/index.php
index fe871ba96761c0d7850af8a6a7eee3a41388a3fb..5915498904d477720ee2313cee02674470b30dea 100644 (file)
--- a/index.php
+++ b/index.php
@@ -17,6 +17,7 @@ use Friendica\App;
 use Friendica\Core\System;
 use Friendica\Core\Config;
 use Friendica\Core\Worker;
+use Friendica\Database\DBM;
 
 require_once 'boot.php';
 require_once 'object/BaseObject.php';
@@ -70,8 +71,8 @@ if (!$install) {
                die("System is currently unavailable. Please try again later");
        }
 
-       if (get_config('system', 'force_ssl') && ($a->get_scheme() == "http") &&
-               (intval(get_config('system', 'ssl_policy')) == SSL_POLICY_FULL) &&
+       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://")) {
                header("HTTP/1.1 302 Moved Temporarily");
                header("Location: " . System::baseUrl() . "/" . $a->query_string);
@@ -82,7 +83,7 @@ if (!$install) {
        load_hooks();
        call_hooks('init_1');
 
-       $maintenance = get_config('system', 'maintenance');
+       $maintenance = Config::get('system', 'maintenance');
 }
 
 $lang = get_browser_language();
@@ -117,7 +118,7 @@ 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));
        $_SESSION['language'] = $lang;
-       if (dbm::is_result($r)) {
+       if (DBM::is_result($r)) {
                $_SESSION['language'] = $r['language'];
        }
 }
@@ -204,7 +205,7 @@ if ($install && $a->module!="view") {
 nav_set_selected('nothing');
 
 //Don't populate apps_menu if apps are private
-$privateapps = get_config('config','private_addons');
+$privateapps = Config::get('config','private_addons');
 if ((local_user()) || (! $privateapps === "1")) {
        $arr = array('app_menu' => $a->apps);
 
@@ -251,7 +252,7 @@ if (strlen($a->module)) {
                $a->module = "login";
        }
 
-       $privateapps = get_config('config','private_addons');
+       $privateapps = Config::get('config','private_addons');
 
        if (is_array($a->plugins) && in_array($a->module,$a->plugins) && file_exists("addon/{$a->module}/{$a->module}.php")) {
                //Check if module is an app and if public access to apps is allowed or not