X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fauth.php;h=f220e1685b649878459a64e459414c6ab5f3b31d;hb=b78996416ce8c195dfd725c332c7fbddefe08832;hp=d301f870556d5f79094bf5f7fdab06d1c34d6c89;hpb=de5a0dadb0715198b9ba376e4ab79f58cedef098;p=friendica.git
diff --git a/include/auth.php b/include/auth.php
index d301f87055..f220e1685b 100644
--- a/include/auth.php
+++ b/include/auth.php
@@ -1,6 +1,7 @@
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
@@ -50,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')) {
@@ -72,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`
@@ -82,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
@@ -121,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
}
@@ -133,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.').'
'.t('The error message was:').' '.$e->getMessage());
@@ -183,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']) {