X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=WEB-INF%2Flib%2FttUser.class.php;h=20efe2595fa2bb767911f0304b19396b4d235799;hb=14304210865aab4372e8e726f64d830c0a077de5;hp=a6731a4eea063ec104d7d416f1d44b19c8f7e6d2;hpb=b4912256781dcc0797dbe7f12bd9dec6718641db;p=timetracker.git diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php index a6731a4e..20efe259 100644 --- a/WEB-INF/lib/ttUser.class.php +++ b/WEB-INF/lib/ttUser.class.php @@ -27,33 +27,37 @@ // +----------------------------------------------------------------------+ 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 $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 $team = null; // Team name. + var $custom_logo = 0; // Whether to use a custom logo for team. + var $address = null; // Address for invoices. + 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. - function ttUser($login, $id = null) { + function __construct($login, $id = null) { if (!$login && !$id) { // nothing to initialize return; @@ -62,8 +66,9 @@ class ttUser { $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.address, 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.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"; @@ -91,14 +96,18 @@ class ttUser { $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_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'])) { @@ -180,24 +189,14 @@ class ttUser { 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; - */ + // Override for managers. + if ($this->canManageTeam()) return false; - // New code with cron specification. 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()); + $last = tdCron::getLastOccurrence($this->lock_spec, time()); $lockdate = new DateAndTime(DB_DATEFORMAT, strftime('%Y-%m-%d', $last)); if ($date->before($lockdate)) { return true;