extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-08 00:54:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Api: If merge option "link to each entry" is used, move the generated file to entry's vfs directory instead of link from generated directory

Browse Source 
This should reduce filename conflicts and avoid accidental deletions
This commit is contained in:
nathan 2024-07-09 13:21:02 -06:00
parent fbb3c22d38
commit 42178c432e
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2561,17 +2561,22 @@ abstract class Merge
$converted = $document_merge->pdf_conversion($target);
$target = $converted;
}
$merged[] = $target;
$attach[] = Vfs::PREFIX . $target;
// Move to entry
if($link)
{
foreach((array)$ids as $id)
{
// Copy to entry
Api\Link::link($app, $id, Api\Link::VFS_APPNAME, Vfs::PREFIX . $target);
// Remove
Vfs::unlink($target);
$target = Api\Link::vfs_path($app, $id, Vfs::basename(Vfs::PREFIX . $target));
}
}
$merged[] = $target;
$attach[] = Vfs::PREFIX . $target;
}
// One email per id group
if($email && $mail_bo)