do some commits

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

diff --git a/actions/openidlogin.php b/actions/openidlogin.php
index 0a5182a61b9a82ff29fd853e81e9698c1ae57ee5..ecc4e6bff630a49332edde2ab93c8632cfbcdb53 100644 (file)
--- a/actions/openidlogin.php
+++ b/actions/openidlogin.php
@@ -19,39 +19,43 @@
 
 if (!defined('LACONICA')) { exit(1); }
 
+require_once(INSTALLDIR.'/lib/openid.php');
+
 class OpenidloginAction extends Action {
-       
+
        function handle($args) {
                parent::handle($args);
                if (common_logged_in()) {
                        common_user_error(_t('Already logged in.'));
                } else if ($_SERVER['REQUEST_METHOD'] == 'POST') {
-                       $this->start_openid_login();
+                       $result = oid_authenticate($this->trimmed('openid_url'),
+                                                                          'finishopenidlogin');
+                       if (is_string($result)) { # error message
+                               $this->show_form($result);
+                       }
                } else {
                        $this->show_form();
                }
        }
 
-       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', 
+                       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');
                common_show_footer();
        }
-       
-       function check_login() {
-               # XXX: form token in $_SESSION to prevent XSS
-               # XXX: login throttle
-               $openid_url = $this->trimmed('openid_url');
-       }
 }