From 44796951a6e5a666a544d019e757864e7a98fd21 Mon Sep 17 00:00:00 2001
From: Ricky Mathew <ricky@web-vision.de>
Date: Thu, 16 Jul 2020 18:01:57 +0200
Subject: [PATCH] [TASK] Cleanup and deprecatiion fix

---
 Classes/Middleware/PdfRender.php     | 17 ++++++++---------
 Configuration/RequestMiddlewares.php |  2 +-
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/Classes/Middleware/PdfRender.php b/Classes/Middleware/PdfRender.php
index 6af49ae..770aa3d 100644
--- a/Classes/Middleware/PdfRender.php
+++ b/Classes/Middleware/PdfRender.php
@@ -29,13 +29,9 @@
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\MiddlewareInterface;
 use Psr\Http\Server\RequestHandlerInterface;
-use TYPO3\CMS\Core\Configuration\ExtensionConfiguration;
-use TYPO3\CMS\Core\Database\ConnectionPool;
-use TYPO3\CMS\Core\Http\JsonResponse;
 use TYPO3\CMS\Core\Http\Response;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 
-
 /**
  * Middleware provides generation of full html page as PDF
  * @author Ricky Mathew <ricky@web-vision.de>
@@ -53,12 +49,12 @@ class PdfRender implements MiddlewareInterface
      */
     protected $view;
 
-
     /**
      * Instantiates necessary objects
      *
      */
-    public function __construct() {
+    public function __construct()
+    {
         $this->objectManager = GeneralUtility::makeInstance('TYPO3\\CMS\\Extbase\\Object\\ObjectManager');
         $this->view = $this->objectManager->get('Mittwald\\Web2pdf\View\\PdfView');
     }
@@ -68,9 +64,12 @@ public function __construct() {
      */
     public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
     {
-        //TODO set condition to distinguidh pdf rendering request also need to pass the page title as second parameter in renderHtmlOutput()
-        $this->view->renderHtmlOutput($GLOBALS['TSFE']->content,'');
+        $arguments = $request->getQueryParams();
+        if (isset($arguments['tx_web2pdf_pi1']) && $arguments['tx_web2pdf_pi1']['argument'] == 'printPage') {
+            $response = $handler->handle($request);
+            $this->view->renderHtmlOutput($GLOBALS['TSFE']->pageRenderer->getBodyContent(),$GLOBALS['TSFE']->page['title']);
+        }
         return $handler->handle($request);
     }
 
-}
\ No newline at end of file
+}
diff --git a/Configuration/RequestMiddlewares.php b/Configuration/RequestMiddlewares.php
index 8f9220d..1717473 100644
--- a/Configuration/RequestMiddlewares.php
+++ b/Configuration/RequestMiddlewares.php
@@ -5,7 +5,7 @@
         'web2pdf/PdfRender' => [
             'target' => \Mittwald\Web2pdf\Middleware\PdfRender::class,
             'after' => [
-                'typo3/cms-frontend/prepare-tsfe-rendering',
+                'typo3/cms-frontend/output-compression',
             ]
         ],
     ],