From 4ce104a73800a08d639a2644178789ecd62d203c Mon Sep 17 00:00:00 2001 From: Andreas Oesterreicher Date: Fri, 21 Jul 2017 15:46:46 +0200 Subject: [PATCH] =?UTF-8?q?Fehler=20behoben=20wodurch=20tempor=C3=A4re=20D?= =?UTF-8?q?ateien=20nach=20der=20Dokumentenerstellung=20nicht=20korrekt=20?= =?UTF-8?q?aufger=C3=A4umt=20wurden?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cis/private/pdfExport.php | 9 +++++---- content/pdfExport.php | 9 ++++++--- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/cis/private/pdfExport.php b/cis/private/pdfExport.php index 1ce3c0029..d791768da 100644 --- a/cis/private/pdfExport.php +++ b/cis/private/pdfExport.php @@ -160,7 +160,7 @@ if (isset($_GET['output']) && $_GET['output']!='pdf') else $output = $_GET['output']; } -else +else $output = 'pdf'; @@ -248,7 +248,8 @@ if (($user == $_GET["uid"]) || $rechte->isBerechtigt('admin')) $buffer = $proc->transformToXml($xml_doc); //echo $buffer; //exit; - $tempfolder = '/tmp/'.uniqid(); + $tmp = sys_get_temp_dir(); + $tempfolder = $tmp.'/FHC'.uniqid(); mkdir($tempfolder); chdir($tempfolder); file_put_contents('content.xml', $buffer); @@ -388,8 +389,8 @@ if (($user == $_GET["uid"]) || $rechte->isBerechtigt('admin')) fclose($handle); unlink('content.xml'); - if(isset($_GET['style_xsl'])) - unlink('styles.xml'); + if(file_exists('styles.xml')) + unlink('styles.xml'); unlink($tempname_zip); if($output=='pdf' || $output=='doc') unlink($tempPdfName); diff --git a/content/pdfExport.php b/content/pdfExport.php index 7f0abbe53..4ed918c74 100644 --- a/content/pdfExport.php +++ b/content/pdfExport.php @@ -409,7 +409,8 @@ if (!isset($_REQUEST["archive"])) $buffer = $proc->transformToXml($xml_doc); //echo $buffer; //exit; - $tempfolder = '/tmp/'.uniqid(); + $tmp = sys_get_temp_dir(); + $tempfolder = $tmp.'/FHC'.uniqid(); mkdir($tempfolder); chdir($tempfolder); file_put_contents('content.xml', $buffer); @@ -672,7 +673,8 @@ else $buffer = $proc->transformToXml($xml_doc); //echo $buffer; //exit; - $tempfolder = '/tmp/'.uniqid(); + $tmp = sys_get_temp_dir(); + $tempfolder = $tmp.'/FHC'.uniqid(); mkdir($tempfolder); chdir($tempfolder); file_put_contents('content.xml', $buffer); @@ -766,7 +768,8 @@ else { echo('Failed to generate PDF'); } - $file = "/tmp/".$filename.".pdf"; + $tmp = sys_get_temp_dir(); + $file = $tmp."/FHC".$filename.".pdf"; } }