Integrated paid status in emailed reports.

[timetracker.git] / WEB-INF / lib / ttUser.class.php

diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index 0d64826..565e47a 100644 (file)
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -42,19 +42,21 @@ class ttUser {
   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_entries = 0; // Uncompleted entries (show nowhere or on users page).
+  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;
@@ -63,8 +65,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.lang, t.decimal_mark, t.date_format, t.time_format, t.week_start,
-      t.tracking_mode, t.record_type, t.uncompleted_entries, t.plugins, t.lock_spec, t.workday_hours, 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.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";
@@ -92,10 +95,12 @@ 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_entries = $val['uncompleted_entries'];
+      $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'];
@@ -189,7 +194,7 @@ class ttUser {
       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;