do some commits

[quix0rs-gnu-social.git] / actions / openidlogin.php

diff --git a/actions/openidlogin.php b/actions/openidlogin.php
index fa04d457659e77fee59eca2e2a232d2a1bc11f8c..ecc4e6bff630a49332edde2ab93c8632cfbcdb53 100644 (file)
--- a/actions/openidlogin.php
+++ b/actions/openidlogin.php
@@ -28,7 +28,8 @@ 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');
+                       $result = oid_authenticate($this->trimmed('openid_url'),
+                                                                          'finishopenidlogin');
                        if (is_string($result)) { # error message
                                $this->show_form($result);
                        }
@@ -37,17 +38,21 @@ class OpenidloginAction extends Action {
                }
        }
 
-       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) {
+               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')));
+                                                                                  'action' => $formaction));
                common_input('openid_url', _t('OpenID URL'));
                common_submit('submit', _t('Login'));
                common_element_end('form');