Browse Source

Add "remember" to ignore list

Signed-off-by: Jeffrey Way <jeffrey@envato.com>
Jeffrey Way 12 years ago
parent
commit
ff525b995b
2 changed files with 15 additions and 13 deletions
  1. 12 11
      laravel/auth/drivers/eloquent.php
  2. 3 2
      laravel/auth/drivers/fluent.php

+ 12 - 11
laravel/auth/drivers/eloquent.php

@@ -26,27 +26,28 @@ class Eloquent extends Driver {
 	 */
 	public function attempt($arguments = array())
 	{
-		$user = $this->model()->where(function($query) use($arguments) {
+		$user = $this->model()->where(function($query) use($arguments)
+		{
 			$username = Config::get('auth.username');
 			
 			$query->where($username, '=', $arguments['username']);
 
-			foreach( array_except($arguments, array('username', 'password')) as $column => $val )
+			foreach(array_except($arguments, array('username', 'password', 'remember')) as $column => $val)
 			{
 			    $query->where($column, '=', $val);
 			}
-			})->first();
+		})->first();
 
-			// If the credentials match what is in the database we will just
-			// log the user into the application and remember them if asked.
-			$password = $arguments['password'];
+		// If the credentials match what is in the database we will just
+		// log the user into the application and remember them if asked.
+		$password = $arguments['password'];
 
-			$password_field = Config::get('auth.password', 'password');
+		$password_field = Config::get('auth.password', 'password');
 
-			if ( ! is_null($user) and Hash::check($password, $user->get_attribute($password_field)))
-			{
-				return $this->login($user->id, array_get($arguments, 'remember'));
-			}
+		if ( ! is_null($user) and Hash::check($password, $user->get_attribute($password_field)))
+		{
+			return $this->login($user->id, array_get($arguments, 'remember'));
+		}
 
 		return false;
 	}

+ 3 - 2
laravel/auth/drivers/fluent.php

@@ -56,12 +56,13 @@ class Fluent extends Driver {
 	{
 		$table = Config::get('auth.table');
 
-		return DB::table($table)->where(function($query) use($arguments) {
+		return DB::table($table)->where(function($query) use($arguments)
+		{
 			$username = Config::get('auth.username');
 			
 			$query->where($username, '=', $arguments['username']);
 
-			foreach( array_except($arguments, array('username', 'password')) as $column => $val )
+			foreach(array_except($arguments, array('username', 'password', 'remember')) as $column => $val)
 			{
 			    $query->where($column, '=', $val);
 			}