Starting refactoring ttFavReportHelper class for subgroups.

diff --git a/WEB-INF/lib/ttFavReportHelper.class.php b/WEB-INF/lib/ttFavReportHelper.class.php
index 36600e2194685d7a501eb5843e1b5d50aecd9279..3625c9de038c50b15abcc08cd6dee1f01b48bf9f 100644 (file)
--- a/WEB-INF/lib/ttFavReportHelper.class.php
+++ b/WEB-INF/lib/ttFavReportHelper.class.php
@@ -32,11 +32,17 @@ import('ttTeamHelper');
 class ttFavReportHelper {
 
   // getReports - returns an array of favorite reports for user.
-  static function getReports($user_id) {
+  static function getReports() {
+    global $user;
     $mdb2 = getConnection();
 
+    $user_id = $user->getUser();
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
     $result = array();
-    $sql = "select * from tt_fav_reports where user_id = $user_id and status = 1";
+    $sql = "select * from tt_fav_reports".
+      " where user_id = $user_id and 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()) {

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 9c086022f60c7d53d12fcba551bb12403f50e99e..8e93961ac6113dba23b7b029bd2d9b3e1c4c2537 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.4611 | 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.4612 | 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/notification_add.php b/notification_add.php
index f1221117a7e82fddcc924384efde8e3d1ed6b506..e7f541bb94248ae01c3b46262ac911afe06cad4b 100644 (file)
--- a/notification_add.php
+++ b/notification_add.php
@@ -57,7 +57,7 @@ if ($request->isPost()) {
 }
 // End of access checks.
 
-$fav_reports = ttFavReportHelper::getReports($user->getUser());
+$fav_reports = ttFavReportHelper::getReports();
 
 if ($request->isPost()) {
   $cl_cron_spec = trim($request->getParameter('cron_spec'));

diff --git a/notification_edit.php b/notification_edit.php
index de09f75ea2237197524f321e74a6e0827e96c995..5755e95cc2e87029bfa3b14d9aa70f9c3da7b5fc 100644 (file)
--- a/notification_edit.php
+++ b/notification_edit.php
@@ -63,7 +63,7 @@ if ($request->isPost()) {
 }
 // End of access checks.
 
-$fav_reports = ttFavReportHelper::getReports($user->getUser());
+$fav_reports = ttFavReportHelper::getReports();
 
 if ($request->isPost()) {
   $cl_cron_spec = trim($request->getParameter('cron_spec'));

diff --git a/reports.php b/reports.php
index 8310f5ddc608071a64636d6915808f14b3c27f48..e617285c9e5a156285cbcfe4e30cbfbe83e75ab0 100644 (file)
--- a/reports.php
+++ b/reports.php
@@ -53,7 +53,7 @@ if ($user->isPluginEnabled('cf')) {
 $form = new Form('reportForm');
 
 // Get saved favorite reports for user.
-$report_list = ttFavReportHelper::getReports($user->id);
+$report_list = ttFavReportHelper::getReports();
 $form->addInput(array('type'=>'combobox',
   'name'=>'favorite_report',
   'onchange'=>'document.reportForm.fav_report_changed.value=1;document.reportForm.submit();',