summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--config/bootstrap/auth.php21
m---------libraries/lithium0
2 files changed, 4 insertions, 17 deletions
diff --git a/config/bootstrap/auth.php b/config/bootstrap/auth.php
index 87ee787..ea6ef2e 100644
--- a/config/bootstrap/auth.php
+++ b/config/bootstrap/auth.php
@@ -24,24 +24,11 @@ Auth::config(array(
//'scope' => array('active' => 'true'), //The active field must be true otherwise they can't auth, though we need
//to eventually send them to a page that explains they are banned.
'session' => array('options' => array('name' => 'default')),
- 'filters' => array(
- 'password' => function($password)
- {
- return $password; //prevents li3 from hashing the password before hand.
- },
- function($data) {
- if(isset($data['username']))
- {
- //Get the user from the database
- $user = User::find('first', array('conditions' => array('username' => $data['username'])));
- //Hash the submitted password with the stored salt.
- $data['password'] = Password::hash($data['password'], $user->salt);
- }
- return $data;
- }
- )
+ 'validators' => array(
+ 'password' => function($form, $data) {
+ return password::check($form, $data);
+ })
)
- )
);
$secret = "cake";
diff --git a/libraries/lithium b/libraries/lithium
-Subproject 463e0743b7a1e01dba9e73f33c42609175dbcc5
+Subproject a8fd7e546b666c33b0738cfd5f0970aa7c84043