tcpdf via composer

2 files changed, 3 insertions, 7 deletions

diff --git a/inc/poche/WallabagEBooks.class.php b/inc/poche/WallabagEBooks.class.php
index bc40990b..a9c62af9 100644
--- a/inc/poche/WallabagEBooks.class.php
+++ b/inc/poche/WallabagEBooks.class.php
@@ -213,9 +213,8 @@ class WallabagPDF extends WallabagEbooks
         $pdf->SetCreator(PDF_CREATOR);
         $pdf->SetAuthor('');
         $pdf->SetTitle($this->bookTitle);
-        $pdf->SetSubject('TCPDF Tutorial');
-        $pdf->SetKeywords('TCPDF, PDF, example, test, guide');
-                
+        $pdf->SetSubject($this->bookTitle);
+        
         Tools::logm('Adding introduction...');
         $pdf->AddPage();
         $intro = '<h1>' . $this->bookTitle . '</h1><div style="text-align:center;" >
@@ -240,7 +239,7 @@ class WallabagPDF extends WallabagEbooks
         $pdf->setImageScale(PDF_IMAGE_SCALE_RATIO);
         
 
-        $pdf->Output($this->bookFileName . '.pdf', 'FD');
+        $pdf->Output(CACHE . '/' . $this->bookFileName . '.pdf', 'FD');
 
         }
 }
diff --git a/inc/poche/global.inc.php b/inc/poche/global.inc.php
index 8b62d5de..95bf8ef1 100755
--- a/inc/poche/global.inc.php
+++ b/inc/poche/global.inc.php
@@ -30,9 +30,6 @@ require_once INCLUDES . '/poche/FlattrItem.class.php';
 require_once INCLUDES . '/3rdparty/libraries/feedwriter/FeedItem.php';
 require_once INCLUDES . '/3rdparty/libraries/feedwriter/FeedWriter.php';
 
-# pdf library
-require_once  INCLUDES . '/3rdparty/libraries/tcpdf/tcpdf.php';
-
 # system configuration; database credentials et caetera
 require_once INCLUDES . '/poche/config.inc.php';
 require_once INCLUDES . '/poche/config.inc.default.php';