GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

First steps to getting OpenID working again

Browse Source
This commit is contained in:
Evan Prodromou 2009-01-22 23:17:08 +00:00
parent 88891f8ebd
commit 4fe5bd9cf1
1 changed files with 31 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
actions/openidlogin.php
View File

@ -23,7 +23,6 @@ require_once(INSTALLDIR.'/lib/openid.php');
class OpenidloginAction extends Action class OpenidloginAction extends Action
{ {
function handle($args) function handle($args)
{ {
parent::handle($args); parent::handle($args);
@ -35,40 +34,40 @@ class OpenidloginAction extends Action
# CSRF protection # CSRF protection
$token = $this->trimmed('token'); $token = $this->trimmed('token');
if (!$token || $token != common_session_token()) { if (!$token || $token != common_session_token()) {
$this->show_form(_('There was a problem with your session token. Try again, please.'), $openid_url); $this->showForm(_('There was a problem with your session token. Try again, please.'), $openid_url);
return; return;
} }
$rememberme = $this->boolean('rememberme'); $rememberme = $this->boolean('rememberme');
common_ensure_session(); common_ensure_session();
$_SESSION['openid_rememberme'] = $rememberme; $_SESSION['openid_rememberme'] = $rememberme;
$result = oid_authenticate($openid_url, $result = oid_authenticate($openid_url,
'finishopenidlogin'); 'finishopenidlogin');
if (is_string($result)) { # error message if (is_string($result)) { # error message
unset($_SESSION['openid_rememberme']); unset($_SESSION['openid_rememberme']);
$this->show_form($result, $openid_url); $this->showForm($result, $openid_url);
} }
} else { } else {
$openid_url = oid_get_last(); $openid_url = oid_get_last();
$this->show_form(null, $openid_url); $this->showForm(null, $openid_url);
} }
} }
function get_instructions() function getInstructions()
{ {
return _('Login with an [OpenID](%%doc.openid%%) account.'); return _('Login with an [OpenID](%%doc.openid%%) account.');
} }
function show_top($error=null) function showPageNotice()
{ {
if ($error) { if ($this->error) {
$this->element('div', array('class' => 'error'), $error); $this->element('div', array('class' => 'error'), $this->error);
} else { } else {
$instr = $this->get_instructions(); $instr = $this->getInstructions();
$output = common_markup_to_html($instr); $output = common_markup_to_html($instr);
$this->elementStart('div', 'instructions'); $this->elementStart('div', 'instructions');
$this->raw($output); $this->raw($output);
@ -76,22 +75,37 @@ class OpenidloginAction extends Action
} }
} }
function show_form($error=null, $openid_url) function title()
{ {
common_show_header(_('OpenID Login'), null, $error, array($this, 'show_top')); return _('OpenID Login');
}
function showForm($error=null, $openid_url)
{
$this->error = $error;
$this->openid_url = $openid_url;
$this->showPage();
}
function showContent() {
$formaction = common_local_url('openidlogin'); $formaction = common_local_url('openidlogin');
$this->elementStart('form', array('method' => 'post', $this->elementStart('form', array('method' => 'post',
'id' => 'openidlogin', 'id' => 'openidlogin',
'action' => $formaction)); 'action' => $formaction));
$this->hidden('token', common_session_token()); $this->hidden('token', common_session_token());
$this->input('openid_url', _('OpenID URL'), $this->input('openid_url', _('OpenID URL'),
$openid_url, $this->openid_url,
_('Your OpenID URL')); _('Your OpenID URL'));
$this->checkbox('rememberme', _('Remember me'), false, $this->checkbox('rememberme', _('Remember me'), false,
_('Automatically login in the future; ' . _('Automatically login in the future; ' .
'not for shared computers!')); 'not for shared computers!'));
$this->submit('submit', _('Login')); $this->submit('submit', _('Login'));
$this->elementEnd('form'); $this->elementEnd('form');
common_show_footer(); }
function showLocalNav()
{
$nav = new LoginGroupNav($this);
$nav->show();
} }
} }