X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fauth.php;h=f852ea28a527e4cff0ad46a34ee5ee74bfd46181;hb=34e808e912b1b8e06bda40d47cbecd1b9a0246c2;hp=57e9d9bf61dc82a6f2adc21da27b92f9fb605ff8;hpb=8517ba1fab5257fbd3e5cb99677797b5dd9ed69e;p=friendica.git
diff --git a/include/auth.php b/include/auth.php
index 57e9d9bf61..f852ea28a5 100644
--- a/include/auth.php
+++ b/include/auth.php
@@ -1,4 +1,10 @@
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
- new_cookie(604800, $r[0]);
+ // Expires after 7 days by default,
+ // can be set via system.auth_cookie_lifetime
+ $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'))
+ if (Config::get('system','paranoia'))
$_SESSION['addr'] = $data->ip;
}
}
@@ -43,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];
}
}
@@ -59,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`
@@ -73,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
@@ -101,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']));
@@ -114,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
}
@@ -126,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.').'
'.t('The error message was:').' '.$e->getMessage());
@@ -169,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']) {