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

38
app/Model/Config.php
View File

@@ -25,24 +25,32 @@ class Config extends Base
* Get available timezones
*
* @access public
* @param boolean $prepend Prepend a default value
* @return array
*/
public function getTimezones()
public function getTimezones($prepend = false)
{
$timezones = timezone_identifiers_list();
return array_combine(array_values($timezones), $timezones);
$listing = array_combine(array_values($timezones), $timezones);
if ($prepend) {
return array('' => t('Application default')) + $listing;
}
return $listing;
}
/**
* Get available languages
*
* @access public
* @param boolean $prepend Prepend a default value
* @return array
*/
public function getLanguages()
public function getLanguages($prepend = false)
{
// Sorted by value
return array(
$languages = array(
'da_DK' => 'Dansk',
'de_DE' => 'Deutsch',
'en_US' => 'English',
@@ -59,6 +67,12 @@ class Config extends Base
'ja_JP' => '日本語',
'th_TH' => 'ไทย',
);
if ($prepend) {
return array('' => t('Application default')) + $languages;
}
return $languages;
}
/**
@@ -138,10 +152,11 @@ class Config extends Base
*/
public function setupTranslations()
{
$language = $this->get('application_language', 'en_US');
if ($language !== 'en_US') {
Translator::load($language);
if ($this->userSession->isLogged() && ! empty($this->session['user']['language'])) {
Translator::load($this->session['user']['language']);
}
else {
Translator::load($this->get('application_language', 'en_US'));
}
}
@@ -152,7 +167,12 @@ class Config extends Base
*/
public function setupTimezone()
{
date_default_timezone_set($this->get('application_timezone', 'UTC'));
if ($this->userSession->isLogged() && ! empty($this->session['user']['timezone'])) {
date_default_timezone_set($this->session['user']['timezone']);
}
else {
date_default_timezone_set($this->get('application_timezone', 'UTC'));
}
}
/**

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
*

26
app/Model/UserSession.php
View File

@@ -2,6 +2,8 @@
namespace Model;
use Core\Translator;
/**
* User Session
*
@@ -10,6 +12,30 @@ namespace Model;
*/
class UserSession extends Base
{
/**
* Update user session information
*
* @access public
* @param array $user User data
*/
public function refresh(array $user = array())
{
if (empty($user)) {
$user = $this->user->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;
}
/**
* Return true if the logged user is admin
*