Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing

[quix0rs-gnu-social.git] / actions / login.php

diff --git a/actions/login.php b/actions/login.php
index ad57dd66782ff221511a38b975c447b4f7d30c7c..8ea3c800b70f72d1915dd497e0d4fe76d14bf728 100644 (file)
--- a/actions/login.php
+++ b/actions/login.php
@@ -75,12 +75,11 @@ class LoginAction extends Action
     function handle($args)
     {
         parent::handle($args);
+
         if (common_is_real_login()) {
             $this->clientError(_('Already logged in.'));
         } else if ($_SERVER['REQUEST_METHOD'] == 'POST') {
             $this->checkLogin();
-        } else if (isset($args['user_id']) && isset($args['token'])){
-            $this->checkLogin($args['user_id'],$args['token']);
         } else {
             common_ensure_session();
             $this->showForm();
@@ -99,46 +98,30 @@ class LoginAction extends Action
 
     function checkLogin($user_id=null, $token=null)
     {
-        if(isset($token) && isset($user_id)){
-            //Token based login (from the LoginCommand)
-            $login_token = Login_token::staticGet('user_id',$user_id);
-            if($login_token && $login_token->token == $token){
-                if($login_token->modified > time()+2*60){
-                    //token has expired
-                    //delete the token as it is useless
-                    $login_token->delete();
-                    $this->showForm(_('Invalid or expired token.'));
-                    return;
-                }else{
-                    //delete the token so it cannot be reused
-                    $login_token->delete();
-                    //it's a valid token - let them log in
-                    $user = User::staticGet('id', $user_id);
-                    //$user = User::staticGet('nickname', "candrews");
-                }
-            }else{
-                $this->showForm(_('Invalid or expired token.'));
-                return;
-            }
-        }else{
-            // Regular form submission login
-
-            // XXX: login throttle
-
-            // CSRF protection - token set in NoticeForm
-            $token = $this->trimmed('token');
-            if (!$token || $token != common_session_token()) {
-                $this->clientError(_('There was a problem with your session token. '.
-                                     'Try again, please.'));
-                return;
-            }
-
-            $nickname = common_canonical_nickname($this->trimmed('nickname'));
-            $password = $this->arg('password');
-
-            $user = common_check_user($nickname, $password);
+        // XXX: login throttle
+
+        // 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;
         }
 
+        $nickname = $this->trimmed('nickname');
+        $password = $this->arg('password');
+
+        $user = common_check_user($nickname, $password);
+
         if (!$user) {
             $this->showForm(_('Incorrect username or password.'));
             return;
@@ -146,7 +129,7 @@ class LoginAction extends Action
 
         // success!
         if (!common_set_user($user)) {
-            $this->serverError(_('Error setting user.'));
+            $this->serverError(_('Error setting user. You are probably not authorized.'));
             return;
         }
 
@@ -161,10 +144,11 @@ class LoginAction extends Action
         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' =>
-                                          $nickname));
+                                          $user->nickname));
         }
 
         common_redirect($url, 303);
@@ -236,9 +220,9 @@ class LoginAction extends Action
     function showContent()
     {
         $this->elementStart('form', array('method' => 'post',
-                                           'id' => 'form_login',
-                                           'class' => 'form_settings',
-                                           'action' => common_local_url('login')));
+                                          'id' => 'form_login',
+                                          'class' => 'form_settings',
+                                          'action' => common_local_url('login')));
         $this->elementStart('fieldset');
         $this->element('legend', null, _('Login to site'));
         $this->elementStart('ul', 'form_data');
@@ -251,7 +235,7 @@ class LoginAction extends Action
         $this->elementStart('li');
         $this->checkbox('rememberme', _('Remember me'), false,
                         _('Automatically login in the future; ' .
-                           'not for shared computers!'));
+                          'not for shared computers!'));
         $this->elementEnd('li');
         $this->elementEnd('ul');
         $this->submit('submit', _('Login'));