// +----------------------------------------------------------------------+
class ttUser {
- var $login = null; // User login.
- var $name = null; // User name.
- var $id = null; // User id.
- var $team_id = null; // Team id.
- var $role = null; // User role (user, client, comanager, manager, admin).
- var $client_id = null; // Client id for client user role.
- var $behalf_id = null; // User id, on behalf of whom we are working.
- var $behalf_name = null; // User name, on behalf of whom we are working.
- var $email = null; // User email.
- var $lang = null; // Language.
- var $decimal_mark = null; // Decimal separator.
- var $date_format = null; // Date format.
- var $time_format = null; // Time format.
- var $week_start = 0; // Week start day.
- var $tracking_mode = 0; // Tracking mode.
- var $record_type = 0; // Record type (duration vs start and finish, or both).
- var $currency = null; // Currency.
- var $plugins = null; // Comma-separated list of enabled plugins.
- var $team = null; // Team name.
- var $custom_logo = 0; // Whether to use a custom logo for team.
- var $address = null; // Address for invoices.
- var $lock_interval = 0; // Lock interval in days for time records.
- var $lock_spec = null; // Cron specification for record locking.
- var $rights = 0; // A mask of user rights.
+ var $login = null; // User login.
+ var $name = null; // User name.
+ var $id = null; // User id.
+ var $team_id = null; // Team id.
+ var $role = null; // User role (user, client, comanager, manager, admin).
+ var $client_id = null; // Client id for client user role.
+ var $behalf_id = null; // User id, on behalf of whom we are working.
+ var $behalf_name = null; // User name, on behalf of whom we are working.
+ var $email = null; // User email.
+ var $lang = null; // Language.
+ var $decimal_mark = null; // Decimal separator.
+ var $date_format = null; // Date format.
+ var $time_format = null; // Time format.
+ var $week_start = 0; // Week start day.
+ var $show_holidays = 0; // Whether to show holidays in calendar.
+ var $tracking_mode = 0; // Tracking mode.
+ var $project_required = 0; // Whether project selection is required on time entires.
+ var $task_required = 0; // Whether task selection is required on time entires.
+ var $record_type = 0; // Record type (duration vs start and finish, or both).
+ var $uncompleted_indicators = 0; // Uncompleted time entry indicators (show nowhere or on users page).
+ var $bcc_email = null; // Bcc email.
+ var $currency = null; // Currency.
+ var $plugins = null; // Comma-separated list of enabled plugins.
+ var $config = null; // Comma-separated list of miscellaneous config options.
+ var $team = null; // Team name.
+ var $custom_logo = 0; // Whether to use a custom logo for team.
+ var $lock_spec = null; // Cron specification for record locking.
+ var $workday_minutes = 480; // Number of work minutes in a regular day.
+ var $rights = 0; // A mask of user rights.
// Constructor.
- function ttUser($login, $id = null) {
+ function __construct($login, $id = null) {
if (!$login && !$id) {
// nothing to initialize
return;
$mdb2 = getConnection();
$sql = "SELECT u.id, u.login, u.name, u.team_id, u.role, u.client_id, u.email, t.name as team_name,
- t.address, t.currency, t.locktime, t.lang, t.decimal_mark, t.date_format, t.time_format, t.week_start,
- t.tracking_mode, t.record_type, t.plugins, t.lock_spec, t.custom_logo
+ t.currency, t.lang, t.decimal_mark, t.date_format, t.time_format, t.week_start,
+ t.tracking_mode, t.project_required, t.task_required, t.record_type, t.uncompleted_indicators,
+ t.bcc_email, t.plugins, t.config, t.lock_spec, t.workday_minutes, t.custom_logo
FROM tt_users u LEFT JOIN tt_teams t ON (u.team_id = t.id) WHERE ";
if ($id)
$sql .= "u.id = $id";
$this->time_format = $val['time_format'];
$this->week_start = $val['week_start'];
$this->tracking_mode = $val['tracking_mode'];
+ $this->project_required = $val['project_required'];
+ $this->task_required = $val['task_required'];
$this->record_type = $val['record_type'];
+ $this->uncompleted_indicators = $val['uncompleted_indicators'];
+ $this->bcc_email = $val['bcc_email'];
$this->team = $val['team_name'];
- $this->address = $val['address'];
$this->currency = $val['currency'];
$this->plugins = $val['plugins'];
$this->lock_spec = $val['lock_spec'];
+ $this->workday_minutes = $val['workday_minutes'];
$this->custom_logo = $val['custom_logo'];
- $this->lock_interval = $val['locktime'];
+
+ // Set user config options.
+ $this->config = $val['config'];
+ $this->show_holidays = in_array('show_holidays', explode(',', $this->config));
// Set "on behalf" id and name.
if (isset($_SESSION['behalf_id'])) {
function isDateLocked($date)
{
if ($this->isPluginEnabled('lk') && $this->lock_spec) {
- // This is legacy code...
- /*
- // Determine lock date. Entries earlier than lock date cannot be created or modified.
- $lockdate = 0;
- if ($this->lock_interval > 0) {
- $lockdate = new DateAndTime();
- $lockdate->decDay($this->lock_interval);
- }
- if($lockdate && $date->before($lockdate))
- return true;
- */
-
- // New code with cron specification.
-
// Override for managers.
if ($this->canManageTeam()) return false;
require_once(LIBRARY_DIR.'/tdcron/class.tdcron.entry.php');
// Calculate the last occurrence of a lock.
- $last = tdCron::getLastOccurrence($this->lock_spec, mktime());
+ $last = tdCron::getLastOccurrence($this->lock_spec, time());
$lockdate = new DateAndTime(DB_DATEFORMAT, strftime('%Y-%m-%d', $last));
if ($date->before($lockdate)) {
return true;
projects / timetracker.git / blobdiff