X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=WEB-INF%2Flib%2FttUser.class.php;h=62c786ce5832c52ac626cce582751bced1c7c93b;hb=f22a586b11af9c617fdc4241d3ffa0344d4d6a50;hp=a40a5fda1eedc4a8ef41e9ba17ae16333460dde4;hpb=040c6516659e15f360159859b783e3722e86f370;p=timetracker.git

diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index a40a5fda..62c786ce 100644
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -55,7 +55,6 @@ class ttUser {
   var $date_format = null;      // Date format.
   var $time_format = null;      // Time format.
   var $week_start = 0;          // Week start day.
-  var $show_holidays = 0;       // Whether to show holidays in calendar.
   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.
@@ -148,7 +147,6 @@ class ttUser {
       $this->configHelper = new ttConfigHelper($val['config']);
 
       // Set user config options.
-      $this->show_holidays = $this->configHelper->getDefinedValue('show_holidays');
       $this->punch_mode = $this->configHelper->getDefinedValue('punch_mode');
       $this->allow_overlap = $this->configHelper->getDefinedValue('allow_overlap');
       $this->future_entries = $this->configHelper->getDefinedValue('future_entries');
@@ -250,6 +248,11 @@ class ttUser {
     return ($this->behalfGroup ? $this->behalfGroup->configHelper->getConfig() : $this->configHelper->getConfig());
   }
 
+  // getConfigHelper returns ttConfigHelper instance for active group.
+  function getConfigHelper() {
+    return ($this->behalfGroup ? $this->behalfGroup->configHelper : $this->configHelper);
+  }
+
   // getConfigOption returns true if an option is defined for group.
   // This helps us keeping a set of user attributes smaller.
   // We determine whether the option is set only on pages that need to know.