return false;
}
+ /**
+ * Prepare page to run
+ *
+ *
+ * @param $args
+ * @return string title
+ */
+
+ function prepare($args)
+ {
+ parent::prepare($args);
+
+ // @todo this check should really be in index.php for all sensitive actions
+ $ssl = common_config('site', 'ssl');
+ if (empty($_SERVER['HTTPS']) && ($ssl == 'always' || $ssl == 'sometimes')) {
+ common_redirect(common_local_url('login'));
+ // exit
+ }
+
+ return true;
+ }
+
/**
* Handle input, produce output
*
// CSRF protection - token set in NoticeForm
$token = $this->trimmed('token');
if (!$token || $token != common_session_token()) {
+ $st = common_session_token();
+ if (empty($token)) {
+ common_log(LOG_WARNING, 'No token provided by client.');
+ } else if (empty($st)) {
+ common_log(LOG_WARNING, 'No session token stored.');
+ } else {
+ common_log(LOG_WARNING, 'Token = ' . $token . ' and session token = ' . $st);
+ }
+
$this->clientError(_('There was a problem with your session token. '.
'Try again, please.'));
return;
$url = common_get_returnto();
- if (common_config('ssl', 'sometimes') && // mixed environment
- common_config('site', 'server') != common_config('site', 'sslserver')) {
- $this->redirectFromSSL($user, $url, $this->boolean('rememberme'));
- return;
- }
-
if ($url) {
// We don't have to return to it again
common_set_returnto(null);
+ $url = common_inject_session($url);
} else {
$url = common_local_url('all',
array('nickname' =>
'user name and password ' .
'before changing your settings.');
} else {
- return _('Login with your username and password. ' .
- 'Don\'t have a username yet? ' .
- '[Register](%%action.register%%) a new account.');
+ $prompt = _('Login with your username and password.');
+ if (!common_config('site', 'closed') && !common_config('site', 'inviteonly')) {
+ $prompt .= ' ';
+ $prompt .= _('Don\'t have a username yet? ' .
+ '[Register](%%action.register%%) a new account.');
+ }
+ return $prompt;
}
}
$nav = new LoginGroupNav($this);
$nav->show();
}
-
- function redirectFromSSL($user, $returnto, $rememberme)
- {
- try {
- $login_token = Login_token::makeNew($user);
- } catch (Exception $e) {
- $this->serverError($e->getMessage());
- return;
- }
-
- $params = array();
-
- if (!empty($returnto)) {
- $params['returnto'] = $returnto;
- }
-
- if (!empty($rememberme)) {
- $params['rememberme'] = $rememberme;
- }
-
- $target = common_local_url('otp',
- array('user_id' => $login_token->user_id,
- 'token' => $login_token->token),
- $params);
-
- common_redirect($target, 303);
- }
}