Merge pull request #3909 from zeroadam/BaseObject-#3878

[friendica.git] / include / auth.php

diff --git a/include/auth.php b/include/auth.php
index f220e1685b649878459a64e459414c6ab5f3b31d..f852ea28a527e4cff0ad46a34ee5ee74bfd46181 100644 (file)
--- a/include/auth.php
+++ b/include/auth.php
@@ -3,6 +3,7 @@
 use Friendica\App;
 use Friendica\Core\System;
 use Friendica\Core\Config;
+use Friendica\Database\DBM;
 
 require_once('include/security.php');
 require_once('include/datetime.php');
@@ -33,7 +34,7 @@ if (isset($_COOKIE["Friendica"])) {
                        if (!isset($_SESSION) || !isset($_SESSION['authenticated'])) {
                                authenticate_success($r[0]);
 
-                               if (get_config('system','paranoia'))
+                               if (Config::get('system','paranoia'))
                                        $_SESSION['addr'] = $data->ip;
                        }
                }
@@ -58,7 +59,7 @@ if (isset($_SESSION) && x($_SESSION,'authenticated') && (!x($_POST,'auth-params'
                $r = q("SELECT * FROM `contact` WHERE `id` = %d LIMIT 1",
                        intval($_SESSION['visitor_id'])
                );
-               if (dbm::is_result($r)) {
+               if (DBM::is_result($r)) {
                        $a->contact = $r[0];
                }
        }
@@ -67,7 +68,7 @@ if (isset($_SESSION) && x($_SESSION,'authenticated') && (!x($_POST,'auth-params'
 
                // already logged in user returning
 
-               $check = get_config('system','paranoia');
+               $check = Config::get('system','paranoia');
                // extra paranoia - if the IP changed, log them out
                if ($check && ($_SESSION['addr'] != $_SERVER['REMOTE_ADDR'])) {
                        logger('Session address changed. Paranoid setting in effect, blocking session. '.
@@ -81,7 +82,7 @@ if (isset($_SESSION) && x($_SESSION,'authenticated') && (!x($_POST,'auth-params'
                        intval($_SESSION['uid'])
                );
 
-               if (!dbm::is_result($r)) {
+               if (!DBM::is_result($r)) {
                        nuke_session();
                        goaway(System::baseUrl());
                }
@@ -109,7 +110,7 @@ if (isset($_SESSION) && x($_SESSION,'authenticated') && (!x($_POST,'auth-params'
                if ((x($_POST,'openid_url')) && strlen($_POST['openid_url']) ||
                   (x($_POST,'username')) && strlen($_POST['username'])) {
 
-                       $noid = get_config('system','no_openid');
+                       $noid = Config::get('system','no_openid');
 
                        $openid_url = trim((strlen($_POST['openid_url'])?$_POST['openid_url']:$_POST['username']));
 
@@ -177,7 +178,7 @@ if (isset($_SESSION) && x($_SESSION,'authenticated') && (!x($_POST,'auth-params'
                                dbesc(trim($_POST['username'])),
                                dbesc($encrypted)
                        );
-                       if (dbm::is_result($r))
+                       if (DBM::is_result($r))
                                $record = $r[0];
                }