eliseuamaro
/
gnu-social
forked from GNUsocial/gnu-social
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

♫ Don't you forget about me ♫ 

darcs-hash:20081118024947-84dde-46f68dff10cd2b5665fbd482f90ac83601df4228.gz
This commit is contained in:
Evan Prodromou 2008-11-17 21:49:47 -05:00
parent 4b5158dd4d
commit 67340ce11c
2 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
actions/finishopenidlogin.php
View File

@ -134,6 +134,10 @@ class FinishopenidloginAction extends Action {
# oid_update_user($user, $sreg);
common_set_user($user->nickname);
common_real_login(true);
if ($_SESSION['openid_rememberme']) {
common_rememberme($user);
}
unset($_SESSION['openid_rememberme']);
$this->go_home($user->nickname);
} else {
$this->save_values($display, $canonical, $sreg);
@ -229,6 +233,10 @@ class FinishopenidloginAction extends Action {
oid_set_last($display);
common_set_user($user->nickname);
common_real_login(true);
if ($_SESSION['openid_rememberme']) {
common_rememberme($user);
}
unset($_SESSION['openid_rememberme']);
common_redirect(common_local_url('showstream', array('nickname' => $user->nickname)));
}
@ -264,6 +272,10 @@ class FinishopenidloginAction extends Action {
oid_set_last($display);
common_set_user($user->nickname);
common_real_login(true);
if ($_SESSION['openid_rememberme']) {
common_rememberme($user);
}
unset($_SESSION['openid_rememberme']);
$this->go_home($user->nickname);
}

11
actions/openidlogin.php
View File

@ -37,9 +37,17 @@ class OpenidloginAction extends Action {
return;
}
$rememberme = $this->boolean('rememberme');
common_ensure_session();
$_SESSION['openid_rememberme'] = $rememberme;
$result = oid_authenticate($openid_url,
'finishopenidlogin');
if (is_string($result)) { # error message
unset($_SESSION['openid_rememberme']);
$this->show_form($result, $openid_url);
}
} else {
@ -74,6 +82,9 @@ class OpenidloginAction extends Action {
common_input('openid_url', _('OpenID URL'),
$openid_url,
_('Your OpenID URL'));
common_checkbox('rememberme', _('Remember me'), false,
_('Automatically login in the future; ' .
'not for shared computers!'));
common_submit('submit', _('Login'));
common_element_end('form');
common_show_footer();