X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=tofile.php;h=62632fa979ee2ef76f0edcc3209bc2956e95cfea;hb=ea80612af0054c2abdc9c2b422fe3f1038f4b2c0;hp=6849b7f153307fcd070ad5ad42d1cd021fb5b3dc;hpb=55fb421c8c80c95f5a3b41b128161b9dd17df32a;p=timetracker.git
diff --git a/tofile.php b/tofile.php
index 6849b7f1..62632fa9 100644
--- a/tofile.php
+++ b/tofile.php
@@ -31,16 +31,17 @@ import('form.Form');
import('form.ActionForm');
import('ttReportHelper');
-// Access check.
-if (!ttAccessCheck(right_view_reports)) {
+// Access checks.
+if (!(ttAccessAllowed('view_own_reports') || ttAccessAllowed('view_reports'))) {
header('Location: access_denied.php');
exit();
}
+// End of access checks.
// Use custom fields plugin if it is enabled.
if ($user->isPluginEnabled('cf')) {
require_once('plugins/CustomFields.class.php');
- $custom_fields = new CustomFields($user->team_id);
+ $custom_fields = new CustomFields($user->group_id);
}
// Report settings are stored in session bean before we get here.
@@ -63,7 +64,7 @@ else
$items = ttReportHelper::getItems($bean);
// Build a string to use as filename for the files being downloaded.
-$filename = strtolower($i18n->getKey('title.report')).'_'.$bean->mValues['start_date'].'_'.$bean->mValues['end_date'];
+$filename = strtolower($i18n->get('title.report')).'_'.$bean->mValues['start_date'].'_'.$bean->mValues['end_date'];
header('Pragma: public'); // This is needed for IE8 to download files over https.
header('Content-Type: text/html; charset=utf-8');
@@ -133,6 +134,10 @@ if ('xml' == $type) {
print "]]>\n";
}
if ($bean->getAttribute('chpaid')) print "\t\n";
+ if ($bean->getAttribute('chip')) {
+ $ip = $item['modified'] ? $item['modified_ip'].' '.$item['modified'] : $item['created_ip'].' '.$item['created'];
+ print "\t\n";
+ }
if ($bean->getAttribute('chinvoice')) print "\t\n";
print "\n";
@@ -160,13 +165,13 @@ if ('csv' == $type) {
$group_by_header = $custom_fields->fields[0]['label'];
else {
$key = 'label.'.$group_by;
- $group_by_header = $i18n->getKey($key);
+ $group_by_header = $i18n->get($key);
}
// Print headers.
print '"'.$group_by_header.'"';
- if ($bean->getAttribute('chduration')) print ',"'.$i18n->getKey('label.duration').'"';
- if ($bean->getAttribute('chcost')) print ',"'.$i18n->getKey('label.cost').'"';
+ if ($bean->getAttribute('chduration')) print ',"'.$i18n->get('label.duration').'"';
+ if ($bean->getAttribute('chcost')) print ',"'.$i18n->get('label.cost').'"';
print "\n";
// Print subtotals.
@@ -188,19 +193,20 @@ if ('csv' == $type) {
}
} else {
// Normal report. Print headers.
- print '"'.$i18n->getKey('label.date').'"';
- if ($user->canManageTeam() || $user->isClient()) print ',"'.$i18n->getKey('label.user').'"';
- if ($bean->getAttribute('chclient')) print ',"'.$i18n->getKey('label.client').'"';
- if ($bean->getAttribute('chproject')) print ',"'.$i18n->getKey('label.project').'"';
- if ($bean->getAttribute('chtask')) print ',"'.$i18n->getKey('label.task').'"';
+ print '"'.$i18n->get('label.date').'"';
+ if ($user->canManageTeam() || $user->isClient()) print ',"'.$i18n->get('label.user').'"';
+ if ($bean->getAttribute('chclient')) print ',"'.$i18n->get('label.client').'"';
+ if ($bean->getAttribute('chproject')) print ',"'.$i18n->get('label.project').'"';
+ if ($bean->getAttribute('chtask')) print ',"'.$i18n->get('label.task').'"';
if ($bean->getAttribute('chcf_1')) print ',"'.$custom_fields->fields[0]['label'].'"';
- if ($bean->getAttribute('chstart')) print ',"'.$i18n->getKey('label.start').'"';
- if ($bean->getAttribute('chfinish')) print ',"'.$i18n->getKey('label.finish').'"';
- if ($bean->getAttribute('chduration')) print ',"'.$i18n->getKey('label.duration').'"';
- if ($bean->getAttribute('chnote')) print ',"'.$i18n->getKey('label.note').'"';
- if ($bean->getAttribute('chcost')) print ',"'.$i18n->getKey('label.cost').'"';
- if ($bean->getAttribute('chpaid')) print ',"'.$i18n->getKey('label.paid').'"';
- if ($bean->getAttribute('chinvoice')) print ',"'.$i18n->getKey('label.invoice').'"';
+ if ($bean->getAttribute('chstart')) print ',"'.$i18n->get('label.start').'"';
+ if ($bean->getAttribute('chfinish')) print ',"'.$i18n->get('label.finish').'"';
+ if ($bean->getAttribute('chduration')) print ',"'.$i18n->get('label.duration').'"';
+ if ($bean->getAttribute('chnote')) print ',"'.$i18n->get('label.note').'"';
+ if ($bean->getAttribute('chcost')) print ',"'.$i18n->get('label.cost').'"';
+ if ($bean->getAttribute('chpaid')) print ',"'.$i18n->get('label.paid').'"';
+ if ($bean->getAttribute('chip')) print ',"'.$i18n->get('label.ip').'"';
+ if ($bean->getAttribute('chinvoice')) print ',"'.$i18n->get('label.invoice').'"';
print "\n";
// Print items.
@@ -227,6 +233,10 @@ if ('csv' == $type) {
print ',"'.$item['expense'].'"';
}
if ($bean->getAttribute('chpaid')) print ',"'.$item['paid'].'"';
+ if ($bean->getAttribute('chip')) {
+ $ip = $item['modified'] ? $item['modified_ip'].' '.$item['modified'] : $item['created_ip'].' '.$item['created'];
+ print ',"'.$ip.'"';
+ }
if ($bean->getAttribute('chinvoice')) print ',"'.str_replace('"','""',$item['invoice']).'"';
print "\n";
}