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

Allow users to override the timezone and the language

Browse Source
This commit is contained in:
Frederic Guillot
2015-01-04 22:34:59 -05:00
parent d1d04d6fee
commit 99d27e0ce4
33 changed files with 163 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
app/Model/User.php
View File

@@ -254,7 +254,7 @@ class User extends Base
// If the user is connected refresh his session
if (Session::isOpen() && $this->userSession->getId() == $values['id']) {
$this->updateSession();
$this->userSession->refresh();
}
return $result;
@@ -294,30 +294,6 @@ class User extends Base
});
}
/**
* Update user session information
*
* @access public
* @param array $user User data
*/
public function updateSession(array $user = array())
{
if (empty($user)) {
$user = $this->getById($this->userSession->getId());
}
if (isset($user['password'])) {
unset($user['password']);
}
$user['id'] = (int) $user['id'];
$user['default_project_id'] = (int) $user['default_project_id'];
$user['is_admin'] = (bool) $user['is_admin'];
$user['is_ldap_user'] = (bool) $user['is_ldap_user'];
$this->session['user'] = $user;
}
/**
* Common validation rules
*