From 54d532e12f5dac8924d30d21c15f331ce5d16550 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Sun, 10 Jan 2010 22:58:33 -0800
Subject: remove redirect to OTP on login from login, register

---
 actions/login.php | 33 ---------------------------------
 1 file changed, 33 deletions(-)

(limited to 'actions/login.php')

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);
-    }
 }
-- 
cgit v1.2.3