will be shut down on June 1, 2019. At that point this instance will be unreachable and all data will be irrevocably deleted. More details at

Commit c24f4ddf authored by Brion Vibber's avatar Brion Vibber

Pretty up the OpenID variant of the OAuth login form a bit; change the 'Allow'...

Pretty up the OpenID variant of the OAuth login form a bit; change the 'Allow' button to 'Continue' so we're not confused why we get the form again after authenticating.
parent bcc06d05
......@@ -347,8 +347,10 @@ class ApiOauthAuthorizeAction extends Action
// quickie hack
$button = false;
if (!common_logged_in()) {
if (Event::handle('StartOAuthLoginForm', array($this))) {
if (Event::handle('StartOAuthLoginForm', array($this, &$button))) {
// TRANS: Fieldset legend.
$this->element('legend', null, _m('LEGEND','Account'));
......@@ -365,7 +367,7 @@ class ApiOauthAuthorizeAction extends Action
Event::handle('EndOAuthLoginForm', array($this));
Event::handle('EndOAuthLoginForm', array($this, &$button));
$this->element('input', array('id' => 'cancel_submit',
......@@ -381,7 +383,7 @@ class ApiOauthAuthorizeAction extends Action
'name' => 'allow',
'type' => 'submit',
// TRANS: Button text that when clicked will allow access to an account by an external application.
'value' => _m('BUTTON','Allow')));
'value' => $button ? $button : _m('BUTTON','Allow')));
......@@ -655,11 +655,13 @@ class OpenIDPlugin extends Plugin
return true;
function onStartOAuthLoginForm($action)
function onStartOAuthLoginForm($action, &$button)
if (common_config('site', 'openidonly')) {
// Cancel the regular password login form, we won't need it.
// TRANS: button label for OAuth authorization page when needing OpenID authentication first.
$button = _m('BUTTON', 'Continue');
return false;
} else {
// Leave the regular password login form in place.
......@@ -674,6 +676,10 @@ class OpenIDPlugin extends Plugin
protected function showOAuthLoginForm($action)
// TRANS: OpenID plugin logon form legend.
$action->element('legend', null, _m('OpenID login'));
$action->elementStart('ul', 'form_data');
$provider = common_config('openid', 'trusted_provider');
......@@ -699,6 +705,8 @@ class OpenIDPlugin extends Plugin
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment