return;
}
# success!
- common_redirect(common_local_url('all',
- array('nickname' =>
- $nickname)));
+ $url = common_get_returnto();
+ if ($url) {
+ # We don't have to return to it again
+ common_set_returnto(NULL);
+ } else {
+ $url = common_local_url('all',
+ array('nickname' =>
+ $nickname));
+ }
+ common_redirect($url);
} else {
$this->show_form(_t('Incorrect username or password.'));
}
}
function show_form($error=NULL) {
-
- common_show_header(_t('Login'));
- if (!is_null($error)) {
- common_element('div', array('class' => 'error'), $msg);
- }
+ common_show_header(_t('Login'), NULL, $error, array($this, 'show_top'));
common_element_start('form', array('method' => 'POST',
'id' => 'login',
'action' => common_local_url('login')));
common_element_end('form');
common_show_footer();
}
+
+ 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. '));
+ }
+ }
}