X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=WEB-INF%2Flib%2FttGroup.class.php;h=9c12e95b6cb0d65c7ea7d321042301351086bd78;hb=bbdb5228ab00dfeb9d91217ce0e990842ab6da80;hp=fe8c8a9834749b710d59fbf012db74f9e52faa6e;hpb=a106b7a2db73b3e1fdab428b218212f6f38d7623;p=timetracker.git

diff --git a/WEB-INF/lib/ttGroup.class.php b/WEB-INF/lib/ttGroup.class.php
index fe8c8a98..9c12e95b 100644
--- a/WEB-INF/lib/ttGroup.class.php
+++ b/WEB-INF/lib/ttGroup.class.php
@@ -58,14 +58,13 @@ class ttGroup {
   var $custom_logo = 0;         // Whether to use a custom logo for group.
   var $lock_spec = null;        // Cron specification for record locking.
   var $workday_minutes = 480;   // Number of work minutes in a regular day.
-  var $minutes_in_unit = 15;    // Number of minutes in unit for Work units plugin.
-  var $first_unit_threshold = 0;// Threshold for 1st unit for Work units plugin.
-  var $unit_totals_only = 0;    // Totals only option for the Work units plugin.
 
   var $active_users = 0;        // Count of active users in group.
                                 // We need a non-zero count to display some menus.
 
   // Constructor.
+  // Note: org_id is needed because we construct an object in ttUser constructor,
+  // when global $user object does not yet exist.
   function __construct($id, $org_id) {
     $mdb2 = getConnection();
 
@@ -101,8 +100,8 @@ class ttGroup {
       $this->currency = $val['currency'];
       $this->plugins = $val['plugins'];
       $this->lock_spec = $val['lock_spec'];
-      /*
       $this->workday_minutes = $val['workday_minutes'];
+      /*
       $this->custom_logo = $val['custom_logo'];
       */
       $this->config = $val['config'];
@@ -112,19 +111,10 @@ class ttGroup {
       $this->punch_mode = $config->getDefinedValue('punch_mode');
       $this->allow_overlap = $config->getDefinedValue('allow_overlap');
       $this->future_entries = $config->getDefinedValue('future_entries');
-      /*
-      if ($this->isPluginEnabled('wu')) {
-        $minutes_in_unit = $config->getIntValue('minutes_in_unit');
-        if ($minutes_in_unit) $this->minutes_in_unit = $minutes_in_unit;
-        $first_unit_threshold = $config->getIntValue('1st_unit_threshold');
-        if ($first_unit_threshold) $this->first_unit_threshold = $first_unit_threshold;
-        $this->unit_totals_only = $config->getDefinedValue('unit_totals_only');
-      }
-      */
     }
 
     // Determine active user count in a separate query.
-    // TODO: If performance becomes an issue, ivestigate combining 2 queries in one.
+    // TODO: If performance becomes an issue, investigate combining 2 queries in one.
     // At this time we only need to know if at least 1 active user exists.
     $sql = "select count(*) as user_count from tt_users".
       "  where group_id = $id and org_id = $org_id and status = 1";