Skip to content
Snippets Groups Projects
Commit 2ed3db16 authored by Jan-Hendrik Willms's avatar Jan-Hendrik Willms
Browse files

exportpdf no longer breaks when an embedded stud.ip file does not exist, fixes #4765

Closes #4765

Merge request studip/studip!3552
parent c05865d7
No related branches found
No related tags found
No related merge requests found
......@@ -319,21 +319,19 @@ class ExportPDF extends TCPDF implements ExportDocument
} catch (Exception $e) {
$convurl = '';
}
} else if (mb_stripos($url, 'dispatch.php/document/download') !== false) {
if (preg_match('#([a-f0-9]{32})#', $url, $matches)) {
$file_ref = FileRef::find($matches[1]);
$folder = $file_ref->folder->getTypedFolder();
if($folder->isFileDownloadable($file_ref->id, $GLOBALS['user']->id)) {
$convurl = $file_ref->file->getPath();
}
}
} else if (mb_stripos($url, 'download') !== false
|| mb_stripos($url, 'sendfile.php') !== false) {
} elseif (
mb_stripos($url, 'dispatch.php/document/download') !== false
|| mb_stripos($url, 'download') !== false
|| mb_stripos($url, 'sendfile.php') !== false
) {
//// get file id
if (preg_match('#([a-f0-9]{32})#', $url, $matches)) {
$file_ref = FileRef::find($matches[1]);
$folder = $file_ref->folder->getTypedFolder();
if($folder->isFileDownloadable($file_ref->id, $GLOBALS['user']->id)) {
$folder = isset($file_ref->folder) ? $file_ref->folder->getTypedFolder() : null;
if (
isset($folder)
&& $folder->isFileDownloadable($file_ref->id, $GLOBALS['user']->id)
) {
$convurl = $file_ref->file->getPath();
} else {
$convurl = Assets::image_path('messagebox/exception.png');
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment