From fa90195c4de9da656d1f463b1a06c379391bd6c7 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Thu, 19 Jun 2008 11:32:31 -0400 Subject: cant remove last openid, public xrds includes immediate Added a check to make sure the user doesn't remove their last OpenID if they don't also have a password. Also, put the finishimmediate URL in the publicxrds so that e.g. Yahoo! doesn't get snippy. darcs-hash:20080619153231-5ed1f-a5d784ff39b53afdfb0584689188dd78bdb90c41.gz --- actions/publicxrds.php | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'actions/publicxrds.php') diff --git a/actions/publicxrds.php b/actions/publicxrds.php index 98d7a164e..c41c3b2a8 100644 --- a/actions/publicxrds.php +++ b/actions/publicxrds.php @@ -40,11 +40,10 @@ class PublicxrdsAction extends Action { common_element('Type', NULL, 'xri://$xrds*simple'); - $this->show_service(Auth_OpenID_RP_RETURN_TO_URL_TYPE, - common_local_url('finishopenidlogin')); - - $this->show_service(Auth_OpenID_RP_RETURN_TO_URL_TYPE, - common_local_url('finishaddopenid')); + foreach (array('finishopenidlogin', 'finishaddopenid', 'finishimmediate') as $finish) { + $this->show_service(Auth_OpenID_RP_RETURN_TO_URL_TYPE, + common_local_url($finish)); + } common_element_end('XRD'); -- cgit v1.2.3-54-g00ecf