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

Run php-cs-fixer on the code base

Browse Source
This commit is contained in:
Frederic Guillot
2015-10-17 10:09:03 -04:00
parent b40190ee9f
commit 8c532efd5f
147 changed files with 465 additions and 772 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/Model/Authentication.php
View File

@@ -79,12 +79,10 @@ class Authentication extends Base
if ($this->user->isLocked($username)) {
$this->container['logger']->error('Account locked: '.$username);
return false;
}
else if ($this->backend('database')->authenticate($username, $password)) {
} elseif ($this->backend('database')->authenticate($username, $password)) {
$this->user->resetFailedLogin($username);
return true;
}
else if (LDAP_AUTH && $this->backend('ldap')->authenticate($username, $password)) {
} elseif (LDAP_AUTH && $this->backend('ldap')->authenticate($username, $password)) {
$this->user->resetFailedLogin($username);
return true;
}
@@ -133,11 +131,9 @@ class Authentication extends Base
list($result, $errors) = $this->validateFormCredentials($values);
if ($result) {
if ($this->validateFormCaptcha($values) && $this->authenticate($values['username'], $values['password'])) {
$this->createRememberMeSession($values);
}
else {
} else {
$result = false;
$errors['login'] = t('Bad username or password');
}
@@ -194,7 +190,6 @@ class Authentication extends Base
private function createRememberMeSession(array $values)
{
if (REMEMBER_ME_AUTH && ! empty($values['remember_me'])) {
$credentials = $this->backend('rememberMe')
->create($this->userSession->getId(), Request::getIpAddress(), Request::getUserAgent());