From ff525b995b21998aeba4d87ff97a54b0cb6c6df3 Mon Sep 17 00:00:00 2001 From: Jeffrey Way Date: Mon, 9 Jul 2012 22:18:32 -0400 Subject: [PATCH] Add "remember" to ignore list Signed-off-by: Jeffrey Way --- laravel/auth/drivers/eloquent.php | 23 ++++++++++++----------- laravel/auth/drivers/fluent.php | 5 +++-- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/laravel/auth/drivers/eloquent.php b/laravel/auth/drivers/eloquent.php index 26e143b9..4b365d1e 100644 --- a/laravel/auth/drivers/eloquent.php +++ b/laravel/auth/drivers/eloquent.php @@ -26,27 +26,28 @@ public function retrieve($id) */ 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; } diff --git a/laravel/auth/drivers/fluent.php b/laravel/auth/drivers/fluent.php index e5aaa506..ed660881 100644 --- a/laravel/auth/drivers/fluent.php +++ b/laravel/auth/drivers/fluent.php @@ -56,12 +56,13 @@ protected function get_user($arguments) { $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); }