X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/timetracker.git/blobdiff_plain/2cb68f81bd4dd4f4a83afc87bbc292df6b7d7039..101cdfe54c97350fc65b140f3f27c5bdd466844e:/WEB-INF/lib/ttReportHelper.class.php

diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index 223d8e4b..bd882559 100644
--- a/WEB-INF/lib/ttReportHelper.class.php
+++ b/WEB-INF/lib/ttReportHelper.class.php
@@ -291,6 +291,13 @@ class ttReportHelper {
     // Add paid status.
     if ($canViewReports && $bean->getAttribute('chpaid'))
       array_push($fields, 'l.paid as paid');
+    // Add IP address.
+    if ($canViewReports && $bean->getAttribute('chip')) {
+      array_push($fields, 'l.created as created');
+      array_push($fields, 'l.created_ip as created_ip');
+      array_push($fields, 'l.modified as modified');
+      array_push($fields, 'l.modified_ip as modified_ip');
+    }
 
     // Add invoice name if it is selected.
     if (($canViewReports || $isClient) && $bean->getAttribute('chinvoice'))
@@ -361,6 +368,14 @@ class ttReportHelper {
       // Add paid status.
       if ($canViewReports && $bean->getAttribute('chpaid'))
         array_push($fields, 'ei.paid as paid');
+      // Add IP address. NULL for now for expenses.
+      if ($canViewReports && $bean->getAttribute('chip')) {
+        array_push($fields, 'ei.created as created');
+        array_push($fields, 'ei.created_ip as created_ip');
+        array_push($fields, 'ei.modified as modified');
+        array_push($fields, 'ei.modified_ip as modified_ip');
+      }
+
       // Add invoice name if it is selected.
       if (($canViewReports || $isClient) && $bean->getAttribute('chinvoice'))
         array_push($fields, 'i.name as invoice');
@@ -1239,6 +1254,8 @@ class ttReportHelper {
         $body .= '<td style="'.$tableHeaderCentered.'" width="5%">'.$i18n->getKey('label.cost').'</td>';
       if ($bean->getAttribute('chpaid'))
         $body .= '<td style="'.$tableHeaderCentered.'" width="5%">'.$i18n->getKey('label.paid').'</td>';
+      if ($bean->getAttribute('chip'))
+        $body .= '<td style="'.$tableHeaderCentered.'" width="5%">'.$i18n->getKey('label.ip').'</td>';
       if ($bean->getAttribute('chinvoice'))
         $body .= '<td style="'.$tableHeader.'">'.$i18n->getKey('label.invoice').'</td>';
       $body .= '</tr>';
@@ -1281,6 +1298,7 @@ class ttReportHelper {
                 $body .= '</td>';
               }
               if ($bean->getAttribute('chpaid')) $body .= '<td></td>';
+              if ($bean->getAttribute('chip')) $body .= '<td></td>';
               if ($bean->getAttribute('chinvoice')) $body .= '<td></td>';
               $body .= '</tr>';
               $body .= '<tr><td>&nbsp;</td></tr>';
@@ -1318,6 +1336,11 @@ class ttReportHelper {
             $body .= $record['paid'] == 1 ? $i18n->getKey('label.yes') : $i18n->getKey('label.no');
             $body .= '</td>';
           }
+          if ($bean->getAttribute('chip')) {
+            $body .= '<td style="'.$cellRightAligned.'">';
+            $body .= $record['modified'] ? $record['modified_ip'].' '.$record['modified'] : $record['created_ip'].' '.$record['created'];
+            $body .= '</td>';
+          }
           if ($bean->getAttribute('chinvoice'))
             $body .= '<td style="'.$cellRightAligned.'">'.htmlspecialchars($record['invoice']).'</td>';
           $body .= '</tr>';
@@ -1348,6 +1371,7 @@ class ttReportHelper {
           $body .= '</td>';
         }
         if ($bean->getAttribute('chpaid')) $body .= '<td></td>';
+        if ($bean->getAttribute('chip')) $body .= '<td></td>';
         if ($bean->getAttribute('chinvoice')) $body .= '<td></td>';
         $body .= '</tr>';
       }
@@ -1371,6 +1395,7 @@ class ttReportHelper {
         $body .= '</td>';
       }
       if ($bean->getAttribute('chpaid')) $body .= '<td></td>';
+      if ($bean->getAttribute('chip')) $body .= '<td></td>';
       if ($bean->getAttribute('chinvoice')) $body .= '<td></td>';
       $body .= '</tr>';
 
@@ -1407,6 +1432,10 @@ class ttReportHelper {
     global $user;
     global $i18n;
 
+    // Determine these once as they are used in multiple places in this function.
+    $canViewReports = $user->can('view_reports');
+    $isClient = $user->isClient();
+
     $items = ttReportHelper::getFavItems($report);
     $group_by = $report['group_by'];
     if ($group_by && 'no_grouping' != $group_by)
@@ -1469,7 +1498,7 @@ class ttReportHelper {
         }
         if ($report['show_cost']) {
           $body .= '<td style="'.$cellRightAlignedSubtotal.'">';
-          $body .= ($user->canManageTeam() || $user->isClient()) ? $subtotal['cost'] : $subtotal['expenses'];
+          $body .= ($canViewReports || $isClient) ? $subtotal['cost'] : $subtotal['expenses'];
           $body .= '</td>';
         }
         $body .= '</tr>';
@@ -1486,7 +1515,7 @@ class ttReportHelper {
       }
       if ($report['show_cost']) {
         $body .= '<td nowrap style="'.$cellRightAlignedSubtotal.'">'.htmlspecialchars($user->currency).' ';
-        $body .= ($user->canManageTeam() || $user->isClient()) ? $totals['cost'] : $totals['expenses'];
+        $body .= ($canViewReports || $isClient) ? $totals['cost'] : $totals['expenses'];
         $body .= '</td>';
       }
       $body .= '</tr>';
@@ -1499,7 +1528,7 @@ class ttReportHelper {
       $body .= '<table border="0" cellpadding="4" cellspacing="0" width="100%">';
       $body .= '<tr>';
       $body .= '<td style="'.$tableHeader.'">'.$i18n->getKey('label.date').'</td>';
-      if ($user->canManageTeam() || $user->isClient())
+      if ($canViewReports || $isClient)
         $body .= '<td style="'.$tableHeader.'">'.$i18n->getKey('label.user').'</td>';
       if ($report['show_client'])
         $body .= '<td style="'.$tableHeader.'">'.$i18n->getKey('label.client').'</td>';
@@ -1548,7 +1577,7 @@ class ttReportHelper {
               $body .= '<tr style="'.$rowSubtotal.'">';
               $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.$i18n->getKey('label.subtotal').'</td>';
               $subtotal_name = htmlspecialchars($subtotals[$prev_grouped_by]['name']);
-              if ($user->canManageTeam() || $user->isClient()) $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.($group_by == 'user' ? $subtotal_name : '').'</td>';
+              if ($canViewReports || $isClient) $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.($group_by == 'user' ? $subtotal_name : '').'</td>';
               if ($report['show_client']) $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.($group_by == 'client' ? $subtotal_name : '').'</td>';
               if ($report['show_project']) $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.($group_by == 'project' ? $subtotal_name : '').'</td>';
               if ($report['show_task']) $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.($group_by == 'task' ? $subtotal_name : '').'</td>';
@@ -1559,7 +1588,7 @@ class ttReportHelper {
               if ($report['show_note']) $body .= '<td></td>';
               if ($report['show_cost']) {
                 $body .= '<td style="'.$cellRightAlignedSubtotal.'">';
-                $body .= ($user->canManageTeam() || $user->isClient()) ? $subtotals[$prev_grouped_by]['cost'] : $subtotals[$prev_grouped_by]['expenses'];
+                $body .= ($canViewReports || $isClient) ? $subtotals[$prev_grouped_by]['cost'] : $subtotals[$prev_grouped_by]['expenses'];
                 $body .= '</td>';
               }
               if ($report['show_paid']) $body .= '<td></td>';
@@ -1575,7 +1604,7 @@ class ttReportHelper {
             $row_style = ($row_style == $rowItem) ? $rowItemAlt : $rowItem;
           $body .= '<tr style="'.$row_style.'">';
           $body .= '<td style="'.$cellLeftAligned.'">'.$record['date'].'</td>';
-          if ($user->canManageTeam() || $user->isClient())
+          if ($canViewReports || $isClient)
             $body .= '<td style="'.$cellLeftAligned.'">'.htmlspecialchars($record['user']).'</td>';
           if ($report['show_client'])
             $body .= '<td style="'.$cellLeftAligned.'">'.htmlspecialchars($record['client']).'</td>';
@@ -1615,7 +1644,7 @@ class ttReportHelper {
         $body .= '<tr style="'.$rowSubtotal.'">';
         $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.$i18n->getKey('label.subtotal').'</td>';
         $subtotal_name = htmlspecialchars($subtotals[$cur_grouped_by]['name']);
-        if ($user->canManageTeam() || $user->isClient()) $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.($group_by == 'user' ? $subtotal_name : '').'</td>';
+        if ($canViewReports || $isClient) $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.($group_by == 'user' ? $subtotal_name : '').'</td>';
         if ($report['show_client']) $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.($group_by == 'client' ? $subtotal_name : '').'</td>';
         if ($report['show_project']) $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.($group_by == 'project' ? $subtotal_name : '').'</td>';
         if ($report['show_task']) $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.($group_by == 'task' ? $subtotal_name : '').'</td>';
@@ -1626,7 +1655,7 @@ class ttReportHelper {
         if ($report['show_note']) $body .= '<td></td>';
         if ($report['show_cost']) {
           $body .= '<td style="'.$cellRightAlignedSubtotal.'">';
-          $body .= ($user->canManageTeam() || $user->isClient()) ? $subtotals[$cur_grouped_by]['cost'] : $subtotals[$cur_grouped_by]['expenses'];
+          $body .= ($canViewReports || $isClient) ? $subtotals[$cur_grouped_by]['cost'] : $subtotals[$cur_grouped_by]['expenses'];
           $body .= '</td>';
         }
         if ($report['show_paid']) $body .= '<td></td>';
@@ -1638,7 +1667,7 @@ class ttReportHelper {
       $body .= '<tr><td>&nbsp;</td></tr>';
       $body .= '<tr style="'.$rowSubtotal.'">';
       $body .= '<td style="'.$cellLeftAlignedSubtotal.'">'.$i18n->getKey('label.total').'</td>';
-      if ($user->canManageTeam() || $user->isClient()) $body .= '<td></td>';
+      if ($canViewReports || $isClient) $body .= '<td></td>';
       if ($report['show_client']) $body .= '<td></td>';
       if ($report['show_project']) $body .= '<td></td>';
       if ($report['show_task']) $body .= '<td></td>';
@@ -1649,7 +1678,7 @@ class ttReportHelper {
       if ($report['show_note']) $body .= '<td></td>';
       if ($report['show_cost']) {
         $body .= '<td nowrap style="'.$cellRightAlignedSubtotal.'">'.htmlspecialchars($user->currency).' ';
-        $body .= ($user->canManageTeam() || $user->isClient()) ? $totals['cost'] : $totals['expenses'];
+        $body .= ($canViewReports || $isClient) ? $totals['cost'] : $totals['expenses'];
         $body .= '</td>';
       }
       if ($report['show_paid']) $body .= '<td></td>';