More refactoring for subgroups.

diff --git a/WEB-INF/lib/ttTeamHelper.class.php b/WEB-INF/lib/ttTeamHelper.class.php
index 44f3d7a01beaf95c874bf3d5b9c7b4eab965d113..f82fc2630c0c48e0c10389c863ea9707cc846821 100644 (file)
--- a/WEB-INF/lib/ttTeamHelper.class.php
+++ b/WEB-INF/lib/ttTeamHelper.class.php
@@ -379,27 +379,6 @@ class ttTeamHelper {
     return $result;
   }
 
-  // The getActiveClients returns an array of active clients for a group.
-  static function getActiveClients($group_id, $all_fields = false)
-  {
-    $result = array();
-    $mdb2 = getConnection();
-
-    if ($all_fields)
-      $sql = "select * from tt_clients where group_id = $group_id and status = 1 order by upper(name)";
-    else
-      $sql = "select id, name from tt_clients where group_id = $group_id and status = 1 order by upper(name)";
-
-    $res = $mdb2->query($sql);
-    $result = array();
-    if (!is_a($res, 'PEAR_Error')) {
-      while ($val = $res->fetchRow()) {
-        $result[] = $val;
-      }
-    }
-    return $result;
-  }
-
   // The getAllClients obtains all clients in a group.
   static function getAllClients($group_id, $all_fields = false) {
     $mdb2 = getConnection();

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 501e850dc457b8c250fa9c74e690dcc0d4542d71..7c66412a100938dd2acc5fec39a211a8cef61d5c 100644 (file)
--- a/WEB-INF/templates/footer.tpl
+++ b/WEB-INF/templates/footer.tpl
@@ -12,7 +12,7 @@
       <br>
       <table cellspacing="0" cellpadding="4" width="100%" border="0">
         <tr>
-          <td align="center">&nbsp;Anuko Time Tracker 1.18.29.4560 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.18.29.4561 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
             <a href="https://www.anuko.com/lp/tt_4.htm" target="_blank">{$i18n.footer.credits}</a> |
             <a href="https://www.anuko.com/lp/tt_5.htm" target="_blank">{$i18n.footer.license}</a> |
             <a href="https://www.anuko.com/lp/tt_7.htm" target="_blank">{$i18n.footer.improve}</a>

diff --git a/mobile/expense_edit.php b/mobile/expense_edit.php
index d139530c9dacb93e40b50fa1a5aae910e8c60ffc..fa00b58632921058e2560b2df89a204091c7a917 100644 (file)
--- a/mobile/expense_edit.php
+++ b/mobile/expense_edit.php
@@ -29,6 +29,7 @@
 require_once('../initialize.php');
 import('form.Form');
 import('ttTeamHelper');
+import('ttGroupHelper');
 import('DateAndTime');
 import('ttExpenseHelper');
 
@@ -74,7 +75,7 @@ $form = new Form('expenseItemForm');
 
 // Dropdown for clients in MODE_TIME. Use all active clients.
 if (MODE_TIME == $user->tracking_mode && $user->isPluginEnabled('cl')) {
-  $active_clients = ttTeamHelper::getActiveClients($user->group_id, true);
+  $active_clients = ttGroupHelper::getActiveClients(true);
   $form->addInput(array('type'=>'combobox',
     'onchange'=>'fillProjectDropdown(this.value);',
     'name'=>'client',
@@ -99,7 +100,7 @@ if (MODE_PROJECTS == $user->tracking_mode || MODE_PROJECTS_AND_TASKS == $user->t
 
   // Dropdown for clients if the clients plugin is enabled.
   if ($user->isPluginEnabled('cl')) {
-    $active_clients = ttTeamHelper::getActiveClients($user->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'];

diff --git a/mobile/expenses.php b/mobile/expenses.php
index de1e67783009eb314bcedcd0cc1fced1da76aa2d..a39bf4a99827f725606ba94e447271d60433cb29 100644 (file)
--- a/mobile/expenses.php
+++ b/mobile/expenses.php
@@ -30,6 +30,7 @@ require_once('../initialize.php');
 import('form.Form');
 import('ttUserHelper');
 import('ttTeamHelper');
+import('ttGroupHelper');
 import('DateAndTime');
 import('ttExpenseHelper');
 
@@ -96,7 +97,7 @@ if ($user->can('track_expenses')) {
 
 // Dropdown for clients in MODE_TIME. Use all active clients.
 if (MODE_TIME == $user->tracking_mode && $user->isPluginEnabled('cl')) {
-    $active_clients = ttTeamHelper::getActiveClients($user->group_id, true);
+    $active_clients = ttGroupHelper::getActiveClients(true);
     $form->addInput(array('type'=>'combobox',
       'onchange'=>'fillProjectDropdown(this.value);',
       'name'=>'client',
@@ -122,7 +123,7 @@ if (MODE_PROJECTS == $user->tracking_mode || MODE_PROJECTS_AND_TASKS == $user->t
 
   // Dropdown for clients if the clients plugin is enabled.
   if ($user->isPluginEnabled('cl')) {
-    $active_clients = ttTeamHelper::getActiveClients($user->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'];

diff --git a/mobile/time.php b/mobile/time.php
index 2b8e01f05be393ce519fe0a38d6b191203418a02..c8ec97977fef7a4352aa30c252075f2f9f8865a2 100644 (file)
--- a/mobile/time.php
+++ b/mobile/time.php
@@ -30,6 +30,7 @@ require_once('../initialize.php');
 import('form.Form');
 import('ttUserHelper');
 import('ttTeamHelper');
+import('ttGroupHelper');
 import('ttClientHelper');
 import('ttTimeHelper');
 import('DateAndTime');
@@ -92,7 +93,7 @@ $form = new Form('timeRecordForm');
 
 // Dropdown for clients in MODE_TIME. Use all active clients.
 if (MODE_TIME == $user->tracking_mode && $user->isPluginEnabled('cl')) {
-    $active_clients = ttTeamHelper::getActiveClients($user->group_id, true);
+    $active_clients = ttGroupHelper::getActiveClients(true);
     $form->addInput(array('type'=>'combobox',
       'onchange'=>'fillProjectDropdown(this.value);',
       'name'=>'client',
@@ -118,7 +119,7 @@ if (MODE_PROJECTS == $user->tracking_mode || MODE_PROJECTS_AND_TASKS == $user->t
 
   // Dropdown for clients if the clients plugin is enabled.
   if ($user->isPluginEnabled('cl')) {
-    $active_clients = ttTeamHelper::getActiveClients($user->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'];

diff --git a/mobile/time_edit.php b/mobile/time_edit.php
index 925220430e7a844de2ba7b532da1c5612cc53dfe..cbe4c9359944c4c1d97ea8dfe6cbee3dcaeb1055 100644 (file)
--- a/mobile/time_edit.php
+++ b/mobile/time_edit.php
@@ -30,6 +30,7 @@ require_once('../initialize.php');
 import('form.Form');
 import('ttUserHelper');
 import('ttTeamHelper');
+import('ttGroupHelper');
 import('ttClientHelper');
 import('ttTimeHelper');
 import('DateAndTime');
@@ -109,7 +110,7 @@ $form = new Form('timeRecordForm');
 
 // Dropdown for clients in MODE_TIME. Use all active clients.
 if (MODE_TIME == $user->tracking_mode && $user->isPluginEnabled('cl')) {
-    $active_clients = ttTeamHelper::getActiveClients($user->group_id, true);
+    $active_clients = ttGroupHelper::getActiveClients(true);
     $form->addInput(array('type'=>'combobox',
       'onchange'=>'fillProjectDropdown(this.value);',
       'name'=>'client',
@@ -135,7 +136,7 @@ if (MODE_PROJECTS == $user->tracking_mode || MODE_PROJECTS_AND_TASKS == $user->t
 
   // Dropdown for clients if the clients plugin is enabled.
   if ($user->isPluginEnabled('cl')) {
-    $active_clients = ttTeamHelper::getActiveClients($user->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'];

diff --git a/mobile/timer.php b/mobile/timer.php
index ae5a96f59396700877fa8ee3fdb3212eaf7cfb81..bf92a89ef2988bcaec49ea43f688a3406fa22d6a 100644 (file)
--- a/mobile/timer.php
+++ b/mobile/timer.php
@@ -30,6 +30,7 @@ require_once('../initialize.php');
 import('form.Form');
 import('ttUserHelper');
 import('ttTeamHelper');
+import('ttGroupHelper');
 import('ttClientHelper');
 import('ttTimeHelper');
 import('DateAndTime');
@@ -88,7 +89,7 @@ $form = new Form('timeRecordForm');
 
 // Dropdown for clients in MODE_TIME. Use all active clients.
 if (MODE_TIME == $user->tracking_mode && $user->isPluginEnabled('cl')) {
-    $active_clients = ttTeamHelper::getActiveClients($user->group_id, true);
+    $active_clients = ttGroupHelper::getActiveClients(true);
     $form->addInput(array('type'=>'combobox',
       'onchange'=>'fillProjectDropdown(this.value);',
       'name'=>'client',
@@ -116,7 +117,7 @@ if (MODE_PROJECTS == $user->tracking_mode || MODE_PROJECTS_AND_TASKS == $user->t
 
   // Dropdown for clients if the clients plugin is enabled.
   if ($user->isPluginEnabled('cl')) {
-    $active_clients = ttTeamHelper::getActiveClients($user->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'];

diff --git a/mobile/user_add.php b/mobile/user_add.php
index 9d2b539e0d882dca4b8d19db815df2c5a06305cc..20c2b1ffb393e98ae002061ceaaffbd0b2af7fd0 100644 (file)
--- a/mobile/user_add.php
+++ b/mobile/user_add.php
@@ -29,6 +29,7 @@
 require_once('../initialize.php');
 import('form.Form');
 import('ttTeamHelper');
+import('ttGroupHelper');
 import('ttUserHelper');
 import('form.Table');
 import('form.TableColumn');
@@ -45,7 +46,7 @@ if (!ttAccessAllowed('manage_users')) {
 @include('../plugins/limit/user_add.php');
 
 if ($user->isPluginEnabled('cl'))
-  $clients = ttTeamHelper::getActiveClients($user->group_id);
+  $clients = ttGroupHelper::getActiveClients();
 
 $assigned_projects = array();
 if ($request->isPost()) {

diff --git a/mobile/user_edit.php b/mobile/user_edit.php
index c9b4af81c3b65d439a501022d8f2bed6d29523b4..81947dbdc6d1adda19eaf44ee23fac3f0827c791 100644 (file)
--- a/mobile/user_edit.php
+++ b/mobile/user_edit.php
@@ -30,6 +30,7 @@ require_once('../initialize.php');
 import('form.Form');
 import('ttProjectHelper');
 import('ttTeamHelper');
+import('ttGroupHelper');
 import('ttUserHelper');
 import('form.Table');
 import('form.TableColumn');
@@ -48,7 +49,7 @@ if (!$user_details) {
 // End of access checks.
 
 if ($user->isPluginEnabled('cl'))
-  $clients = ttTeamHelper::getActiveClients($user->group_id);
+  $clients = ttGroupHelper::getActiveClients();
 
 $projects = ttTeamHelper::getActiveProjects($user->group_id);
 $assigned_projects = array();

diff --git a/time.php b/time.php
index ce622b233fdb01cdded9285a6c3ad640fe867651..fb507fb5f81c2046a48224a48d8db4037169160e 100644 (file)
--- a/time.php
+++ b/time.php
@@ -170,7 +170,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 +196,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'];

diff --git a/time_edit.php b/time_edit.php
index 08a5f392e8da7432e6a90cfe150f02302b438d19..e6a8adb818dd9af4f5d283c5af4082293c5d2a61 100644 (file)
--- a/time_edit.php
+++ b/time_edit.php
@@ -30,6 +30,7 @@ require_once('initialize.php');
 import('form.Form');
 import('ttUserHelper');
 import('ttTeamHelper');
+import('ttGroupHelper');
 import('ttClientHelper');
 import('ttTimeHelper');
 import('DateAndTime');
@@ -112,7 +113,7 @@ $form = new Form('timeRecordForm');
 
 // Dropdown for clients in MODE_TIME. Use all active clients.
 if (MODE_TIME == $user->tracking_mode && $user->isPluginEnabled('cl')) {
-  $active_clients = ttTeamHelper::getActiveClients($user->group_id, true);
+  $active_clients = ttGroupHelper::getActiveClients(true);
   $form->addInput(array('type'=>'combobox',
     'onchange'=>'fillProjectDropdown(this.value);',
     'name'=>'client',
@@ -138,7 +139,7 @@ if (MODE_PROJECTS == $user->tracking_mode || MODE_PROJECTS_AND_TASKS == $user->t
 
   // Dropdown for clients if the clients plugin is enabled.
   if ($user->isPluginEnabled('cl')) {
-    $active_clients = ttTeamHelper::getActiveClients($user->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'];

diff --git a/user_add.php b/user_add.php
index 7fb6ea3c7507adaa09cd1efe0e0d4339b8396cb2..e948aa712629cd11946ef6774ead648255b292a3 100644 (file)
--- a/user_add.php
+++ b/user_add.php
@@ -29,6 +29,7 @@
 require_once('initialize.php');
 import('form.Form');
 import('ttTeamHelper');
+import('ttGroupHelper');
 import('ttUserHelper');
 import('form.Table');
 import('form.TableColumn');
@@ -46,7 +47,7 @@ if (!ttAccessAllowed('manage_users')) {
 @include('plugins/limit/user_add.php');
 
 if ($user->isPluginEnabled('cl'))
-  $clients = ttTeamHelper::getActiveClients($user->getGroup());
+  $clients = ttGroupHelper::getActiveClients();
 
 $assigned_projects = array();
 if ($request->isPost()) {

diff --git a/user_edit.php b/user_edit.php
index 8a4e421b16fa9c34c3d5757fe4c45668e657ff85..df3ada4f1d1d7c694d86805b1032b5ec6c3f0452 100644 (file)
--- a/user_edit.php
+++ b/user_edit.php
@@ -30,6 +30,7 @@ require_once('initialize.php');
 import('form.Form');
 import('ttProjectHelper');
 import('ttTeamHelper');
+import('ttGroupHelper');
 import('ttUserHelper');
 import('form.Table');
 import('form.TableColumn');
@@ -49,7 +50,7 @@ if (!$user_details) {
 // End of access checks.
 
 if ($user->isPluginEnabled('cl'))
-  $clients = ttTeamHelper::getActiveClients($user->getGroup());
+  $clients = ttGroupHelper::getActiveClients();
 
 $projects = ttTeamHelper::getActiveProjects($user->getGroup());
 $assigned_projects = array();

diff --git a/week.php b/week.php
index 927e8a776508636873ec1dc7d11bd6f1f6abb2f6..95dc31b127ffd48dcb742ae5e4f4dd383dcba4c1 100644 (file)
--- a/week.php
+++ b/week.php
@@ -33,6 +33,7 @@ import('form.Table');
 import('form.TextField');
 import('ttUserHelper');
 import('ttTeamHelper');
+import('ttGroupHelper');
 import('ttWeekViewHelper');
 import('ttClientHelper');
 import('ttTimeHelper');
@@ -244,7 +245,7 @@ $form->addInputElement($table);
 
 // Dropdown for clients in MODE_TIME. Use all active clients.
 if (MODE_TIME == $user->tracking_mode && $user->isPluginEnabled('cl')) {
-  $active_clients = ttTeamHelper::getActiveClients($user->group_id, true);
+  $active_clients = ttGroupHelper::getActiveClients(true);
   $form->addInput(array('type'=>'combobox',
     'onchange'=>'fillProjectDropdown(this.value);',
     'name'=>'client',
@@ -270,7 +271,7 @@ if (MODE_PROJECTS == $user->tracking_mode || MODE_PROJECTS_AND_TASKS == $user->t
 
   // Dropdown for clients if the clients plugin is enabled.
   if ($user->isPluginEnabled('cl')) {
-    $active_clients = ttTeamHelper::getActiveClients($user->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'];