X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=WEB-INF%2Flib%2FttWeekViewHelper.class.php;h=782f309b477304b44e13c3fb1c8ae552889a9d2a;hb=817c14c6c2098d85ef912fb95898c857bf533b4f;hp=53065d380b555aadba759d0ac54bb4d866c4cd30;hpb=3c5f822f90846e9a65866c9e33b7e1ff81b46b1f;p=timetracker.git

diff --git a/WEB-INF/lib/ttWeekViewHelper.class.php b/WEB-INF/lib/ttWeekViewHelper.class.php
index 53065d38..782f309b 100644
--- a/WEB-INF/lib/ttWeekViewHelper.class.php
+++ b/WEB-INF/lib/ttWeekViewHelper.class.php
@@ -45,7 +45,7 @@ class ttWeekViewHelper {
 
     $custom_field_1 = null;
     if ($user->isPluginEnabled('cf')) {
-      $custom_fields = new CustomFields($user->group_id);
+      $custom_fields = new CustomFields();
       $cf_1_type = $custom_fields->fields[0]['type'];
       if ($cf_1_type == CustomFields::TYPE_TEXT) {
         $custom_field_1 = ', cfl.value as cf_1_value';
@@ -236,7 +236,7 @@ class ttWeekViewHelper {
     unset($objDate);
 
     // Obtain past week(s) records.
-    $records = ttWeekViewHelper::getRecordsForInterval($user->getActiveUser(), $pastWeekStartDate, $pastWeekEndDate);
+    $records = ttWeekViewHelper::getRecordsForInterval($user->getUser(), $pastWeekStartDate, $pastWeekEndDate);
     // Handle potential situation of no records by re-trying for up to 4 more previous weeks (after a long vacation, etc.).
     if (!$records) {
       for ($i = 0; $i < 4; $i++) {
@@ -247,7 +247,7 @@ class ttWeekViewHelper {
         $pastWeekEndDate = $objDate->toString(DB_DATEFORMAT);
         unset($objDate);
 
-        $records = ttWeekViewHelper::getRecordsForInterval($user->getActiveUser(), $pastWeekStartDate, $pastWeekEndDate);
+        $records = ttWeekViewHelper::getRecordsForInterval($user->getUser(), $pastWeekStartDate, $pastWeekEndDate);
         // Break out of the loop if we found something.
         if ($records) break;
       }
@@ -492,8 +492,8 @@ class ttWeekViewHelper {
 
     // Prepare an array of fields for regular insert function.
     $fields4insert = array();
-    $fields4insert['user_id'] = $user->getActiveUser();
-    $fields4insert['group_id'] = $user->getActiveGroup();
+    $fields4insert['user_id'] = $user->getUser();
+    $fields4insert['group_id'] = $user->getGroup();
     $fields4insert['org_id'] = $user->org_id;
     $fields4insert['date'] = $entry_date;
     $fields4insert['duration'] = $fields['duration'];
@@ -532,7 +532,7 @@ class ttWeekViewHelper {
     $mdb2 = getConnection();
     $duration = $fields['duration'];
     $tt_log_id = $fields['tt_log_id'];
-    $user_id = $user->getActiveUser();
+    $user_id = $user->getUser();
     $sql = "update tt_log set duration = '$duration' where id = $tt_log_id and user_id = $user_id";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error'))
@@ -598,7 +598,7 @@ class ttWeekViewHelper {
     $mdb2 = getConnection();
     $tt_log_id = $fields['tt_log_id'];
     $comment = $fields['comment'];
-    $user_id = $user->getActiveUser();
+    $user_id = $user->getUser();
     $sql = "update tt_log set comment = ".$mdb2->quote($fields['comment'])." where id = $tt_log_id and user_id = $user_id";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error'))