Merge remote branch 'mike/master'

[friendica.git] / include / auth.php

diff --git a/include/auth.php b/include/auth.php
index a0244571b3fec5703c99a7d5832cc2c51f1f374e..e8cee3918c5d368938c2fd94d2014e1f63dec4b4 100644 (file)
--- a/include/auth.php
+++ b/include/auth.php
@@ -61,6 +61,13 @@ if((isset($_SESSION)) && (x($_SESSION,'authenticated')) && ((! (x($_POST,'auth-p
 
                $_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)) {
@@ -192,7 +199,15 @@ else {
                        $a->timezone = $a->user['timezone'];
                }
 
-               $r = q("SELECT * FROM `contact` WHERE `uid` = %s AND `self` = 1 LIMIT 1",
+               $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)) {
                        $a->contact = $r[0];