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();
common_server_error(_t('Error setting user.'));
return;
}
+ common_real_login(true);
+ if ($this->boolean('rememberme')) {
+ common_debug('Adding rememberme cookie');
+ common_rememberme();
+ }
# success!
$url = common_get_returnto();
if ($url) {
function show_form($error=NULL) {
common_show_header(_t('Login'), NULL, $error, array($this, 'show_top'));
- common_element_start('form', array('method' => 'POST',
+ common_element_start('form', array('method' => 'post',
'id' => 'login',
'action' => common_local_url('login')));
common_input('nickname', _t('Nickname'));
common_password('password', _t('Password'));
+ common_checkbox('rememberme', _t('Remember me'), false,
+ _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 get_instructions() {
+ return _t('Login with your username and password. ' .
+ 'Don\'t have a username yet? ' .
+ '[Register](%%action.register%%) a new account, or ' .
+ 'try [OpenID](%%action.openidlogin%%). ');
+ }
+
function show_top($error=NULL) {
if ($error) {
common_element('p', 'error', $error);
} else {
- common_element('p', 'instructions',
- _t('Login with your username and password. ' .
- 'Don\'t have a username yet? Choose register above. '));
+ $instr = $this->get_instructions();
+ $output = common_markup_to_html($instr);
+ common_element_start('p', 'instructions');
+ common_raw($output);
+ common_element_end('p');
}
}
}