We are no longer offering accounts on this server. Consider https://gitlab.freedesktop.org/ as a place to host projects.

Commit 54d532e1 authored by Evan Prodromou's avatar Evan Prodromou

remove redirect to OTP on login from login, register

parent 8c6ec0b5
......@@ -132,12 +132,6 @@ class LoginAction extends Action
$url = common_get_returnto();
if (common_config('site', 'ssl') == 'sometimes' && // mixed environment
0 != strcasecmp(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);
......@@ -282,31 +276,4 @@ class LoginAction extends Action
$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);
}
}
......@@ -260,16 +260,6 @@ class RegisterAction extends Action
// Re-init language env in case it changed (not yet, but soon)
common_init_language();
if (common_config('site', 'ssl') == 'sometimes' && // mixed environment
0 != strcasecmp(common_config('site', 'server'), common_config('site', 'sslserver'))) {
$url = common_local_url('all',
array('nickname' =>
$user->nickname));
$this->redirectFromSSL($user, $url, $this->boolean('rememberme'));
return;
}
$this->showSuccess();
} else {
$this->showForm(_('Invalid username or password.'));
......@@ -589,32 +579,5 @@ class RegisterAction extends Action
$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);
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment