X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=topdf.php;h=b1195a4b93e9772d692b0605c2c15cfac5cb6a18;hb=532ab62cfa2895753eb599ab3b35c104ca344602;hp=3f0a6dc758ca910b75446b37cd11ff8cc530b9ce;hpb=029e1daa627ad332edd64bba79f5415fcaf1407d;p=timetracker.git
diff --git a/topdf.php b/topdf.php
index 3f0a6dc7..b1195a4b 100644
--- a/topdf.php
+++ b/topdf.php
@@ -49,7 +49,7 @@ if (!ttAccessCheck(right_view_reports)) {
}
// Use custom fields plugin if it is enabled.
-if (in_array('cf', explode(',', $user->plugins))) {
+if ($user->isPluginEnabled('cf')) {
require_once('plugins/CustomFields.class.php');
$custom_fields = new CustomFields($user->team_id);
}
@@ -87,6 +87,9 @@ if ($items && 'no_grouping' != $group_by) {
$cur_grouped_by = '';
}
+// 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'];
+
// Start preparing HTML to build PDF from.
$styleHeader = 'style="background-color:#a6ccf7;"';
$styleSubtotal = 'style="background-color:#e0e0e0;"';
@@ -159,7 +162,7 @@ if ($totals_only) {
if ($bean->getAttribute('chinvoice')) { $colspan++; $html .= '
'.$i18n->getKey('label.invoice').' | '; }
$html .= '';
$html .= '';
-
+
foreach ($items as $item) {
// Print a subtotal for a block of grouped values.
$cur_date = $item['date'];
@@ -234,11 +237,11 @@ if ($totals_only) {
}
if ($bean->getAttribute('chinvoice')) $html .= ''.htmlspecialchars($item['invoice']).' | ';
$html .= '';
-
+
$prev_date = $item['date'];
if ($print_subtotals) $prev_grouped_by = $item['grouped_by'];
}
-
+
// Print a terminating subtotal.
if ($print_subtotals) {
$html .= '';
@@ -283,7 +286,7 @@ if ($totals_only) {
if ($bean->getAttribute('chinvoice')) $html .= ' | ';
$html .= '
';
}
-
+
// Print totals.
$html .= ' |
';
$html .= '';
@@ -302,7 +305,7 @@ if ($totals_only) {
if ($user->canManageTeam() || $user->isClient())
$html .= $totals['cost'];
else
- $html .= $totals['expenses'];
+ $html .= $totals['expenses'];
$html .= '';
}
if ($bean->getAttribute('chinvoice')) $html .= ' | ';
@@ -327,7 +330,7 @@ header('Cache-Control: post-check=0, pre-check=0', false);
header('Cache-Control: private', false);
header('Content-Type: application/pdf');
-header('Content-Disposition: attachment; filename="timesheet.pdf"');
+header('Content-Disposition: attachment; filename="'.$filename.'.pdf"');
// Beginning of TCPDF code here.
@@ -337,17 +340,17 @@ class ttPDF extends TCPDF {
public $image_file = 'images/tt_logo.png'; // Image file for the logo in header.
public $page_word = 'Page'; // Localized "Page" word in footer, ex: Page 1/2.
-
+
// SetImageFile - sets image file name.
public function SetImageFile($imgFile) {
$this->image_file = $imgFile;
}
-
+
// SetPageWord - sets page word for footer.
public function SetPageWord($pageWord) {
$this->page_word = $pageWord;
}
-
+
// Page header.
public function Header() {
// Print logo, which is the only element of our custom header.
@@ -404,6 +407,6 @@ $pdf->writeHTML($html, true, false, false, false, '');
// Close and output PDF document.
// $pdf->Output('timesheet.pdf', 'I'); // This will display inline in browser.
-$pdf->Output('timesheet.pdf', 'D'); // D is for downloads.
+$pdf->Output($filename.'.pdf', 'D'); // D is for downloads.
// End of of TCPDF code.