From fd6224f3920889d1bc2f5f80314effa9d17af3cf Mon Sep 17 00:00:00 2001 From: Guite CI Date: Thu, 31 Aug 2017 07:51:39 +0200 Subject: [PATCH 1/6] Regenerated using latest generator --- src/system/RoutesModule/Base/bootstrap.php | 2 +- src/system/RoutesModule/bootstrap.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/system/RoutesModule/Base/bootstrap.php b/src/system/RoutesModule/Base/bootstrap.php index 497d721e1e..15e1bb2d11 100644 --- a/src/system/RoutesModule/Base/bootstrap.php +++ b/src/system/RoutesModule/Base/bootstrap.php @@ -7,7 +7,7 @@ * @author Zikula contributors . * @link http://www.zikula.org * @link http://zikula.org - * @version Generated by ModuleStudio 1.0.1 (https://modulestudio.de) at Wed Aug 30 15:50:40 CEST 2017. + * @version Generated by ModuleStudio 1.0.1 (https://modulestudio.de) at Thu Aug 31 07:51:33 CEST 2017. */ /** diff --git a/src/system/RoutesModule/bootstrap.php b/src/system/RoutesModule/bootstrap.php index 8b20c4cf66..98a13d7d53 100644 --- a/src/system/RoutesModule/bootstrap.php +++ b/src/system/RoutesModule/bootstrap.php @@ -7,7 +7,7 @@ * @author Zikula contributors . * @link http://www.zikula.org * @link http://zikula.org - * @version Generated by ModuleStudio 1.0.1 (https://modulestudio.de) at Wed Aug 30 15:50:40 CEST 2017. + * @version Generated by ModuleStudio 1.0.1 (https://modulestudio.de) at Thu Aug 31 07:51:33 CEST 2017. */ /** From a5fc6082f559d8358689a0befc74984f292071e6 Mon Sep 17 00:00:00 2001 From: Guite CI Date: Thu, 31 Aug 2017 07:54:02 +0200 Subject: [PATCH 2/6] Regenerated using latest generator --- src/system/RoutesModule/Base/bootstrap.php | 2 +- src/system/RoutesModule/bootstrap.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/system/RoutesModule/Base/bootstrap.php b/src/system/RoutesModule/Base/bootstrap.php index 15e1bb2d11..3c6a5d0d3f 100644 --- a/src/system/RoutesModule/Base/bootstrap.php +++ b/src/system/RoutesModule/Base/bootstrap.php @@ -7,7 +7,7 @@ * @author Zikula contributors . * @link http://www.zikula.org * @link http://zikula.org - * @version Generated by ModuleStudio 1.0.1 (https://modulestudio.de) at Thu Aug 31 07:51:33 CEST 2017. + * @version Generated by ModuleStudio 1.0.1 (https://modulestudio.de) at Thu Aug 31 07:54:00 CEST 2017. */ /** diff --git a/src/system/RoutesModule/bootstrap.php b/src/system/RoutesModule/bootstrap.php index 98a13d7d53..bf281317c7 100644 --- a/src/system/RoutesModule/bootstrap.php +++ b/src/system/RoutesModule/bootstrap.php @@ -7,7 +7,7 @@ * @author Zikula contributors . * @link http://www.zikula.org * @link http://zikula.org - * @version Generated by ModuleStudio 1.0.1 (https://modulestudio.de) at Thu Aug 31 07:51:33 CEST 2017. + * @version Generated by ModuleStudio 1.0.1 (https://modulestudio.de) at Thu Aug 31 07:54:00 CEST 2017. */ /** From abed2d6f257221fd9325d30247bac839bf397aba Mon Sep 17 00:00:00 2001 From: Guite CI Date: Thu, 31 Aug 2017 09:16:43 +0200 Subject: [PATCH 3/6] Regenerated using latest generator --- src/system/RoutesModule/Base/bootstrap.php | 2 +- src/system/RoutesModule/bootstrap.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/system/RoutesModule/Base/bootstrap.php b/src/system/RoutesModule/Base/bootstrap.php index 3c6a5d0d3f..4044d68209 100644 --- a/src/system/RoutesModule/Base/bootstrap.php +++ b/src/system/RoutesModule/Base/bootstrap.php @@ -7,7 +7,7 @@ * @author Zikula contributors . * @link http://www.zikula.org * @link http://zikula.org - * @version Generated by ModuleStudio 1.0.1 (https://modulestudio.de) at Thu Aug 31 07:54:00 CEST 2017. + * @version Generated by ModuleStudio 1.0.1 (https://modulestudio.de) at Thu Aug 31 09:16:41 CEST 2017. */ /** diff --git a/src/system/RoutesModule/bootstrap.php b/src/system/RoutesModule/bootstrap.php index bf281317c7..c76f11b914 100644 --- a/src/system/RoutesModule/bootstrap.php +++ b/src/system/RoutesModule/bootstrap.php @@ -7,7 +7,7 @@ * @author Zikula contributors . * @link http://www.zikula.org * @link http://zikula.org - * @version Generated by ModuleStudio 1.0.1 (https://modulestudio.de) at Thu Aug 31 07:54:00 CEST 2017. + * @version Generated by ModuleStudio 1.0.1 (https://modulestudio.de) at Thu Aug 31 09:16:41 CEST 2017. */ /** From 2576f361cfa61e95667a32e39910dbddddd4e03a Mon Sep 17 00:00:00 2001 From: Guite CI Date: Thu, 31 Aug 2017 12:06:56 +0200 Subject: [PATCH 4/6] Regenerated using latest generator --- src/system/RoutesModule/Base/bootstrap.php | 2 +- src/system/RoutesModule/bootstrap.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/system/RoutesModule/Base/bootstrap.php b/src/system/RoutesModule/Base/bootstrap.php index 4044d68209..283a3e5438 100644 --- a/src/system/RoutesModule/Base/bootstrap.php +++ b/src/system/RoutesModule/Base/bootstrap.php @@ -7,7 +7,7 @@ * @author Zikula contributors . * @link http://www.zikula.org * @link http://zikula.org - * @version Generated by ModuleStudio 1.0.1 (https://modulestudio.de) at Thu Aug 31 09:16:41 CEST 2017. + * @version Generated by ModuleStudio 1.0.1 (https://modulestudio.de) at Thu Aug 31 12:06:50 CEST 2017. */ /** diff --git a/src/system/RoutesModule/bootstrap.php b/src/system/RoutesModule/bootstrap.php index c76f11b914..dfc7840895 100644 --- a/src/system/RoutesModule/bootstrap.php +++ b/src/system/RoutesModule/bootstrap.php @@ -7,7 +7,7 @@ * @author Zikula contributors . * @link http://www.zikula.org * @link http://zikula.org - * @version Generated by ModuleStudio 1.0.1 (https://modulestudio.de) at Thu Aug 31 09:16:41 CEST 2017. + * @version Generated by ModuleStudio 1.0.1 (https://modulestudio.de) at Thu Aug 31 12:06:50 CEST 2017. */ /** From 7cfb85ff3e663976ee4a3696f32592de8b52f70b Mon Sep 17 00:00:00 2001 From: Guite CI Date: Thu, 31 Aug 2017 12:24:52 +0200 Subject: [PATCH 5/6] Regenerated using latest generator --- src/system/RoutesModule/Base/bootstrap.php | 2 +- src/system/RoutesModule/bootstrap.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/system/RoutesModule/Base/bootstrap.php b/src/system/RoutesModule/Base/bootstrap.php index 283a3e5438..af8ca6d8c1 100644 --- a/src/system/RoutesModule/Base/bootstrap.php +++ b/src/system/RoutesModule/Base/bootstrap.php @@ -7,7 +7,7 @@ * @author Zikula contributors . * @link http://www.zikula.org * @link http://zikula.org - * @version Generated by ModuleStudio 1.0.1 (https://modulestudio.de) at Thu Aug 31 12:06:50 CEST 2017. + * @version Generated by ModuleStudio 1.0.1 (https://modulestudio.de) at Thu Aug 31 12:24:49 CEST 2017. */ /** diff --git a/src/system/RoutesModule/bootstrap.php b/src/system/RoutesModule/bootstrap.php index dfc7840895..7bd68cd221 100644 --- a/src/system/RoutesModule/bootstrap.php +++ b/src/system/RoutesModule/bootstrap.php @@ -7,7 +7,7 @@ * @author Zikula contributors . * @link http://www.zikula.org * @link http://zikula.org - * @version Generated by ModuleStudio 1.0.1 (https://modulestudio.de) at Thu Aug 31 12:06:50 CEST 2017. + * @version Generated by ModuleStudio 1.0.1 (https://modulestudio.de) at Thu Aug 31 12:24:49 CEST 2017. */ /** From 910cfa93fbbaad93005654cc4e4fe02568319e56 Mon Sep 17 00:00:00 2001 From: Guite CI Date: Thu, 31 Aug 2017 12:47:50 +0200 Subject: [PATCH 6/6] Regenerated using latest generator --- src/system/RoutesModule/Base/bootstrap.php | 2 +- .../Helper/Base/AbstractViewHelper.php | 54 ------------------- src/system/RoutesModule/bootstrap.php | 2 +- 3 files changed, 2 insertions(+), 56 deletions(-) diff --git a/src/system/RoutesModule/Base/bootstrap.php b/src/system/RoutesModule/Base/bootstrap.php index af8ca6d8c1..7c70e573b3 100644 --- a/src/system/RoutesModule/Base/bootstrap.php +++ b/src/system/RoutesModule/Base/bootstrap.php @@ -7,7 +7,7 @@ * @author Zikula contributors . * @link http://www.zikula.org * @link http://zikula.org - * @version Generated by ModuleStudio 1.0.1 (https://modulestudio.de) at Thu Aug 31 12:24:49 CEST 2017. + * @version Generated by ModuleStudio 1.0.1 (https://modulestudio.de) at Thu Aug 31 12:47:48 CEST 2017. */ /** diff --git a/src/system/RoutesModule/Helper/Base/AbstractViewHelper.php b/src/system/RoutesModule/Helper/Base/AbstractViewHelper.php index 5e2079152b..804321f833 100644 --- a/src/system/RoutesModule/Helper/Base/AbstractViewHelper.php +++ b/src/system/RoutesModule/Helper/Base/AbstractViewHelper.php @@ -142,12 +142,6 @@ public function processTemplate($type, $func, array $templateParameters = [], $t $template = $this->getViewTemplate($type, $func); } - if ($templateExtension == 'pdf.twig') { - $template = str_replace('.pdf', '.html', $template); - - return $this->processPdf($templateParameters, $template); - } - // look whether we need output with or without the theme $raw = $this->request->query->getBoolean('raw', false); if (!$raw && $templateExtension != 'html.twig') { @@ -219,52 +213,4 @@ public function availableExtensions($type, $func) return $extensions; } - - /** - * Processes a template file using dompdf (LGPL). - * - * @param array $templateParameters Template data - * @param string $template Name of template to use - * - * @return mixed Output - */ - protected function processPdf(array $templateParameters = [], $template) - { - // first the content, to set page vars - $output = $this->twig->render($template, $templateParameters); - - // make local images absolute - $output = str_replace('img src="/', 'img src="' . $this->request->server->get('DOCUMENT_ROOT') . '/', $output); - - // then the surrounding - $output = $this->twig->render('@ZikulaRoutesModule/includePdfHeader.html.twig') . $output . ''; - - // create name of the pdf output file - $siteName = $this->variableApi->getSystemVar('sitename'); - $pageTitle = iconv('UTF-8', 'ASCII//TRANSLIT', $this->pageVars->get('title', '')); - $fileTitle = iconv('UTF-8', 'ASCII//TRANSLIT', $siteName) - . '-' - . ($pageTitle != '' ? $pageTitle . '-' : '') - . date('Ymd') . '.pdf'; - $fileTitle = str_replace(' ', '_', $fileTitle); - - /* - if (true === $this->request->query->getBoolean('dbg', false)) { - die($output); - } - */ - - // instantiate pdf object - $pdf = new \Dompdf\Dompdf(); - // define page properties - $pdf->setPaper('A4', 'portrait'); - // load html input data - $pdf->loadHtml($output); - // create the actual pdf file - $pdf->render(); - // stream output to browser - $pdf->stream($fileTitle); - - return new Response(); - } } diff --git a/src/system/RoutesModule/bootstrap.php b/src/system/RoutesModule/bootstrap.php index 7bd68cd221..32af2d3f77 100644 --- a/src/system/RoutesModule/bootstrap.php +++ b/src/system/RoutesModule/bootstrap.php @@ -7,7 +7,7 @@ * @author Zikula contributors . * @link http://www.zikula.org * @link http://zikula.org - * @version Generated by ModuleStudio 1.0.1 (https://modulestudio.de) at Thu Aug 31 12:24:49 CEST 2017. + * @version Generated by ModuleStudio 1.0.1 (https://modulestudio.de) at Thu Aug 31 12:47:48 CEST 2017. */ /**