From 171b4f72ee5a84d2a67b99aca7df9406e68f60c1 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@prodromou.name>
Date: Thu, 19 Jun 2008 09:47:10 -0400
Subject: immediate mode for openid

darcs-hash:20080619134710-84dde-6086a4ac7bbd72a251fe5ce6fe3156e3270ebd74.gz
---
 actions/openidlogin.php | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

(limited to 'actions/openidlogin.php')

diff --git a/actions/openidlogin.php b/actions/openidlogin.php
index ecc4e6bff..f00c17181 100644
--- a/actions/openidlogin.php
+++ b/actions/openidlogin.php
@@ -28,13 +28,15 @@ class OpenidloginAction extends Action {
 		if (common_logged_in()) {
 			common_user_error(_t('Already logged in.'));
 		} else if ($_SERVER['REQUEST_METHOD'] == 'POST') {
-			$result = oid_authenticate($this->trimmed('openid_url'),
+			$openid_url = $this->trimmed('openid_url');
+			$result = oid_authenticate($openid_url,
 									   'finishopenidlogin');
 			if (is_string($result)) { # error message
-				$this->show_form($result);
+				$this->show_form($result, $openid_url);
 			}
 		} else {
-			$this->show_form();
+			$openid_url = oid_get_last();
+			$this->show_form(NULL, $openid_url);
 		}
 	}
 
@@ -47,13 +49,15 @@ class OpenidloginAction extends Action {
 		}
 	}
 	
-	function show_form($error=NULL) {
+	function show_form($error=NULL, $openid_url) {
 		common_show_header(_t('OpenID Login'), NULL, $error, array($this, 'show_top'));
 		$formaction = common_local_url('openidlogin');
 		common_element_start('form', array('method' => 'POST',
 										   'id' => 'openidlogin',
 										   'action' => $formaction));
-		common_input('openid_url', _t('OpenID URL'));
+		common_input('openid_url', _t('OpenID URL'),
+					 $openid_url,
+					 _t('Your OpenID URL'));
 		common_submit('submit', _t('Login'));
 		common_element_end('form');
 		common_show_footer();
-- 
cgit v1.2.3-54-g00ecf