OStatus: Auto subscribe to forum accounts

[friendica.git] / include / auth.php

diff --git a/include/auth.php b/include/auth.php
index d819a636b0876d7fb99f7322eb519eb125d1c29e..f220e1685b649878459a64e459414c6ab5f3b31d 100644 (file)
--- a/include/auth.php
+++ b/include/auth.php
@@ -1,6 +1,8 @@
 <?php
 
-use \Friendica\Core\Config;
+use Friendica\App;
+use Friendica\Core\System;
+use Friendica\Core\Config;
 
 require_once('include/security.php');
 require_once('include/datetime.php');
@@ -18,17 +20,17 @@ 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
                        // Expires after 7 days by default,
                        // can be set via system.auth_cookie_lifetime
-                       $authcookiedays = Config::get('system', 'auth_cookie_lifetime') || 7;
+                       $authcookiedays = Config::get('system', 'auth_cookie_lifetime', 7);
                        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'))
@@ -49,7 +51,7 @@ 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')) {
@@ -71,7 +73,7 @@ if (isset($_SESSION) && x($_SESSION,'authenticated') && (!x($_POST,'auth-params'
                        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`
@@ -81,7 +83,7 @@ if (isset($_SESSION) && x($_SESSION,'authenticated') && (!x($_POST,'auth-params'
 
                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
@@ -120,7 +122,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
                        }
 
@@ -132,7 +134,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());
@@ -182,7 +184,7 @@ if (isset($_SESSION) && x($_SESSION,'authenticated') && (!x($_POST,'auth-params'
                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']) {