From 7760d6531dc67a0f06ae4c1f924497c4d1256f98 Mon Sep 17 00:00:00 2001 From: BlueRaja Date: Tue, 4 Jun 2013 05:01:54 -0500 Subject: Fix issue with LightOpenID / Yahoo --- includes/openid.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/includes/openid.php b/includes/openid.php index 85af9a8..d0e656f 100644 --- a/includes/openid.php +++ b/includes/openid.php @@ -349,7 +349,7 @@ class LightOpenID $headers = $this->request($url, 'HEAD'); $next = false; - if (isset($headers['x-xrds-location'])) { + if (isset($headers['x-xrds-location']) && !isset($this->data['openid_claimed_id'])) { $url = $this->build_url(parse_url($url), parse_url(trim($headers['x-xrds-location']))); $next = true; } -- cgit v1.2.3 From 682b9ee96b6aad33b1339ce0fca4c855deaec1e3 Mon Sep 17 00:00:00 2001 From: BlueRaja Date: Tue, 4 Jun 2013 05:03:37 -0500 Subject: Revert "Yahoo work around with openid_identity" This reverts commit 538c6f28e50b92b77ef9ce7a6a49641327eeed1a. --- pages/login.php | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pages/login.php b/pages/login.php index e5ccda8..d277cb7 100644 --- a/pages/login.php +++ b/pages/login.php @@ -52,10 +52,8 @@ try { $display = 'noname'; } $email = $openIdAttributes['contact/email']; - //$claimedid = $openid->__get('identity'); - // Yahoo fix: - $claimedid = $openid->__get('openid_identity'); - + $claimedid = $openid->__get('identity'); + if ($claimedid == "https://open.login.yahooapis.com/openid20/user_profile/xrds") { die(throwLoginError($openIdAttributes, "Yahoo went full retard, and didn't send any way for me to identify you...")); } -- cgit v1.2.3