diff options
| -rw-r--r-- | actions/openidlogin.php | 6 | ||||
| -rw-r--r-- | lib/openid.php | 143 |
2 files changed, 75 insertions, 74 deletions
diff --git a/actions/openidlogin.php b/actions/openidlogin.php index fa04d4576..6ce4bb191 100644 --- 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); } @@ -45,9 +46,10 @@ class OpenidloginAction extends Action { common_element('div', 'instructions', _t('Login with an OpenID account.')); } + $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'); diff --git a/lib/openid.php b/lib/openid.php index c28041554..c98ff8bfc 100644 --- a/lib/openid.php +++ b/lib/openid.php @@ -62,79 +62,78 @@ function oid_link_user($id, $canonical, $display) { function oid_authenticate($openid_url, $returnto) { - $consumer = oid_consumer(); - - if (!$consumer) { - common_server_error(_t('Cannot instantiate OpenID consumer object.')); - return false; - } - - common_ensure_session(); - - $auth_request = $consumer->begin($openid_url); - - // Handle failure status return values. - if (!$auth_request) { - return _t('Not a valid OpenID.'); - } else if (Auth_OpenID::isFailure($auth_request)) { - return _t('OpenID failure: ') . $auth_request->message; - } - - $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); + $consumer = oid_consumer(); + + if (!$consumer) { + common_server_error(_t('Cannot instantiate OpenID consumer object.')); + return false; + } + + common_ensure_session(); + + $auth_request = $consumer->begin($openid_url); + + // Handle failure status return values. + if (!$auth_request) { + return _t('Not a valid OpenID.'); + } else if (Auth_OpenID::isFailure($auth_request)) { + return _t('OpenID failure: ') . $auth_request->message; + } + + $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($returnto); + + if ($auth_request->shouldSendRedirect()) { + $redirect_url = $auth_request->redirectURL($trust_root, + $process_url); + if (!$redirect_url) { + } else if (Auth_OpenID::isFailure($redirect_url)) { + return _t('Could not redirect to server: ') . $redirect_url->message; + } else { + common_redirect($redirect_url); } - - $trust_root = common_root_url(); - $process_url = common_local_url($returnto); - - if ($auth_request->shouldSendRedirect()) { - $redirect_url = $auth_request->redirectURL($trust_root, - $process_url); - if (!$redirect_url) { - } else if (Auth_OpenID::isFailure($redirect_url)) { - return _t('Could not redirect to server: ') . $redirect_url->message; - } 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 { - // 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(); - } + 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(); } } -}
\ No newline at end of file +} |