X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Flogin.php;h=83fa3ed23c262f9f7a09f7a5166ad1c6c1bfb8f0;hb=f374e924f51d50a601bef4beeb138665374485b0;hp=fe2ae5c1c459a3b2b72108c3f9812b55698cb54d;hpb=be3a44651c47a27907e682a8e4c9e5dd9352a1f6;p=quix0rs-gnu-social.git diff --git a/actions/login.php b/actions/login.php index fe2ae5c1c4..83fa3ed23c 100644 --- a/actions/login.php +++ b/actions/login.php @@ -23,7 +23,7 @@ class LoginAction extends Action { function handle($args) { parent::handle($args); - if (common_logged_in()) { + if (common_is_real_login()) { common_user_error(_t('Already logged in.')); } else if ($_SERVER['REQUEST_METHOD'] == 'POST') { $this->check_login(); @@ -71,18 +71,22 @@ class LoginAction extends Action { common_input('nickname', _t('Nickname')); common_password('password', _t('Password')); common_checkbox('rememberme', _t('Remember me'), - _t('Automatically login in the future; ' . + _t('Automatically login in the future; ' . 'not for shared computers!')); common_submit('submit', _t('Login')); common_element_end('form'); + common_element_start('p'); + common_element('a', array('href' => common_local_url('recoverpassword')), + _t('Lost or forgotten password?')); + common_element_end('p'); common_show_footer(); } - + function show_top($error=NULL) { if ($error) { common_element('p', 'error', $error); } else { - common_element('p', 'instructions', + common_element('p', 'instructions', _t('Login with your username and password. ' . 'Don\'t have a username yet? Choose register above. ')); }