Merge branch 'fabrixxm-master'

[friendica.git] / include / auth.php

diff --git a/include/auth.php b/include/auth.php
index d2bcb68dc8caf6557c68e968d26484a6d1fa921a..fd80a63e221a553e6b484ec19c84e99e61297af3 100644 (file)
--- a/include/auth.php
+++ b/include/auth.php
@@ -24,10 +24,19 @@ if((isset($_SESSION)) && (x($_SESSION,'authenticated')) && ((! (x($_POST,'auth-p
                // process logout request
 
                nuke_session();
-               notice( t('Logged out.') . EOL);
+               info( t('Logged out.') . EOL);
                goaway($a->get_baseurl());
        }
 
+       if(x($_SESSION,'visitor_id') && (! x($_SESSION,'uid'))) {
+               $r = q("SELECT * FROM `contact` WHERE `id` = %d LIMIT 1",
+                       intval($_SESSION['visitor_id'])
+               );
+               if(count($r)) {
+                       $a->contact = $r[0];
+               }
+       }
+
        if(x($_SESSION,'uid')) {
 
                // already logged in user returning
@@ -53,11 +62,21 @@ if((isset($_SESSION)) && (x($_SESSION,'authenticated')) && ((! (x($_POST,'auth-p
                $a->user = $r[0];
                $_SESSION['theme'] = $a->user['theme'];
                $_SESSION['page_flags'] = $a->user['page-flags'];
-               if(strlen($a->user['timezone']))
+
+               if(strlen($a->user['timezone'])) {
                        date_default_timezone_set($a->user['timezone']);
+                       $a->timezone = $a->user['timezone'];
+               }
 
                $_SESSION['my_url'] = $a->get_baseurl() . '/profile/' . $a->user['nickname'];
 
+               $r = q("SELECT `uid`,`username` FROM `user` WHERE `password` = '%s' AND `email` = '%s'",
+                       dbesc($a->user['password']),
+                       dbesc($a->user['email'])
+               );
+               if(count($r))
+                       $a->identities = $r;
+
                $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` = 1 LIMIT 1",
                        intval($_SESSION['uid']));
                if(count($r)) {
@@ -181,20 +200,43 @@ else {
                $_SESSION['my_url'] = $a->get_baseurl() . '/profile/' . $record['nickname'];
                $_SESSION['addr'] = $_SERVER['REMOTE_ADDR'];
 
-               notice( t("Welcome back ") . $record['username'] . EOL);
                $a->user = $record;
-               if(strlen($a->user['timezone']))
+
+               if($a->user['login_date'] === '0000-00-00 00:00:00') {
+                       $_SESSION['return_url'] = 'profile_photo/new';
+                       $a->module = 'profile_photo';
+                       info( t("Welcome ") . $a->user['username'] . EOL);
+                       info( t('Please upload a profile photo.') . EOL);
+               }
+               else
+                       info( t("Welcome back ") . $a->user['username'] . EOL);
+
+               if(strlen($a->user['timezone'])) {
                        date_default_timezone_set($a->user['timezone']);
+                       $a->timezone = $a->user['timezone'];
+               }
+
+               $r = q("SELECT `uid`,`username` FROM `user` WHERE `password` = '%s' AND `email` = '%s'",
+                       dbesc($a->user['password']),
+                       dbesc($a->user['email'])
+               );
+               if(count($r))
+                       $a->identities = $r;
+
 
-               $r = q("SELECT * FROM `contact` WHERE `uid` = %s AND `self` = 1 LIMIT 1",
+               $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` = 1 LIMIT 1",
                        intval($_SESSION['uid']));
                if(count($r)) {
                        $a->contact = $r[0];
                        $a->cid = $r[0]['id'];
                        $_SESSION['cid'] = $a->cid;
                }
-               q("UPDATE `user` SET `login_date` = '%s' WHERE `uid` = %d LIMIT 1",
+
+               $l = get_language();
+
+               q("UPDATE `user` SET `login_date` = '%s', `language` = '%s' WHERE `uid` = %d LIMIT 1",
                        dbesc(datetime_convert()),
+                       dbesc($l),
                        intval($_SESSION['uid'])
                );