X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fopenidlogin.php;h=f00c1718109e9aa702efc684375c5efcf56919df;hb=31b5ae1523c4f64159f00b32683912da1a9fb474;hp=fa04d457659e77fee59eca2e2a232d2a1bc11f8c;hpb=23c0b1f48241e198a631f333a3d6e5faedab0279;p=quix0rs-gnu-social.git

diff --git a/actions/openidlogin.php b/actions/openidlogin.php
index fa04d45765..f00c171810 100644
--- a/actions/openidlogin.php
+++ b/actions/openidlogin.php
@@ -28,27 +28,36 @@ 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'), 'finishopenidlogin');
+			$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);
 		}
 	}
 
-	function show_form($error=NULL) {
-		common_show_header(_t('OpenID Login'));
+	function show_top($error=NULL) {
 		if ($error) {
 			common_element('div', array('class' => 'error'), $error);
 		} else {
 			common_element('div', 'instructions',
 						   _t('Login with an OpenID account.'));
 		}
+	}
+	
+	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' => common_local_url('openidlogin')));
-		common_input('openid_url', _t('OpenID URL'));
+										   'action' => $formaction));
+		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();