X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fopenid.php;h=b8734f02342810d390a89747f4a6d7919d8b0d71;hb=906addf865ccab2c98d5035fc6c1b10d43004dfe;hp=2e1025692d3a8285eff137a2fc0a7d8589700904;hpb=5bfb0ba4c2ee23366651e1e38d3964098f99f5cf;p=friendica.git

diff --git a/mod/openid.php b/mod/openid.php
index 2e1025692d..b8734f0234 100644
--- a/mod/openid.php
+++ b/mod/openid.php
@@ -8,7 +8,7 @@ function openid_content(&$a) {
 
 	$noid = get_config('system','no_openid');
 	if($noid)
-		goaway($a->get_baseurl());
+		goaway(z_root());
 
 	if((x($_GET,'openid_mode')) && (x($_SESSION,'openid'))) {
 		$openid = new LightOpenID;
@@ -49,18 +49,19 @@ function openid_content(&$a) {
 				if($a->config['register_policy'] != REGISTER_CLOSED)
 					goaway($a->get_baseurl() . '/register' . $args);
 				else
-					goaway($a->get_baseurl());
+					goaway(z_root());
 
 				// NOTREACHED
 			} 
 
 
-			$r = q("SELECT * FROM `user` WHERE `openid` = '%s' AND `blocked` = 0 AND `verified` = 1 LIMIT 1",
+			$r = q("SELECT `user`.*, `user`.`pubkey` as `upubkey`, `user`.`prvkey` as `uprvkey` 
+				FROM `user` WHERE `openid` = '%s' AND `blocked` = 0 AND `account_expired` = 0 AND `verified` = 1 LIMIT 1",
 				dbesc($_SESSION['openid'])
 			);
 			if(! count($r)) {
 				notice( t('Login failed.') . EOL );
-				goaway($a->get_baseurl());
+				goaway(z_root());
   			}
 			unset($_SESSION['openid']);
 
@@ -70,35 +71,56 @@ 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);
 			$a->user = $r[0];
 
+			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 * 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",
+			$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'])
 			);
 
+
 			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']);
 			else
-				goaway($a->get_baseurl());
+				goaway(z_root());
 		}
 	}
 	notice( t('Login failed.') . EOL);
-	goaway($a->get_baseurl());
+	goaway(z_root());
 	// NOTREACHED
-}
\ No newline at end of file
+}