From 8c532efd5f02f7a7e5ea322a07ddcf49d130a8ec Mon Sep 17 00:00:00 2001 From: Frederic Guillot Date: Sat, 17 Oct 2015 10:09:03 -0400 Subject: Run php-cs-fixer on the code base --- app/Model/User.php | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'app/Model/User.php') diff --git a/app/Model/User.php b/app/Model/User.php index 138b77b2..c4d26c9c 100644 --- a/app/Model/User.php +++ b/app/Model/User.php @@ -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')))); } } -- cgit v1.2.3