This commit is contained in:
Andreas Moik
2016-07-28 13:30:09 +02:00
parent fd826ae1fe
commit 5743d05478
3 changed files with 30 additions and 30 deletions
+3 -1
View File
@@ -256,6 +256,7 @@ class dokument_export
case 'pdf':
$this->temp_filename='out.pdf';
exec("unoconv -e IsSkipEmptyPages=false --stdout -f pdf $tempname_zip > ".$this->temp_filename, $out, $ret);
if($ret!=0)
{
$this->errormsg = 'Dokumentenkonvertierung ist derzeit nicht möglich. Bitte informieren Sie den Administrator';
@@ -341,8 +342,9 @@ class dokument_export
if($this->styles_xsl!='')
unlink('styles.xml');
unlink('out.zip');
unlink($this->temp_filename);
if(file_exists("out.zip"))
unlink('out.zip');
if(count($this->images)>0)
{
+1 -1
View File
@@ -44,7 +44,7 @@ class Pdf
}
if(finfo_file($finfo, $f) != "application/pdf")
{
$this->errormsg = "Wrong format: '$f'";
$this->errormsg = "Wrong format(".finfo_file($finfo, $f)."): '$f'";
return false;
}
}