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

Fix bug #197: admin flag removed after a user update

Browse Source
This commit is contained in:
Frédéric Guillot
2014-08-17 15:54:02 -07:00
parent 249c9aef35
commit e468f3c558
1 changed files with 38 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
app/Model/User.php
View File

@@ -111,6 +111,41 @@ class User extends Base
return $result; return $result;
} }
/**
* Prepare values before an update or a create
*
* @access public
* @param array $values Form values
*/
public function prepare(array &$values)
{
if (isset($values['password'])) {
if (! empty($values['password'])) {
$values['password'] = \password_hash($values['password'], PASSWORD_BCRYPT);
}
else {
unset($values['password']);
}
}
if (isset($values['confirmation'])) {
unset($values['confirmation']);
}
if (isset($values['current_password'])) {
unset($values['current_password']);
}
if (isset($values['is_admin']) && empty($values['is_admin'])) {
$values['is_admin'] = 0;
}
if (isset($values['is_ldap_user']) && empty($values['is_ldap_user'])) {
$values['is_ldap_user'] = 0;
}
}
/** /**
* Add a new user in the database * Add a new user in the database
* *
@@ -120,22 +155,7 @@ class User extends Base
*/ */
public function create(array $values) public function create(array $values)
{ {
if (isset($values['confirmation'])) { $this->prepare($values);
unset($values['confirmation']);
}
if (isset($values['password'])) {
$values['password'] = \password_hash($values['password'], PASSWORD_BCRYPT);
}
if (empty($values['is_admin'])) {
$values['is_admin'] = 0;
}
if (empty($values['is_ldap_user'])) {
$values['is_ldap_user'] = 0;
}
return $this->db->table(self::TABLE)->save($values); return $this->db->table(self::TABLE)->save($values);
} }
@@ -148,31 +168,10 @@ class User extends Base
*/ */
public function update(array $values) public function update(array $values)
{ {
if (! empty($values['password'])) { $this->prepare($values);
$values['password'] = \password_hash($values['password'], PASSWORD_BCRYPT);
}
else {
unset($values['password']);
}
if (isset($values['confirmation'])) {
unset($values['confirmation']);
}
if (isset($values['current_password'])) {
unset($values['current_password']);
}
if (empty($values['is_admin'])) {
$values['is_admin'] = 0;
}
if (empty($values['is_ldap_user'])) {
$values['is_ldap_user'] = 0;
}
$result = $this->db->table(self::TABLE)->eq('id', $values['id'])->update($values); $result = $this->db->table(self::TABLE)->eq('id', $values['id'])->update($values);
// If the user is connected refresh his session
if (session_id() !== '' && $_SESSION['user']['id'] == $values['id']) { if (session_id() !== '' && $_SESSION['user']['id'] == $values['id']) {
$this->updateSession(); $this->updateSession();
} }