diff options
| -rw-r--r-- | modules/openid/openid.module | 13 | ||||
| -rw-r--r-- | modules/openid/xrds.inc | 3 |
2 files changed, 15 insertions, 1 deletions
diff --git a/modules/openid/openid.module b/modules/openid/openid.module index a0bc93324..d5727954a 100644 --- a/modules/openid/openid.module +++ b/modules/openid/openid.module @@ -157,7 +157,18 @@ function openid_begin($claimed_id, $return_to = '', $form_values = array()) { // Now that there is an association created, move on // to request authentication from the IdP - $identity = (!empty($services[0]['delegate'])) ? $services[0]['delegate'] : $claimed_id; + // First check for LocalID. If not found, check for Delegate. Fall + // back to $claimed_id if neither is found. + if (!empty($services[0]['localid'])) { + $identity = $services[0]['localid']; + } + else if (!empty($services[0]['delegate'])) { + $identity = $services[0]['delegate']; + } + else { + $identity = $claimed_id; + } + if (isset($services[0]['types']) && is_array($services[0]['types']) && in_array(OPENID_NS_2_0 .'/server', $services[0]['types'])) { $identity = 'http://openid.net/identifier_select/2.0'; } diff --git a/modules/openid/xrds.inc b/modules/openid/xrds.inc index 28fc979c4..955876881 100644 --- a/modules/openid/xrds.inc +++ b/modules/openid/xrds.inc @@ -65,6 +65,9 @@ function _xrds_cdata(&$parser, $data) { case 'XRDS/XRD/SERVICE/DELEGATE': $xrds_current_service['delegate'] = $data; break; + case 'XRDS/XRD/SERVICE/LOCALID': + $xrds_current_service['localid'] = $data; + break; } } |