summaryrefslogtreecommitdiff
path: root/actions/publicxrds.php
diff options
context:
space:
mode:
authorEvan Prodromou <evan@controlyourself.ca>2008-06-19 11:32:31 -0400
committerEvan Prodromou <evan@controlyourself.ca>2008-06-19 11:32:31 -0400
commitfa90195c4de9da656d1f463b1a06c379391bd6c7 (patch)
tree62af2da259d8e10c9c1e78bd0df95f165086e67b /actions/publicxrds.php
parent26c7d5f04ea7808c8a3addf1d4ed56d36a36b6c9 (diff)
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
Diffstat (limited to 'actions/publicxrds.php')
-rw-r--r--actions/publicxrds.php9
1 files changed, 4 insertions, 5 deletions
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');