X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=inline;f=topdf.php;h=f0fdb6023483437e1997652820bd8a9ce6c381db;hb=08bbf671649fd5419fe4d38fab621e053472e8ce;hp=744ef4a2a5907aa41effced4aaa76221b9b3da03;hpb=ed6483fa05ff6f489a7cfc4ff72fdc4d4d8f3889;p=timetracker.git diff --git a/topdf.php b/topdf.php index 744ef4a2..f0fdb602 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;"'; @@ -156,10 +159,11 @@ if ($totals_only) { if ($bean->getAttribute('chduration')) { $colspan++; $html .= "
'.$i18n->getKey('form.mail.footer').'
'; + // By this time we have html ready. // Determine title for report. @@ -322,27 +339,27 @@ 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. // Extend TCPDF class so that we can use custom header and footer. -class MyyPDF extends TCPDF { +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. @@ -354,14 +371,14 @@ class MyyPDF extends TCPDF { // Position at 15 mm from bottom. $this->SetY(-15); // Set font. - $this->SetFont('helvetica', 'I', 8); + $this->SetFont('freeserif', 'I', 8); // Print localized page number. $this->Cell(0, 10, $this->page_word.' '.$this->getAliasNumPage().'/'.$this->getAliasNbPages(), 0, false, 'C', 0, '', 0, false, 'T', 'M'); } } // Create new PDF document. -$pdf = new MyyPDF(PDF_PAGE_ORIENTATION, PDF_UNIT, PDF_PAGE_FORMAT, true, 'UTF-8', false); +$pdf = new ttPDF(PDF_PAGE_ORIENTATION, PDF_UNIT, PDF_PAGE_FORMAT, true, 'UTF-8', false); // If custom logo file exists - set it. if (file_exists('images/'.$user->team_id.'.png')) @@ -369,8 +386,6 @@ if (file_exists('images/'.$user->team_id.'.png')) // Set page word for the footer. $pdf->SetPageWord($i18n->getKey('label.page')); -// TODO: currently, we have problems rendering PDF in some languages such as Russian (headers, page word). -// Not sure how to fix it... One option is to switch to mPDF - consider. // Set document information. $pdf->SetCreator(PDF_CREATOR); @@ -393,15 +408,14 @@ $pdf->setImageScale(PDF_IMAGE_SCALE_RATIO); // Add a page. $pdf->AddPage(); -// Set font. -$pdf->SetFont('helvetica', '', 10); +// Set font (freeserif seems to work for all languages). +$pdf->SetFont('freeserif', '', 10); // helvetica here does not work for Russian. // Write HTML. $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. -?> \ No newline at end of file