Improved clients.php to support subgroups.

diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index 0db272ff671d2d5126492bae4524043c7697920d..73393c0ac943bd8305c7f36d86092c6d7ff807f8 100644 (file)
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -230,11 +230,14 @@ class ttUser {
     $result = array();
     $mdb2 = getConnection();
 
     $result = array();
     $mdb2 = getConnection();
 

-    $group_id = $this->behalf_group_id ? $this->behalf_group_id : $this->group_id;
+    $group_id = $this->getGroup();
+    $org_id = $this->org_id;
+    $user_id = $this->getUser();
+

     // Do a query with inner join to get assigned projects.
     // Do a query with inner join to get assigned projects.

-    $sql = "select p.id, p.name, p.description, p.tasks, upb.rate from tt_projects p
-      inner join tt_user_project_binds upb on (upb.user_id = ".$this->getUser()." and upb.project_id = p.id and upb.status = 1)
-      where p.group_id = $group_id and p.status = 1 order by p.name";
+    $sql = "select p.id, p.name, p.description, p.tasks, upb.rate from tt_projects p".
+      " inner join tt_user_project_binds upb on (upb.user_id = $user_id and upb.project_id = p.id and upb.status = 1)".
+      " where p.group_id = $group_id and p.org_id = $org_id and p.status = 1 order by p.name";

     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
       while ($val = $res->fetchRow()) {
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
       while ($val = $res->fetchRow()) {


@@ -288,9 +291,12 @@ class ttUser {
 
     $mdb2 = getConnection();
 
 
     $mdb2 = getConnection();
 

+    $group_id = $this->getGroup();
+    $org_id = $this->org_id;
+

     // Get active clients for group.
     $clients = array();
     // Get active clients for group.
     $clients = array();

-    $sql = "select id, name, address, projects from tt_clients where group_id = $this->group_id and status = 1";
+    $sql = "select id, name, address, projects from tt_clients where group_id = $group_id and org_id = $org_id and status = 1";

     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
       while ($val = $res->fetchRow()) {
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
       while ($val = $res->fetchRow()) {

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 7c66412a100938dd2acc5fec39a211a8cef61d5c..111e83dd0707cfa7b00334d1176bf829bfa4462b 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>
       <br>
       <table cellspacing="0" cellpadding="4" width="100%" border="0">
         <tr>

-          <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> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.18.29.4562 | 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>
             <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>