Use the "attachment" element instead of a mixture of several elements

[friendica.git] / include / auth.php

diff --git a/include/auth.php b/include/auth.php
index 4c695cc1e3be345320a41debea00297b49cae016..4abff1971008ec77f20d83f80cd59e6cc4442f45 100644 (file)
--- a/include/auth.php
+++ b/include/auth.php
@@ -5,36 +5,22 @@ require_once('include/security.php');
 require_once('include/datetime.php');
 
 function nuke_session() {
-       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']);
-       unset($_SESSION['administrator']);
-       unset($_SESSION['cid']);
-       unset($_SESSION['theme']);
-       unset($_SESSION['mobile-theme']);
-       unset($_SESSION['page_flags']);
-       unset($_SESSION['submanage']);
-       unset($_SESSION['my_url']);
-       unset($_SESSION['my_address']);
-       unset($_SESSION['addr']);
-       unset($_SESSION['return_url']);
+       new_cookie(0); // make sure cookie is deleted on browser close, as a security measure
+       session_unset();
 }
 
 
-// login/logout 
-
-
-
+// login/logout
 
 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();
+               new_cookie(-1);
                info( t('Logged out.') . EOL);
                goaway(z_root());
        }
@@ -55,13 +41,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'])
                );
@@ -84,8 +70,7 @@ if((isset($_SESSION)) && (x($_SESSION,'authenticated')) && ((! (x($_POST,'auth-p
                }
                authenticate_success($r[0], false, false, $login_refresh);
        }
-}
-else {
+} else {
 
        if(isset($_SESSION)) {
                nuke_session();
@@ -122,7 +107,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());
@@ -159,8 +144,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'])),
@@ -171,7 +156,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());
                }
@@ -203,9 +188,11 @@ else {
 }
 
 function new_cookie($time) {
-       $old_sid = session_id();
-       session_set_cookie_params("$time");
-       session_regenerate_id(false);
 
-       q("UPDATE session SET sid = '%s' WHERE sid = '%s'", dbesc(session_id()), dbesc($old_sid));
+       if ($time != 0)
+               $time = $time + time();
+
+       $params = session_get_cookie_params();
+       setcookie(session_name(), session_id(), $time, $params['path'], $params['domain'], $params['secure'], isset($params['httponly']));
+       return;
 }