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

login doesn't bark if the user is automatically logged in

Browse Source 
darcs-hash:20080624040548-34904-3b5a78f4ed40db913c82e90fe6955f26aac0f92a.gz
This commit is contained in:
Evan Prodromou 2008-06-24 00:05:48 -04:00
parent 5650d698be
commit 836f5bb756
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
actions/login.php
View File

@ -23,7 +23,7 @@ class LoginAction extends Action {
function handle($args) { function handle($args) {
parent::handle($args); parent::handle($args);
if (common_logged_in()) { if (common_is_real_login()) {
common_user_error(_t('Already logged in.')); common_user_error(_t('Already logged in.'));
} else if ($_SERVER['REQUEST_METHOD'] == 'POST') { } else if ($_SERVER['REQUEST_METHOD'] == 'POST') {
$this->check_login(); $this->check_login();
@ -71,18 +71,18 @@ class LoginAction extends Action {
common_input('nickname', _t('Nickname')); common_input('nickname', _t('Nickname'));
common_password('password', _t('Password')); common_password('password', _t('Password'));
common_checkbox('rememberme', _t('Remember me'), common_checkbox('rememberme', _t('Remember me'),
_t('Automatically login in the future; ' . _t('Automatically login in the future; ' .
'not for shared computers!')); 'not for shared computers!'));
common_submit('submit', _t('Login')); common_submit('submit', _t('Login'));
common_element_end('form'); common_element_end('form');
common_show_footer(); common_show_footer();
} }
function show_top($error=NULL) { function show_top($error=NULL) {
if ($error) { if ($error) {
common_element('p', 'error', $error); common_element('p', 'error', $error);
} else { } else {
common_element('p', 'instructions', common_element('p', 'instructions',
_t('Login with your username and password. ' . _t('Login with your username and password. ' .
'Don\'t have a username yet? Choose register above. ')); 'Don\'t have a username yet? Choose register above. '));
} }