From 0e4b44478db970cdb195d4bcc3bc5fcefa3a1d07 Mon Sep 17 00:00:00 2001
From: Dany De Bontridder <dany@alchimerys.be>
Date: Wed, 12 Nov 2014 22:34:49 +0100
Subject: [PATCH] Add exception

---
 include/class_document_export.php | 34 ++++++++++++++++++++-----------
 1 file changed, 22 insertions(+), 12 deletions(-)

diff --git a/include/class_document_export.php b/include/class_document_export.php
index bfda2cdc9..38a561ba1 100644
--- a/include/class_document_export.php
+++ b/include/class_document_export.php
@@ -52,21 +52,31 @@ class Document_Export
      */
     function concatenate_pdf()
     {
-        $this->check_file();
-        $stmt = PDFTK . " " . $this->store_pdf . '/stamp_*pdf  output ' . $this->store_pdf . '/result.pdf';
-        $status = 0;
-        echo $stmt;
-        passthru($stmt, $status);
-
-        if ($status <> 0)
+        try
         {
-            $cnt_feedback = count($this->feedback);
-            $this->feedback[$cnt_feedback]['file'] = 'result.pdf';
-            $this->feedback[$cnt_feedback]['message'] = ' cannot concatenate PDF';
-            $this->feedback[$cnt_feedback]['error'] = $status;
+            $this->check_file();
+            $stmt=PDFTK." ".$this->store_pdf.'/stamp_*pdf  output '.$this->store_pdf.'/result.pdf';
+            $status=0;
+            echo $stmt;
+            passthru($stmt, $status);
+
+            if ($status<>0)
+            {
+                $cnt_feedback=count($this->feedback);
+                $this->feedback[$cnt_feedback]['file']='result.pdf';
+                $this->feedback[$cnt_feedback]['message']=' cannot concatenate PDF';
+                $this->feedback[$cnt_feedback]['error']=$status;
+            }
+        }
+        catch (Exception $exc)
+        {
+            $cnt_feedback=count($this->feedback);
+            $this->feedback[$cnt_feedback]['file']='result.pdf';
+            $this->feedback[$cnt_feedback]['message']=$exc->getMessage();
+            $this->feedback[$cnt_feedback]['error']=0;
         }
     }
-    
+
     function move_file($p_source, $target)
     {
         $this->check_file();