tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

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
parent 69d15824fb 6a8f17faf2
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

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

@ -75,17 +75,14 @@ class Pdf
if (Hook::has('Pdfexport')) {
$pdfexport = Hook::first('Pdfexport');
$pdfexport->streamPdfFromHtml($html, sprintf(
'%s-%s-%d',
$request->getControllerName(),
$request->getActionName(),
time()
));
if ($pdfexport->isSupported()) {
$pdfexport->streamPdfFromHtml($html, sprintf(
'%s-%s-%d',
$request->getControllerName(),
$request->getActionName(),
time()
));
return;
}
return;
}
$options = new Options();

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

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