Merged some functions to help keeping things compact.

diff --git a/WEB-INF/lib/ttGroupHelper.class.php b/WEB-INF/lib/ttGroupHelper.class.php
index 8419a1a38ba9eb6886f1798b500c7576be0eede6..4bc71648af36e4e5794eb28b383772c5504b7386 100644 (file)
--- a/WEB-INF/lib/ttGroupHelper.class.php
+++ b/WEB-INF/lib/ttGroupHelper.class.php
@@ -327,7 +327,7 @@ class ttGroupHelper {
   }
 
   // getActiveProjects - returns an array of active projects for a group.
-  static function getActiveProjects()
+  static function getActiveProjects($includeFiles = false)
   {
     global $user;
     $mdb2 = getConnection();
@@ -335,33 +335,14 @@ class ttGroupHelper {
     $group_id = $user->getGroup();
     $org_id = $user->org_id;
 
-    $sql = "select id, name, description, tasks from tt_projects".
-      " where group_id = $group_id and org_id = $org_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;
-      }
+    if ($includeFiles) {
+      $filePart = ', if(Sub1.entity_id is null, 0, 1) as has_files';
+      $fileJoin =  " left join (select distinct entity_id from tt_files".
+      " where entity_type = 'project' and group_id = $group_id and org_id = $org_id and status = 1) Sub1".
+      " on (p.id = Sub1.entity_id)";
     }
-    return $result;
-  }
-
-  // getActiveProjectsWithFiles - returns an array of active projects for a group
-  // with information whether they have attached files (has_files property).
-  // A separate fiunction from getActiveProjects because sql here is more complex.
-  static function getActiveProjectsWithFiles()
-  {
-    global $user;
-    $mdb2 = getConnection();
 
-    $group_id = $user->getGroup();
-    $org_id = $user->org_id;
-
-    $sql = "select p.id, p.name, p.description, if(Sub1.entity_id is null, 0, 1) as has_files from tt_projects p".
-      " left join (select distinct entity_id from tt_files".
-      " where entity_type = 'project' and group_id = $group_id and org_id = $org_id and status = 1) Sub1".
-      " on (p.id = Sub1.entity_id)".
+    $sql = "select p.id, p.name, p.description, p.tasks $filePart from tt_projects p $fileJoin".
       " where p.group_id = $group_id and p.org_id = $org_id and p.status = 1 order by upper(p.name)";
     $res = $mdb2->query($sql);
     $result = array();
@@ -374,7 +355,7 @@ class ttGroupHelper {
   }
 
   // getInactiveProjects - returns an array of inactive projects for a group.
-  static function getInactiveProjects()
+  static function getInactiveProjects($includeFiles = false)
   {
     global $user;
     $mdb2 = getConnection();
@@ -382,34 +363,15 @@ class ttGroupHelper {
     $group_id = $user->getGroup();
     $org_id = $user->org_id;
 
-    $sql = "select id, name, description, tasks from tt_projects".
-      "  where group_id = $group_id and org_id = $org_id and status = 0 order by upper(name)";
-    $res = $mdb2->query($sql);
-    $result = array();
-    if (!is_a($res, 'PEAR_Error')) {
-      while ($val = $res->fetchRow()) {
-        $result[] = $val;
-      }
+    if ($includeFiles) {
+      $filePart = ', if(Sub1.entity_id is null, 0, 1) as has_files';
+      $fileJoin =  " left join (select distinct entity_id from tt_files".
+      " where entity_type = 'project' and group_id = $group_id and org_id = $org_id and status = 1) Sub1".
+      " on (p.id = Sub1.entity_id)";
     }
-    return $result;
-  }
 
-  // getInactiveProjectsWithFiles - returns an array of inactive projects for a group
-  // with information whether they have attached files (has_files property).
-  // A separate fiunction from getInactiveProjects because sql here is more complex.
-  static function getInactiveProjectsWithFiles()
-  {
-    global $user;
-    $mdb2 = getConnection();
-
-    $group_id = $user->getGroup();
-    $org_id = $user->org_id;
-
-    $sql = "select p.id, p.name, if(Sub1.entity_id is null, 0, 1) as has_files from tt_projects p".
-      " left join (select distinct entity_id from tt_files".
-      " where entity_type = 'project' and group_id = $group_id and org_id = $org_id and status = 1) Sub1".
-      " on (p.id = Sub1.entity_id)".
-      " where p.group_id = $group_id and p.org_id = $org_id and p.status = 0 order by upper(p.name)";
+    $sql = "select p.id, p.name, p.description, p.tasks $filePart from tt_projects p $fileJoin".
+      "  where p.group_id = $group_id and p.org_id = $org_id and p.status = 0 order by upper(p.name)";
     $res = $mdb2->query($sql);
     $result = array();
     if (!is_a($res, 'PEAR_Error')) {

diff --git a/WEB-INF/lib/ttTimesheetHelper.class.php b/WEB-INF/lib/ttTimesheetHelper.class.php
index 0afefa8048fe2205fe406d539032aa043ad8f2ef..17119edace1c8eb78ffaca461bc0c4a060d2227d 100644 (file)
--- a/WEB-INF/lib/ttTimesheetHelper.class.php
+++ b/WEB-INF/lib/ttTimesheetHelper.class.php
@@ -115,8 +115,7 @@ class ttTimesheetHelper {
     $group_id = $user->getGroup();
     $org_id = $user->org_id;
 
-    $includeFiles = $user->isPluginEnabled('at');
-    if ($includeFiles) {
+    if ($user->isPluginEnabled('at')) {
       $filePart = ', if(Sub1.entity_id is null, 0, 1) as has_files';
       $fileJoin =  " left join (select distinct entity_id from tt_files".
       " where entity_type = 'timesheet' and group_id = $group_id and org_id = $org_id and status = 1) Sub1".
@@ -149,8 +148,7 @@ class ttTimesheetHelper {
     $group_id = $user->getGroup();
     $org_id = $user->org_id;
 
-    $includeFiles = $user->isPluginEnabled('at');
-    if ($includeFiles) {
+    if ($user->isPluginEnabled('at')) {
       $filePart = ', if(Sub1.entity_id is null, 0, 1) as has_files';
       $fileJoin =  " left join (select distinct entity_id from tt_files".
       " where entity_type = 'timesheet' and group_id = $group_id and org_id = $org_id and status = 1) Sub1".

diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index 4a2320b40595d5fe389b26d69d01db1fe6f5d71d..33a32dc2ae20148a52062481bf6459d8fa34805f 100644 (file)
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -264,7 +264,7 @@ class ttUser {
   }
 
   // getAssignedProjects - returns an array of assigned projects.
-  function getAssignedProjects()
+  function getAssignedProjects($includeFiles = false)
   {
     $result = array();
     $mdb2 = getConnection();
@@ -273,8 +273,15 @@ class ttUser {
     $group_id = $this->getGroup();
     $org_id = $this->org_id;
 
+    if ($includeFiles) {
+      $filePart = ', if(Sub1.entity_id is null, 0, 1) as has_files';
+      $fileJoin =  " left join (select distinct entity_id from tt_files".
+      " where entity_type = 'project' and group_id = $group_id and org_id = $org_id and status = 1) Sub1".
+      " on (p.id = Sub1.entity_id)";
+    }
+
     // 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".
+    $sql = "select p.id, p.name, p.description, p.tasks, upb.rate $filePart from tt_projects p $fileJoin".
       " 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);

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index a1159b3c96ff6f13a356ed1ed28c7b9d34b9290e..a99f05ab5f35e3c6d655c4e8b10d27c29069bb49 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.65.4952 | 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.65.4953 | 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/WEB-INF/templates/projects.tpl b/WEB-INF/templates/projects.tpl
index e21a8f223854c91a38650eca4e0119e7fa91b952..81ef96b89f2b0efe5a9c488146437710ad8d317a 100644 (file)
--- a/WEB-INF/templates/projects.tpl
+++ b/WEB-INF/templates/projects.tpl
@@ -97,7 +97,7 @@
         <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
           <td>{$project.name|escape}</td>
           <td>{$project.description|escape}</td>
-      {if $show_files}
+      {if $show_files && $project.has_files}
           <td><a href="project_files.php?id={$project.id}"><img class="table_icon" alt="{$i18n.label.files}" src="images/icon_files.png"></a></td>
       {/if}
         </tr>

diff --git a/projects.php b/projects.php
index 6088af495ee3d1aaa58e575d62febc2d5bd11cc2..1b137895eae380c549fff0547292e5213ad2c6bc 100644 (file)
--- a/projects.php
+++ b/projects.php
@@ -43,10 +43,10 @@ if (MODE_PROJECTS != $user->getTrackingMode() && MODE_PROJECTS_AND_TASKS != $use
 $showFiles = $user->isPluginEnabled('at');
 
 if($user->can('manage_projects')) {
-  $active_projects = $showFiles ? ttGroupHelper::getActiveProjectsWithFiles() : ttGroupHelper::getActiveProjects();
-  $inactive_projects = $showFiles ? ttGroupHelper::getInactiveProjectsWithFiles() : ttGroupHelper::getInactiveProjects();
+  $active_projects = ttGroupHelper::getActiveProjects($showFiles);
+  $inactive_projects = ttGroupHelper::getInactiveProjects($showFiles);
 } else
-  $active_projects = $user->getAssignedProjects();
+  $active_projects = $user->getAssignedProjects($showFiles);
 
 $smarty->assign('active_projects', $active_projects);
 $smarty->assign('inactive_projects', $inactive_projects);