Starting refactoring ttFavReportHelper class for subgroups.

[timetracker.git] / WEB-INF / lib / ttFavReportHelper.class.php

diff --git a/WEB-INF/lib/ttFavReportHelper.class.php b/WEB-INF/lib/ttFavReportHelper.class.php
index f1943f71f8a7fdb913f7c8b368c531b17645dddb..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()) {
@@ -107,13 +113,8 @@ class ttFavReportHelper {
     if (is_a($affected, 'PEAR_Error'))
       return false;
 
-    $sql = "select last_insert_id() as last_id";
-    $res = $mdb2->query($sql);
-    if (is_a($res, 'PEAR_Error'))
-      return false;
-
-    $val = $res->fetchRow();
-    return $val['last_id'];
+    $last_id = $mdb2->lastInsertID('tt_fav_reports', 'id');
+    return $last_id;
   }
 
   // updateReport - updates report options in the database.