make it much easier to debug friend acceptance issues

[friendica.git] / include / auth.php

diff --git a/include/auth.php b/include/auth.php
index ef5c6f0b44033f9cc26a38b2c35199ac99b19177..10d0df64551b7d6212b21f653361b53aa86c3c36 100644 (file)
--- a/include/auth.php
+++ b/include/auth.php
@@ -2,63 +2,83 @@
 
 // login/logout 
 
-if((x($_SESSION,'authenticated')) && (! ($_POST['auth-params'] == 'login'))) {
-       if($_POST['auth-params'] == 'logout' || $a->module == "logout") {
+if((x($_SESSION,'authenticated')) && (! ($_POST['auth-params'] === 'login'))) {
+
+       if($_POST['auth-params'] === 'logout' || $a->module === 'logout') {
+       
+               // process logout request
+
                unset($_SESSION['authenticated']);
                unset($_SESSION['uid']);
                unset($_SESSION['visitor_id']);
-               unset($_SESSION['is_visitor']);
                unset($_SESSION['administrator']);
                unset($_SESSION['cid']);
-               $_SESSION['sysmsg'] = "Logged out." . EOL;
+               unset($_SESSION['theme']);
+               notice( t('Logged out.') . EOL);
                goaway($a->get_baseurl());
        }
+
        if(x($_SESSION,'uid')) {
+
+               // already logged in user returning
+
                $r = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1",
-                       intval($_SESSION['uid']));
-               if($r === NULL || (! count($r))) {
+                       intval($_SESSION['uid'])
+               );
+
+               if(! count($r)) {
                        goaway($a->get_baseurl());
                }
+
+               // initialise user environment
+
                $a->user = $r[0];
+               $_SESSION['theme'] = $a->user['theme'];
                if(strlen($a->user['timezone']))
                        date_default_timezone_set($a->user['timezone']);
 
+               $_SESSION['my_url'] = $a->get_baseurl() . '/profile/' . $a->user['nickname'];
+
                $r = q("SELECT * FROM `contact` WHERE `uid` = %s AND `self` = 1 LIMIT 1",
                        intval($_SESSION['uid']));
                if(count($r)) {
                        $a->contact = $r[0];
                        $a->cid = $r[0]['id'];
                        $_SESSION['cid'] = $a->cid;
+
                }
        }
 }
 else {
+
        unset($_SESSION['authenticated']);
        unset($_SESSION['uid']);
        unset($_SESSION['visitor_id']);
-       unset($_SESSION['is_visitor']);
        unset($_SESSION['administrator']);
        unset($_SESSION['cid']);
+       unset($_SESSION['theme']);
+       unset($_SESSION['my_url']);
+
        $encrypted = hash('whirlpool',trim($_POST['password']));
 
-       if((x($_POST,'auth-params')) && $_POST['auth-params'] == 'login') {
+       if((x($_POST,'auth-params')) && $_POST['auth-params'] === 'login') {
+
+               // process login request
+
                $r = q("SELECT * FROM `user` 
-                       WHERE `email` = '%s' AND `password` = '%s' LIMIT 1",
+                       WHERE `email` = '%s' AND `password` = '%s' AND `blocked` = 0 AND `verified` = 1 LIMIT 1",
                        dbesc(trim($_POST['login-name'])),
                        dbesc($encrypted));
                if(($r === false) || (! count($r))) {
-                       $_SESSION['sysmsg'] = 'Login failed.' . EOL ;
+                       notice( t('Login failed.') . EOL );
                        goaway($a->get_baseurl());
                }
                $_SESSION['uid'] = $r[0]['uid'];
-               $_SESSION['admin'] = $r[0]['admin'];
+               $_SESSION['theme'] = $r[0]['theme'];
                $_SESSION['authenticated'] = 1;
-               if(x($r[0],'nickname'))
-                       $_SESSION['my_url'] = $a->get_baseurl() . '/profile/' . $r[0]['nickname'];
-               else
-                       $_SESSION['my_url'] = $a->get_baseurl() . '/profile/' . $r[0]['uid'];
+               $_SESSION['my_url'] = $a->get_baseurl() . '/profile/' . $r[0]['nickname'];
 
-               $_SESSION['sysmsg'] = "Welcome back " . $r[0]['username'] . EOL;
+               notice( t("Welcome back ") . $r[0]['username'] . EOL);
                $a->user = $r[0];
                if(strlen($a->user['timezone']))
                        date_default_timezone_set($a->user['timezone']);
@@ -69,8 +89,8 @@ else {
                        $a->cid = $r[0]['id'];
                        $_SESSION['cid'] = $a->cid;
                }
-
-
+               if(($a->module !== 'home') && isset($_SESSION['return_url']))
+                       goaway($a->get_baseurl() . '/' . $_SESSION['return_url']);
        }
 }