X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fopenid.php;h=68d7c3fd2a482645ea7e81bd11d49433b21cfdc3;hb=ee11a74d0b7cff5061a4d498f8ecd15e55b91b07;hp=443d839fa1b1863a3fd7a26d4bdbef3ccd47a78d;hpb=90b601c3dd037c698621a030c57e4e42162b085f;p=friendica.git

diff --git a/mod/openid.php b/mod/openid.php
index 443d839fa1..68d7c3fd2a 100644
--- a/mod/openid.php
+++ b/mod/openid.php
@@ -6,6 +6,10 @@ require_once('library/openid.php');
 
 function openid_content(&$a) {
 
+	$noid = get_config('system','no_openid');
+	if($noid)
+		goaway($a->get_baseurl());
+
 	if((x($_GET,'openid_mode')) && (x($_SESSION,'openid'))) {
 		$openid = new LightOpenID;
 
@@ -25,6 +29,10 @@ function openid_content(&$a) {
 							$args .= '&username=' . notags(trim($v));
 						if($k === 'contact/email')
 							$args .= '&email=' . notags(trim($v));
+						if($k === 'media/image/aspect11')
+							$photosq = bin2hex(trim($v));
+						if($k === 'media/image/default')
+							$photo = bin2hex(trim($v));
 					}
 				}
 				if($nick)
@@ -32,6 +40,11 @@ function openid_content(&$a) {
 				elseif($first)
 					$args .= '&nickname=' . $first;
 
+				if($photosq)
+					$args .= '&photo=' . $photosq;
+				elseif($photo)
+					$args .= '&photo=' . $photo;
+
 				$args .= '&openid_url=' . notags(trim($_SESSION['openid']));
 				if($a->config['register_policy'] != REGISTER_CLOSED)
 					goaway($a->get_baseurl() . '/register' . $args);
@@ -57,19 +70,35 @@ function openid_content(&$a) {
 			$_SESSION['page_flags'] = $r[0]['page-flags'];
 			$_SESSION['my_url'] = $a->get_baseurl() . '/profile/' . $r[0]['nickname'];
 
-			notice( t("Welcome back ") . $r[0]['username'] . EOL);
+			notice( sprintf( t("Welcome back "), $r[0]['username']) . EOL);
 			$a->user = $r[0];
-			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 * FROM `contact` WHERE `uid` = %s AND `self` = 1 LIMIT 1",
-				intval($_SESSION['uid']));
+			$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];
 				$a->cid = $r[0]['id'];
 				$_SESSION['cid'] = $a->cid;
 			}
 
+			q("UPDATE `user` SET `login_date` = '%s' WHERE `uid` = %d LIMIT 1",
+				dbesc(datetime_convert()),
+				intval($_SESSION['uid'])
+			);
+
 			header('X-Account-Management-Status: active; name="' . $a->user['username'] . '"; id="' . $a->user['nickname'] .'"');
 			if(($a->module !== 'home') && isset($_SESSION['return_url']))
 				goaway($a->get_baseurl() . '/' . $_SESSION['return_url']);