X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=tofile.php;h=9399c787ce8053077cfe5bcb3b0cdc832fe0646c;hb=87a40bf7dc910c008aa6aadf8882b070ad120c39;hp=3934471deb7bb7575b0d87e7ce4442b212313b62;hpb=6079edfe4444d2d0bc2f220f8823d6fcc57f2dd5;p=timetracker.git
diff --git a/tofile.php b/tofile.php
index 3934471d..9399c787 100644
--- a/tofile.php
+++ b/tofile.php
@@ -32,7 +32,7 @@ import('form.ActionForm');
import('ttReportHelper');
// Access checks.
-if (!(ttAccessAllowed('view_own_reports') || ttAccessAllowed('view_reports'))) {
+if (!(ttAccessAllowed('view_own_reports') || ttAccessAllowed('view_reports') || ttAccessAllowed('view_all_reports') || ttAccessAllowed('view_client_reports'))) {
header('Location: access_denied.php');
exit();
}
@@ -140,12 +140,14 @@ if ('xml' == $type) {
print $item['expense'];
print "]]>\n";
}
+ if ($bean->getAttribute('chapproved')) print "\t\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";
+ if ($bean->getAttribute('chtimesheet')) print "\t\n";
print "\n";
}
@@ -206,9 +208,11 @@ if ('csv' == $type) {
if ($bean->getAttribute('chunits')) print ',"'.$i18n->get('label.work_units_short').'"';
if ($bean->getAttribute('chnote')) print ',"'.$i18n->get('label.note').'"';
if ($bean->getAttribute('chcost')) print ',"'.$i18n->get('label.cost').'"';
+ if ($bean->getAttribute('chapproved')) print ',"'.$i18n->get('label.approved').'"';
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').'"';
+ if ($bean->getAttribute('chtimesheet')) print ',"'.$i18n->get('label.timesheet').'"';
print "\n";
// Print items.
@@ -235,12 +239,14 @@ if ('csv' == $type) {
else
print ',"'.$item['expense'].'"';
}
+ if ($bean->getAttribute('chapproved')) print ',"'.$item['approved'].'"';
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']).'"';
+ if ($bean->getAttribute('chtimesheet')) print ',"'.str_replace('"','""',$item['timesheet_name']).'"';
print "\n";
}
}