Require statement

[friendica.git] / include / auth.php

diff --git a/include/auth.php b/include/auth.php
index 5dfe9d3e062aa7865ab5a9f8db87412d438b986f..f852ea28a527e4cff0ad46a34ee5ee74bfd46181 100644 (file)
--- a/include/auth.php
+++ b/include/auth.php
@@ -1,7 +1,9 @@
 <?php
 
 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');
@@ -19,7 +21,7 @@ if (isset($_COOKIE["Friendica"])) {
                        if ($data->hash != cookie_hash($r[0])) {
                                logger("Hash for user ".$data->uid." doesn't fit.");
                                nuke_session();
-                               goaway(z_root());
+                               goaway(System::baseUrl());
                        }
 
                        // Renew the cookie
@@ -29,10 +31,10 @@ if (isset($_COOKIE["Friendica"])) {
                        new_cookie($authcookiedays*24*60*60, $r[0]);
 
                        // Do the authentification if not done by now
-                       if (!isset($_SESSION) OR !isset($_SESSION['authenticated'])) {
+                       if (!isset($_SESSION) || !isset($_SESSION['authenticated'])) {
                                authenticate_success($r[0]);
 
-                               if (get_config('system','paranoia'))
+                               if (Config::get('system','paranoia'))
                                        $_SESSION['addr'] = $data->ip;
                        }
                }
@@ -50,14 +52,14 @@ if (isset($_SESSION) && x($_SESSION,'authenticated') && (!x($_POST,'auth-params'
                call_hooks("logging_out");
                nuke_session();
                info(t('Logged out.').EOL);
-               goaway(z_root());
+               goaway(System::baseUrl());
        }
 
        if (x($_SESSION,'visitor_id') && !x($_SESSION,'uid')) {
                $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];
                }
        }
@@ -66,13 +68,13 @@ 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. '.
                                $_SESSION['addr'].' != '.$_SERVER['REMOTE_ADDR']);
                        nuke_session();
-                       goaway(z_root());
+                       goaway(System::baseUrl());
                }
 
                $r = q("SELECT `user`.*, `user`.`pubkey` as `upubkey`, `user`.`prvkey` as `uprvkey`
@@ -80,9 +82,9 @@ 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(z_root());
+                       goaway(System::baseUrl());
                }
 
                // Make sure to refresh the last login time for the user if the user
@@ -108,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']));
 
@@ -121,7 +123,7 @@ if (isset($_SESSION) && x($_SESSION,'authenticated') && (!x($_POST,'auth-params'
                        if ($noid || strpos($temp_string,'@') || !validate_url($temp_string)) {
                                $a = get_app();
                                notice(t('Login failed.').EOL);
-                               goaway(z_root());
+                               goaway(System::baseUrl());
                                // NOTREACHED
                        }
 
@@ -133,7 +135,7 @@ if (isset($_SESSION) && x($_SESSION,'authenticated') && (!x($_POST,'auth-params'
                                $openid->identity = $openid_url;
                                $_SESSION['openid'] = $openid_url;
                                $_SESSION['remember'] = $_POST['remember'];
-                               $openid->returnUrl = App::get_baseurl(true).'/openid';
+                               $openid->returnUrl = System::baseUrl(true).'/openid';
                                goaway($openid->authUrl());
                        } catch (Exception $e) {
                                notice(t('We encountered a problem while logging in with the OpenID you provided. Please check the correct spelling of the ID.').'<br /><br >'.t('The error message was:').' '.$e->getMessage());
@@ -176,14 +178,14 @@ 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];
                }
 
                if (!$record || !count($record)) {
                        logger('authenticate: failed login attempt: '.notags(trim($_POST['username'])).' from IP '.$_SERVER['REMOTE_ADDR']);
                        notice(t('Login failed.').EOL);
-                       goaway(z_root());
+                       goaway(System::baseUrl());
                }
 
                if (! $_POST['remember']) {