better error reporting in user authorization action

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

diff --git a/actions/openidlogin.php b/actions/openidlogin.php
index f00c1718109e9aa702efc684375c5efcf56919df..874ef81b254527197476923f79db7ceb53ef0acd 100644 (file)
--- a/actions/openidlogin.php
+++ b/actions/openidlogin.php
@@ -26,7 +26,7 @@ class OpenidloginAction extends Action {
        function handle($args) {
                parent::handle($args);
                if (common_logged_in()) {
-                       common_user_error(_t('Already logged in.'));
+                       common_user_error(_('Already logged in.'));
                } else if ($_SERVER['REQUEST_METHOD'] == 'POST') {
                        $openid_url = $this->trimmed('openid_url');
                        $result = oid_authenticate($openid_url,
@@ -40,25 +40,32 @@ class OpenidloginAction extends Action {
                }
        }
 
+       function get_instructions() {
+               return _('Login with an [OpenID](%%doc.openid%%) account.');
+       }
+
        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.'));
+                       $instr = $this->get_instructions();
+                       $output = common_markup_to_html($instr);
+                       common_element_start('div', 'instructions');
+                       common_raw($output);
+                       common_element_end('div');
                }
        }
-       
+
        function show_form($error=NULL, $openid_url) {
-               common_show_header(_t('OpenID Login'), NULL, $error, array($this, 'show_top'));
+               common_show_header(_('OpenID Login'), NULL, $error, array($this, 'show_top'));
                $formaction = common_local_url('openidlogin');
-               common_element_start('form', array('method' => 'POST',
+               common_element_start('form', array('method' => 'post',
                                                                                   'id' => 'openidlogin',
                                                                                   'action' => $formaction));
-               common_input('openid_url', _t('OpenID URL'),
+               common_input('openid_url', _('OpenID URL'),
                                         $openid_url,
-                                        _t('Your OpenID URL'));
-               common_submit('submit', _t('Login'));
+                                        _('Your OpenID URL'));
+               common_submit('submit', _('Login'));
                common_element_end('form');
                common_show_footer();
        }