X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=WEB-INF%2Flib%2FttUser.class.php;h=1566a485723976577625d1305018fc270a90b301;hb=ee49ee74b2a7d3c6daaa2d4bc6397b0c89e3099b;hp=c9dee41c3a026a9f5fd2542fad2e25e0e31ed859;hpb=15d237dd7e5ce541a9973a69c9dfeaa95dfd88e6;p=timetracker.git

diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index c9dee41c..1566a485 100644
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -48,8 +48,8 @@ class ttUser {
   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.
@@ -62,8 +62,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.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.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";
@@ -97,8 +97,8 @@ class ttUser {
       $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,20 +180,6 @@ 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;
-      */
-
-      // New code with cron specification.
-
       // Override for managers.
       if ($this->canManageTeam()) return false;