compile error with lost dot

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

diff --git a/actions/openidlogin.php b/actions/openidlogin.php
index fa04d457659e77fee59eca2e2a232d2a1bc11f8c..f00c1718109e9aa702efc684375c5efcf56919df 100644 (file)
--- 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();