debugging for addopenid problem

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

diff --git a/actions/openidlogin.php b/actions/openidlogin.php
index 0a5182a61b9a82ff29fd853e81e9698c1ae57ee5..9b0b1793ca850684f68b3375183468f1c8debb0c 100644 (file)
--- a/actions/openidlogin.php
+++ b/actions/openidlogin.php
@@ -19,8 +19,10 @@
 
 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()) {
@@ -37,7 +39,7 @@ class OpenidloginAction extends Action {
                if ($error) {
                        common_element('div', array('class' => 'error'), $error);
                } else {
-                       common_element('div', 'instructions', 
+                       common_element('div', 'instructions',
                                                   _t('Login with an OpenID account.'));
                }
                common_element_start('form', array('method' => 'POST',
@@ -48,10 +50,88 @@ class OpenidloginAction extends Action {
                common_element_end('form');
                common_show_footer();
        }
-       
-       function check_login() {
+
+       function start_openid_login() {
                # XXX: form token in $_SESSION to prevent XSS
                # XXX: login throttle
                $openid_url = $this->trimmed('openid_url');
+
+               $consumer = oid_consumer();
+
+               if (!$consumer) {
+                       common_server_error(_t('Cannot instantiate OpenID consumer object.'));
+                       return;
+               }
+
+               common_ensure_session();
+
+               $auth_request = $consumer->begin($openid_url);
+
+               // Handle failure status return values.
+               if (!$auth_request) {
+                       $this->show_form(_t('Not a valid OpenID.'));
+                       return;
+               } else if (Auth_OpenID::isFailure($auth_request)) {
+                       $this->show_form(_t('OpenID failure: ') . $auth_request->message);
+                       return;
+               }
+
+               $sreg_request = Auth_OpenID_SRegRequest::build(// Required
+                                                                                                          array(),
+                                                                                                          // Optional
+                                                                                                          array('nickname',
+                                                                                                                        'email',
+                                                                                                                        'fullname',
+                                                                                                                        'language',
+                                                                                                                        'timezone',
+                                                                                                                        'postcode',
+                                                                                                                        'country'));
+
+               if ($sreg_request) {
+                       $auth_request->addExtension($sreg_request);
+               }
+
+               $trust_root = common_root_url();
+               $process_url = common_local_url('finishopenidlogin');
+
+               if ($auth_request->shouldSendRedirect()) {
+                       $redirect_url = $auth_request->redirectURL($trust_root,
+                                                                                                          $process_url);
+                       if (!$redirect_url) {
+                       } else if (Auth_OpenID::isFailure($redirect_url)) {
+                               $this->show_form(_t('Could not redirect to server: ') . $redirect_url->message);
+                               return;
+                       } else {
+                               common_redirect($redirect_url);
+                       }
+               } else {
+                       // Generate form markup and render it.
+                       $form_id = 'openid_message';
+                       $form_html = $auth_request->formMarkup($trust_root, $process_url,
+                                                                                                  false, array('id' => $form_id));
+                       
+                       # XXX: This is cheap, but things choke if we don't escape ampersands
+                       # in the HTML attributes
+                       
+                       $form_html = preg_replace('/&/', '&', $form_html);
+                       
+                       // Display an error if the form markup couldn't be generated;
+                       // otherwise, render the HTML.
+                       if (Auth_OpenID::isFailure($form_html)) {
+                               $this->show_form(_t('Could not create OpenID form: ') . $form_html->message);
+                       } else {
+                               common_show_header(_t('OpenID Auto-Submit'));
+                               common_element('p', 'instructions',
+                                                          _t('This form should automatically submit itself. '.
+                                                                 'If not, click the submit button to go to your '.
+                                                                 'OpenID provider.'));
+                               common_raw($form_html);
+                               common_element('script', NULL,
+                                                          '$(document).ready(function() { ' .
+                                                          '    $("#'. $form_id .'").submit(); '.
+                                                          '});');
+                               common_show_footer();
+                       }
+               }
        }
 }