Annajwaszahro
/
MIF_E31222691
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add "remember" to ignore list 

Signed-off-by: Jeffrey Way <jeffrey@envato.com>
This commit is contained in:
Jeffrey Way 2012-07-09 22:18:32 -04:00
parent 9dd964c316
commit ff525b995b
2 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
laravel/auth/drivers/eloquent.php
View File

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

5
laravel/auth/drivers/fluent.php
View File

@ -56,12 +56,13 @@ protected function get_user($arguments)
{ {
$table = Config::get('auth.table'); $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'); $username = Config::get('auth.username');
$query->where($username, '=', $arguments['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); $query->where($column, '=', $val);
} }