X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fauth.php;h=a5b6432fff37c35cc31070eb7ae585129accfae1;hb=a0f3fe6fde55a61291ce96f657262c6b084b5894;hp=b534d4a4d3a7f170a51a1b3735315c9345294d8d;hpb=083d660f615563c99d26d7ead29409afac0ba8ba;p=friendica.git

diff --git a/include/auth.php b/include/auth.php
index b534d4a4d3..a5b6432fff 100644
--- a/include/auth.php
+++ b/include/auth.php
@@ -5,6 +5,13 @@ require_once('include/security.php');
 require_once('include/datetime.php');
 
 function nuke_session() {
+	if (get_config('system', 'disable_database_session')) {
+		session_unset();
+		return;
+	}
+
+	new_cookie(0); // make sure cookie is deleted on browser close, as a security measure
+
 	unset($_SESSION['authenticated']);
 	unset($_SESSION['uid']);
 	unset($_SESSION['visitor_id']);
@@ -18,10 +25,11 @@ function nuke_session() {
 	unset($_SESSION['my_address']);
 	unset($_SESSION['addr']);
 	unset($_SESSION['return_url']);
+
 }
 
 
-// login/logout 
+// login/logout
 
 
 
@@ -29,7 +37,7 @@ function nuke_session() {
 if((isset($_SESSION)) && (x($_SESSION,'authenticated')) && ((! (x($_POST,'auth-params'))) || ($_POST['auth-params'] !== 'login'))) {
 
 	if(((x($_POST,'auth-params')) && ($_POST['auth-params'] === 'logout')) || ($a->module === 'logout')) {
-	
+
 		// process logout request
 		call_hooks("logging_out");
 		nuke_session();
@@ -53,13 +61,13 @@ if((isset($_SESSION)) && (x($_SESSION,'authenticated')) && ((! (x($_POST,'auth-p
 		$check = get_config('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. ' 
+			logger('Session address changed. Paranoid setting in effect, blocking session. '
 				. $_SESSION['addr'] . ' != ' . $_SERVER['REMOTE_ADDR']);
 			nuke_session();
 			goaway(z_root());
 		}
 
-		$r = q("SELECT `user`.*, `user`.`pubkey` as `upubkey`, `user`.`prvkey` as `uprvkey` 
+		$r = q("SELECT `user`.*, `user`.`pubkey` as `upubkey`, `user`.`prvkey` as `uprvkey`
 		FROM `user` WHERE `uid` = %d AND `blocked` = 0 AND `account_expired` = 0 AND `account_removed` = 0 AND `verified` = 1 LIMIT 1",
 			intval($_SESSION['uid'])
 		);
@@ -120,7 +128,7 @@ else {
 			$openid->identity = $openid_url;
 			$_SESSION['openid'] = $openid_url;
 			$a = get_app();
-			$openid->returnUrl = $a->get_baseurl(true) . '/openid'; 
+			$openid->returnUrl = $a->get_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());
@@ -157,8 +165,8 @@ else {
 
 			// process normal login request
 
-			$r = q("SELECT `user`.*, `user`.`pubkey` as `upubkey`, `user`.`prvkey` as `uprvkey`  
-				FROM `user` WHERE ( `email` = '%s' OR `nickname` = '%s' ) 
+			$r = q("SELECT `user`.*, `user`.`pubkey` as `upubkey`, `user`.`prvkey` as `uprvkey`
+				FROM `user` WHERE ( `email` = '%s' OR `nickname` = '%s' )
 				AND `password` = '%s' AND `blocked` = 0 AND `account_expired` = 0 AND `account_removed` = 0 AND `verified` = 1 LIMIT 1",
 				dbesc(trim($_POST['username'])),
 				dbesc(trim($_POST['username'])),
@@ -169,7 +177,7 @@ else {
 		}
 
 		if((! $record) || (! count($record))) {
-			logger('authenticate: failed login attempt: ' . notags(trim($_POST['username'])) . ' from IP ' . $_SERVER['REMOTE_ADDR']); 
+			logger('authenticate: failed login attempt: ' . notags(trim($_POST['username'])) . ' from IP ' . $_SERVER['REMOTE_ADDR']);
 			notice( t('Login failed.') . EOL );
 			goaway(z_root());
   		}
@@ -187,18 +195,10 @@ else {
 		// (i.e. expire when the browser is closed), even when there's a time expiration
 		// on the cookie
 		if($_POST['remember']) {
-			$old_sid = session_id();
-			session_set_cookie_params('31449600'); // one year
-			session_regenerate_id(false);
-
-			q("UPDATE session SET sid = '%s' WHERE sid = '%s'", dbesc(session_id()), dbesc($old_sid));
+			new_cookie(31449600); // one year
 		}
 		else {
-			$old_sid = session_id();
-			session_set_cookie_params('0');
-			session_regenerate_id(false);
-
-			q("UPDATE session SET sid = '%s' WHERE sid = '%s'", dbesc(session_id()), dbesc($old_sid));
+			new_cookie(0); // 0 means delete on browser exit
 		}
 
 		// if we haven't failed up this point, log them in.
@@ -208,4 +208,14 @@ else {
 	}
 }
 
+function new_cookie($time) {
+	if (!get_config('system', 'disable_database_session'))
+		$old_sid = session_id();
+
+	session_set_cookie_params($time);
 
+	if (!get_config('system', 'disable_database_session')) {
+		session_regenerate_id(false);
+		q("UPDATE session SET sid = '%s' WHERE sid = '%s'", dbesc(session_id()), dbesc($old_sid));
+	}
+}