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

10
app/Model/User.php
View File

@@ -280,11 +280,9 @@ class User extends Base
public function prepare(array &$values)
{
if (isset($values['password'])) {
if (! empty($values['password'])) {
$values['password'] = \password_hash($values['password'], PASSWORD_BCRYPT);
}
else {
} else {
unset($values['password']);
}
}
@@ -516,8 +514,7 @@ class User extends Base
if (isset($values['is_ldap_user']) && $values['is_ldap_user'] == 1) {
$v = new Validator($values, array_merge($rules, $this->commonValidationRules()));
}
else {
} else {
$v = new Validator($values, array_merge($rules, $this->commonValidationRules(), $this->commonPasswordValidationRules()));
}
@@ -591,8 +588,7 @@ class User extends Base
// Check password
if ($this->authentication->authenticate($this->session['user']['username'], $values['current_password'])) {
return array(true, array());
}
else {
} else {
return array(false, array('current_password' => array(t('Wrong password'))));
}
}