Excluded clients from getActiveUsers call.

[timetracker.git] / time.php

diff --git a/time.php b/time.php
index ce622b2..0666531 100644 (file)
--- a/time.php
+++ b/time.php
@@ -30,7 +30,6 @@ require_once('initialize.php');
 import('form.Form');
 import('ttUserHelper');
 import('ttGroupHelper');
-import('ttTeamHelper');
 import('ttClientHelper');
 import('ttTimeHelper');
 import('DateAndTime');
@@ -89,7 +88,7 @@ $_SESSION['date'] = $cl_date;
 // Use custom fields plugin if it is enabled.
 if ($user->isPluginEnabled('cf')) {
   require_once('plugins/CustomFields.class.php');
-  $custom_fields = new CustomFields($group_id);
+  $custom_fields = new CustomFields();
   $smarty->assign('custom_fields', $custom_fields);
 }
 
@@ -170,7 +169,7 @@ if ($user->can('track_time')) {
 
 // Dropdown for clients in MODE_TIME. Use all active clients.
 if (MODE_TIME == $user->getTrackingMode() && $user->isPluginEnabled('cl')) {
-  $active_clients = ttTeamHelper::getActiveClients($group_id, true);
+  $active_clients = ttGroupHelper::getActiveClients(true);
   $form->addInput(array('type'=>'combobox',
     'onchange'=>'fillProjectDropdown(this.value);',
     'name'=>'client',
@@ -196,7 +195,7 @@ if (MODE_PROJECTS == $user->getTrackingMode() || MODE_PROJECTS_AND_TASKS == $use
 
   // Dropdown for clients if the clients plugin is enabled.
   if ($user->isPluginEnabled('cl')) {
-    $active_clients = ttTeamHelper::getActiveClients($group_id, true);
+    $active_clients = ttGroupHelper::getActiveClients(true);
     // We need an array of assigned project ids to do some trimming.
     foreach($project_list as $project)
       $projects_assigned_to_user[] = $project['id'];
@@ -224,7 +223,7 @@ if (MODE_PROJECTS == $user->getTrackingMode() || MODE_PROJECTS_AND_TASKS == $use
 }
 
 if (MODE_PROJECTS_AND_TASKS == $user->getTrackingMode()) {
-  $task_list = ttTeamHelper::getActiveTasks($group_id);
+  $task_list = ttGroupHelper::getActiveTasks();
   $form->addInput(array('type'=>'combobox',
     'name'=>'task',
     'style'=>'width: 250px;',