tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-07-27 07:44:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4049 from Icinga/fix/pdfexport-hooks-may-cause-bad-loading-times

Browse Source 
Fix pdfexport hooks may cause bad loading times
This commit is contained in:
Johannes Meyer 2020-01-16 09:02:31 +01:00 committed by GitHub
commit 05135e716e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
library/Icinga/File/Pdf.php
View File

@ -75,8 +75,6 @@ class Pdf
if (Hook::has('Pdfexport')) { if (Hook::has('Pdfexport')) {
$pdfexport = Hook::first('Pdfexport'); $pdfexport = Hook::first('Pdfexport');
if ($pdfexport->isSupported()) {
$pdfexport->streamPdfFromHtml($html, sprintf( $pdfexport->streamPdfFromHtml($html, sprintf(
'%s-%s-%d', '%s-%s-%d',
$request->getControllerName(), $request->getControllerName(),
@ -86,7 +84,6 @@ class Pdf
return; return;
} }
}
$options = new Options(); $options = new Options();
$options->set('defaultPaperSize', 'A4'); $options->set('defaultPaperSize', 'A4');

6
library/Icinga/Web/Widget/Tabextension/OutputFormat.php
View File

@ -82,11 +82,7 @@ class OutputFormat implements Tabextension
{ {
$supportedTypes = array(); $supportedTypes = array();
$pdfexport = false; $pdfexport = Hook::has('Pdfexport');
if (Hook::has('Pdfexport')) {
$pdfexport = Hook::first('Pdfexport')->isSupported();
}
if ($pdfexport || Platform::extensionLoaded('gd')) { if ($pdfexport || Platform::extensionLoaded('gd')) {
$supportedTypes[self::TYPE_PDF] = array( $supportedTypes[self::TYPE_PDF] = array(