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

diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php
index f2ae6202..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>';