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 $workday_hours = 8; // Number of work hours in a regular day.
var $rights = 0; // A mask of user rights.
// Constructor.
$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.custom_logo
+ t.address, t.currency, 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.workday_hours, 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->address = $val['address'];
$this->currency = $val['currency'];
$this->plugins = $val['plugins'];
+ $this->lock_spec = $val['lock_spec'];
+ $this->workday_hours = $val['workday_hours'];
$this->custom_logo = $val['custom_logo'];
- $this->lock_interval = $val['locktime'];
// Set "on behalf" id and name.
if (isset($_SESSION['behalf_id'])) {
// isDateLocked checks whether a specifc date is locked for modifications.
function isDateLocked($date)
{
- if ($this->isPluginEnabled('lk')) {
- // 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))
+ if ($this->isPluginEnabled('lk') && $this->lock_spec) {
+ // Override for managers.
+ if ($this->canManageTeam()) return false;
+
+ require_once(LIBRARY_DIR.'/tdcron/class.tdcron.php');
+ require_once(LIBRARY_DIR.'/tdcron/class.tdcron.entry.php');
+
+ // Calculate the last occurrence of a lock.
+ $last = tdCron::getLastOccurrence($this->lock_spec, mktime());
+ $lockdate = new DateAndTime(DB_DATEFORMAT, strftime('%Y-%m-%d', $last));
+ if ($date->before($lockdate)) {
return true;
+ }
}
return false;
}