X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fauth.php;h=e8cee3918c5d368938c2fd94d2014e1f63dec4b4;hb=3c076b53fe0fb3d5e625b773a5e4723dece0a057;hp=d2bcb68dc8caf6557c68e968d26484a6d1fa921a;hpb=fd9b506c2f19750bdea532b63c6ff28424ec5a7b;p=friendica.git

diff --git a/include/auth.php b/include/auth.php
index d2bcb68dc8..e8cee3918c 100644
--- a/include/auth.php
+++ b/include/auth.php
@@ -53,11 +53,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)) {
@@ -183,10 +193,21 @@ else {
 
 		notice( t("Welcome back ") . $record['username'] . EOL);
 		$a->user = $record;
-		if(strlen($a->user['timezone']))
+
+		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];