summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Prodromou <evan@status.net>2010-01-10 22:58:33 -0800
committerEvan Prodromou <evan@status.net>2010-01-10 22:58:33 -0800
commit54d532e12f5dac8924d30d21c15f331ce5d16550 (patch)
treea4a2ecd3c099dc37131afe04852fe9d316497ad7
parent8c6ec0b59ef282c5b2910689255b52de99d477a2 (diff)
remove redirect to OTP on login from login, register
-rw-r--r--actions/login.php33
-rw-r--r--actions/register.php37
2 files changed, 0 insertions, 70 deletions
diff --git a/actions/login.php b/actions/login.php
index 8694de188..9c47d88b1 100644
--- a/actions/login.php
+++ b/actions/login.php
@@ -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);
- }
}
diff --git a/actions/register.php b/actions/register.php
index ec6534eee..6339ea117 100644
--- a/actions/register.php
+++ b/actions/register.php
@@ -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);
- }
}