X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=WEB-INF%2Flib%2FttUser.class.php;h=6b6a44a23726875c124ad938ce5cdd7f35e87423;hb=ac5189157ef60820dd125400baee9f408a9ba2ea;hp=78fee50dd32b7d1169ade48626df0336c9c1e4dc;hpb=862774685f3a45de5b783627a66fc8b65839d7c7;p=timetracker.git

diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index 78fee50d..6b6a44a2 100644
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -27,32 +27,34 @@
 // +----------------------------------------------------------------------+
 
 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 $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 $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 $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;
@@ -61,7 +63,8 @@ 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.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.uncompleted_indicators, 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";
@@ -90,12 +93,14 @@ class ttUser {
       $this->week_start = $val['week_start'];
       $this->tracking_mode = $val['tracking_mode'];
       $this->record_type = $val['record_type'];
+      $this->uncompleted_indicators = $val['uncompleted_indicators'];
       $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'])) {
@@ -172,4 +177,24 @@ class ttUser {
     }
     return $result;
   }
+
+  // isDateLocked checks whether a specifc date is locked for modifications.
+  function isDateLocked($date)
+  {
+    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;
+  }
 }