holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge as PDF:

Browse Source 
- improve error logging
- remove original merge result when PDF conversion succeeds
This commit is contained in:
nathan 2021-09-29 11:01:07 -06:00
parent 89923e25c4
commit fb88f8846b
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
api/src/Storage/Merge.php
View File

@ -2409,7 +2409,7 @@ abstract class Merge
if(($error = $document_merge->check_document($_REQUEST['document'],'')))
{
$response->error($error);
error_log(__METHOD__ . "({$_REQUEST['document']}) $error");
return;
}
@ -2466,8 +2466,20 @@ abstract class Merge
if($editable_mimes[Vfs::mime_content_type($target)] && $pdf)
{
$error = '';
$converted_path = '';
$convert = new Conversion();
$convert->convert($target, $target, 'pdf', $error);
$convert->convert($target, $converted_path, 'pdf', $error);
if($error)
{
error_log(__METHOD__ . "({$_REQUEST['document']}) $target => $converted_path Error in PDF conversion: $error");
}
else
{
// Remove original
Vfs::unlink($target);
$target = $converted_path;
}
}
if($editable_mimes[Vfs::mime_content_type($target)] &&
!in_array(Vfs::mime_content_type($target), explode(',', $GLOBALS['egw_info']['user']['preferences']['filemanager']['collab_excluded_mimes'])))