A bit more refactoring.

diff --git a/WEB-INF/lib/ttExportHelper.class.php b/WEB-INF/lib/ttExportHelper.class.php
index 310af91374cb867514a484bc409455f5181363a5..7072f2b732c1e8a3b9f15b1eecd333863627b494 100644 (file)
--- a/WEB-INF/lib/ttExportHelper.class.php
+++ b/WEB-INF/lib/ttExportHelper.class.php
@@ -48,6 +48,7 @@ class ttExportHelper {
   // createDataFile creates a file with all data for a given group.
   function createDataFile($compress = false) {
     global $user;
   // createDataFile creates a file with all data for a given group.
   function createDataFile($compress = false) {
     global $user;

+    $group_id = $user->getActiveGroup();

 
     // Create a temporary file.
     $dirName = dirname(TEMPLATE_DIR . '_c/.');
 
     // Create a temporary file.
     $dirName = dirname(TEMPLATE_DIR . '_c/.');


@@ -85,17 +86,17 @@ class ttExportHelper {
       $this->userMap[$user_item['id']] = $key + 1;
 
     // Prepare project map.
       $this->userMap[$user_item['id']] = $key + 1;
 
     // Prepare project map.

-    $projects = ttTeamHelper::getAllProjects($user->group_id, true);
+    $projects = ttTeamHelper::getAllProjects($group_id, true);

     foreach ($projects as $key=>$project_item)
       $this->projectMap[$project_item['id']] = $key + 1;
 
     // Prepare task map.
     foreach ($projects as $key=>$project_item)
       $this->projectMap[$project_item['id']] = $key + 1;
 
     // Prepare task map.

-    $tasks = ttTeamHelper::getAllTasks($user->group_id, true);
+    $tasks = ttTeamHelper::getAllTasks($group_id, true);

     foreach ($tasks as $key=>$task_item)
       $this->taskMap[$task_item['id']] = $key + 1;
 
     // Prepare client map.
     foreach ($tasks as $key=>$task_item)
       $this->taskMap[$task_item['id']] = $key + 1;
 
     // Prepare client map.

-    $clients = ttTeamHelper::getAllClients($user->group_id, true);
+    $clients = ttTeamHelper::getAllClients($group_id, true);

     foreach ($clients as $key=>$client_item)
       $this->clientMap[$client_item['id']] = $key + 1;
 
     foreach ($clients as $key=>$client_item)
       $this->clientMap[$client_item['id']] = $key + 1;
 


@@ -105,12 +106,12 @@ class ttExportHelper {
       $this->invoiceMap[$invoice_item['id']] = $key + 1;
 
     // Prepare custom fields map.
       $this->invoiceMap[$invoice_item['id']] = $key + 1;
 
     // Prepare custom fields map.

-    $custom_fields = ttTeamHelper::getAllCustomFields($user->group_id);
+    $custom_fields = ttTeamHelper::getAllCustomFields($group_id);

     foreach ($custom_fields as $key=>$custom_field)
       $this->customFieldMap[$custom_field['id']] = $key + 1;
 
     // Prepare custom field options map.
     foreach ($custom_fields as $key=>$custom_field)
       $this->customFieldMap[$custom_field['id']] = $key + 1;
 
     // Prepare custom field options map.

-    $custom_field_options = ttTeamHelper::getAllCustomFieldOptions($user->group_id);
+    $custom_field_options = ttTeamHelper::getAllCustomFieldOptions($group_id);

     foreach ($custom_field_options as $key=>$option)
       $this->customFieldOptionMap[$option['id']] = $key + 1;
 
     foreach ($custom_field_options as $key=>$option)
       $this->customFieldOptionMap[$option['id']] = $key + 1;
 


@@ -167,7 +168,7 @@ class ttExportHelper {
 
     // Write user to project binds.
     fwrite($file, "<user_project_binds>\n");
 
     // Write user to project binds.
     fwrite($file, "<user_project_binds>\n");

-    $user_binds = ttTeamHelper::getUserToProjectBinds($user->group_id);
+    $user_binds = ttTeamHelper::getUserToProjectBinds($group_id);

     foreach ($user_binds as $bind) {
       $user_id = $this->userMap[$bind['user_id']];
       $project_id = $this->projectMap[$bind['project_id']];
     foreach ($user_binds as $bind) {
       $user_id = $this->userMap[$bind['user_id']];
       $project_id = $this->projectMap[$bind['project_id']];


@@ -225,7 +226,7 @@ class ttExportHelper {
     unset($custom_field_options);
 
     // Write monthly quotas.
     unset($custom_field_options);
 
     // Write monthly quotas.

-    $quotas = ttTeamHelper::getMonthlyQuotas($user->group_id);
+    $quotas = ttTeamHelper::getMonthlyQuotas($group_id);

     fwrite($file, "<monthly_quotas>\n");
     foreach ($quotas as $quota) {
       fwrite($file, "  <monthly_quota year=\"".$quota['year']."\" month=\"".$quota['month']."\" minutes=\"".$quota['minutes']."\"/>\n");
     fwrite($file, "<monthly_quotas>\n");
     foreach ($quotas as $quota) {
       fwrite($file, "  <monthly_quota year=\"".$quota['year']."\" month=\"".$quota['month']."\" minutes=\"".$quota['minutes']."\"/>\n");


@@ -249,7 +250,7 @@ class ttExportHelper {
     unset($records);
 
     // Write custom field log.
     unset($records);
 
     // Write custom field log.

-    $custom_field_log = ttTeamHelper::getCustomFieldLog($user->group_id);
+    $custom_field_log = ttTeamHelper::getCustomFieldLog($group_id);

     fwrite($file, "<custom_field_log>\n");
     foreach ($custom_field_log as $entry) {
       fwrite($file, "  <custom_field_log_entry log_id=\"".$this->logMap[$entry['log_id']]."\" field_id=\"".$this->customFieldMap[$entry['field_id']]."\" option_id=\"".$this->customFieldOptionMap[$entry['option_id']]."\" status=\"".$entry['status']."\">\n");
     fwrite($file, "<custom_field_log>\n");
     foreach ($custom_field_log as $entry) {
       fwrite($file, "  <custom_field_log_entry log_id=\"".$this->logMap[$entry['log_id']]."\" field_id=\"".$this->customFieldMap[$entry['field_id']]."\" option_id=\"".$this->customFieldOptionMap[$entry['option_id']]."\" status=\"".$entry['status']."\">\n");


@@ -260,7 +261,7 @@ class ttExportHelper {
     unset($custom_field_log);
 
     // Write expense items.
     unset($custom_field_log);
 
     // Write expense items.

-    $expense_items = ttTeamHelper::getExpenseItems($user->group_id);
+    $expense_items = ttTeamHelper::getExpenseItems($group_id);

     fwrite($file, "<expense_items>\n");
     foreach ($expense_items as $expense_item) {
       fwrite($file, "  <expense_item date=\"".$expense_item['date']."\" user_id=\"".$this->userMap[$expense_item['user_id']]."\" client_id=\"".$this->clientMap[$expense_item['client_id']]."\" project_id=\"".$this->projectMap[$expense_item['project_id']]."\" cost=\"".$expense_item['cost']."\" invoice_id=\"".$this->invoiceMap[$expense_item['invoice_id']]."\" paid=\"".$expense_item['paid']."\" status=\"".$expense_item['status']."\">\n");
     fwrite($file, "<expense_items>\n");
     foreach ($expense_items as $expense_item) {
       fwrite($file, "  <expense_item date=\"".$expense_item['date']."\" user_id=\"".$this->userMap[$expense_item['user_id']]."\" client_id=\"".$this->clientMap[$expense_item['client_id']]."\" project_id=\"".$this->projectMap[$expense_item['project_id']]."\" cost=\"".$expense_item['cost']."\" invoice_id=\"".$this->invoiceMap[$expense_item['invoice_id']]."\" paid=\"".$expense_item['paid']."\" status=\"".$expense_item['status']."\">\n");


@@ -272,7 +273,7 @@ class ttExportHelper {
 
     // Write fav reports.
     fwrite($file, "<fav_reports>\n");
 
     // Write fav reports.
     fwrite($file, "<fav_reports>\n");

-    $fav_reports = ttTeamHelper::getFavReports($user->group_id);
+    $fav_reports = ttTeamHelper::getFavReports($group_id);

     foreach ($fav_reports as $fav_report) {
       $user_list = '';
       if (strlen($fav_report['users']) > 0) {
     foreach ($fav_reports as $fav_report) {
       $user_list = '';
       if (strlen($fav_report['users']) > 0) {


@@ -387,7 +388,7 @@ class ttExportHelper {
     $mdb2 = getConnection();
 
     $result = array();
     $mdb2 = getConnection();
 
     $result = array();

-    $sql = "select * from tt_roles where group_id = $user->group_id";
+    $sql = "select * from tt_roles where group_id = ".$user->getActiveGroup();

     $res = $mdb2->query($sql);
     $result = array();
     if (!is_a($res, 'PEAR_Error')) {
     $res = $mdb2->query($sql);
     $result = array();
     if (!is_a($res, 'PEAR_Error')) {


@@ -404,7 +405,8 @@ class ttExportHelper {
     global $user;
     $mdb2 = getConnection();
 
     global $user;
     $mdb2 = getConnection();
 

-    $sql = "select u.*, r.rank from tt_users u left join tt_roles r on (u.role_id = r.id) where u.group_id = $user->group_id order by upper(u.name)"; // Note: deleted users are included.
+    $sql = "select u.*, r.rank from tt_users u left join tt_roles r on (u.role_id = r.id) where u.group_id = ".
+            $user->getActiveGroup()." order by upper(u.name)"; // Note: deleted users are included.

     $res = $mdb2->query($sql);
     $result = array();
     if (!is_a($res, 'PEAR_Error')) {
     $res = $mdb2->query($sql);
     $result = array();
     if (!is_a($res, 'PEAR_Error')) {

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index bbff9a4c5b5df79ce80efafdb1f8069c867067aa..53e4ad54b8dafd36c68e3cfcb13f4a2f68e279e6 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.08.4375 | 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.08.4376 | 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>