AS1024
/
Kanboard-Prod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix bug for password change

This commit is contained in:
Frédéric Guillot 2014-08-19 18:29:13 -07:00
parent f8071e7d4a
commit 11b4715d29
3 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/Controller/Base.php
View File

@ -28,6 +28,7 @@ use Model\LastLogin;
* @property \Model\SubTask $subTask
* @property \Model\Task $task
* @property \Model\User $user
* @property \Model\Webhook $webhook
*/
abstract class Base
{

33
app/Model/Authentication.php
View File

@ -70,6 +70,27 @@ class Authentication extends Base
return false;
}
/**
* Authenticate a user by different methods
*
* @access public
* @param string $username Username
* @param string $password Password
* @return boolean
*/
public function authenticate($username, $password)
{
// Try first the database auth and then LDAP if activated
if ($this->backend('database')->authenticate($username, $password)) {
return true;
}
else if (LDAP_AUTH && $this->backend('ldap')->authenticate($username, $password)) {
return true;
}
return false;
}
/**
* Validate user login form
*
@ -90,17 +111,7 @@ class Authentication extends Base
if ($result) {
$authenticated = false;
// Try first the database auth and then LDAP if activated
if ($this->backend('database')->authenticate($values['username'], $values['password'])) {
$authenticated = true;
}
else if (LDAP_AUTH && $this->backend('ldap')->authenticate($values['username'], $values['password'])) {
$authenticated = true;
}
if ($authenticated) {
if ($this->authenticate($values['username'], $values['password'])) {
// Setup the remember me feature
if (! empty($values['remember_me'])) {

4
app/Model/User.php
View File

@ -307,9 +307,7 @@ class User extends Base
if ($v->execute()) {
// Check password
list($authenticated,) = $this->authenticate($_SESSION['user']['username'], $values['current_password']);
if ($authenticated) {
if ($this->authentication->authenticate($_SESSION['user']['username'], $values['current_password'])) {
return array(true, array());
}
else {