X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fopenid.php;h=df074b299fb0bd003df978b269e89355857345a8;hb=4de67d95ce5ae6edd41767c8da5a54e0f1abd96e;hp=6fbd013b8d8756d27091a9f26bd5c450d1c2c154;hpb=2637831d9056862f7c3db718702116ef4652629a;p=friendica.git

diff --git a/mod/openid.php b/mod/openid.php
old mode 100644
new mode 100755
index 6fbd013b8d..df074b299f
--- a/mod/openid.php
+++ b/mod/openid.php
@@ -55,7 +55,8 @@ function openid_content(&$a) {
 			} 
 
 
-			$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)) {
@@ -64,59 +65,13 @@ function openid_content(&$a) {
   			}
 			unset($_SESSION['openid']);
 
-			$_SESSION['uid'] = $r[0]['uid'];
-			$_SESSION['theme'] = $r[0]['theme'];
-			$_SESSION['authenticated'] = 1;
-			$_SESSION['page_flags'] = $r[0]['page-flags'];
-			$_SESSION['my_url'] = $a->get_baseurl() . '/profile/' . $r[0]['nickname'];
+			require_once('include/security.php');
+			authenticate_success($r[0],true,true);
 
-			$a->user = $r[0];
+			// just in case there was no return url set 
+			// and we fell through
 
-			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` = %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;
-			}
-
-			$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(z_root());
+			goaway(z_root());
 		}
 	}
 	notice( t('Login failed.') . EOL);