From a67108190a6601db874cedd244b6439feff11258 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@prodromou.name>
Date: Wed, 9 Jul 2008 01:53:43 -0400
Subject: don't refetch user objects so much

darcs-hash:20080709055343-84dde-ac550608a4736ce5daed70af19866c75a1cfb416.gz
---
 actions/login.php | 54 ++++++++++++++++++++++++++++++------------------------
 1 file changed, 30 insertions(+), 24 deletions(-)

(limited to 'actions/login.php')

diff --git a/actions/login.php b/actions/login.php
index ae75c9044..af4e2e7b8 100644
--- a/actions/login.php
+++ b/actions/login.php
@@ -31,37 +31,42 @@ class LoginAction extends Action {
 			$this->show_form();
 		}
 	}
-
+	
 	function check_login() {
 		# XXX: form token in $_SESSION to prevent XSS
 		# XXX: login throttle
 		$nickname = $this->arg('nickname');
 		$password = $this->arg('password');
-		if (common_check_user($nickname, $password)) {
-			# success!
-			if (!common_set_user($nickname)) {
-				common_server_error(_t('Error setting user.'));
-				return;
-			}
-			common_real_login(true);
-			if ($this->boolean('rememberme')) {
-				common_debug('Adding rememberme cookie for ' . $nickname);
-				common_rememberme();
-			}
-			# success!
-			$url = common_get_returnto();
-			if ($url) {
-				# We don't have to return to it again
-				common_set_returnto(NULL);
-			} else {
-				$url = common_local_url('all',
-										array('nickname' =>
-											  $nickname));
-			}
-			common_redirect($url);
-		} else {
+		$user = common_check_user($nickname, $password);
+
+		if (!$user) {
 			$this->show_form(_t('Incorrect username or password.'));
+			return;
+		}
+		
+		# success!
+		if (!common_set_user($user)) {
+			common_server_error(_t('Error setting user.'));
+			return;
+		}
+		
+		common_real_login(true);
+		
+		if ($this->boolean('rememberme')) {
+			common_debug('Adding rememberme cookie for ' . $nickname);
+			common_rememberme($user);
+		}
+		# success!
+		$url = common_get_returnto();
+		if ($url) {
+			# We don't have to return to it again
+			common_set_returnto(NULL);
+		} else {
+			$url = common_local_url('all',
+									array('nickname' =>
+										  $nickname));
 		}
+		common_redirect($url);
 	}
 
 	function show_form($error=NULL) {
@@ -113,3 +118,4 @@ class LoginAction extends Action {
 		}
 	}
 }
+#
\ No newline at end of file
-- 
cgit v1.2.3-54-g00ecf