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

fixes #3735

Closes #3735

Merge request studip/studip!2596
parent ad7fc20d
No related branches found
No related tags found
No related merge requests found
...@@ -117,7 +117,7 @@ class ExportPDF extends TCPDF implements ExportDocument ...@@ -117,7 +117,7 @@ class ExportPDF extends TCPDF implements ExportDocument
$headers = get_headers($url, true, get_default_http_stream_context($url)); $headers = get_headers($url, true, get_default_http_stream_context($url));
list(, $status) = explode(' ', $headers[0]); list(, $status) = explode(' ', $headers[0]);
$url = $headers['Location'] ?: $headers['location'] ?: $url; $url = $headers['Location'] ?? $headers['location'] ?? $url;
} while (in_array($status, [300, 301, 302, 303, 305, 307])); } while (in_array($status, [300, 301, 302, 303, 305, 307]));
$status = $status ?: 404; $status = $status ?: 404;
...@@ -299,7 +299,10 @@ class ExportPDF extends TCPDF implements ExportDocument ...@@ -299,7 +299,10 @@ class ExportPDF extends TCPDF implements ExportDocument
{ {
$convurl = $url; $convurl = $url;
$url_elements = @parse_url($url); $url_elements = @parse_url($url);
$url = $url_elements['path'].'?'.$url_elements['query']; $url = $url_elements['path'];
if (isset($url_elements['query'])) {
$url .= "?{$url_elements['query']}";
}
if (mb_strpos(implode('#', $this->domains), $url_elements['host']) !== false) { if (mb_strpos(implode('#', $this->domains), $url_elements['host']) !== false) {
if (mb_strpos($url, 'dispatch.php/media_proxy?url=') !== false) { if (mb_strpos($url, 'dispatch.php/media_proxy?url=') !== false) {
$targeturl = urldecode(mb_substr($url, 4)); $targeturl = urldecode(mb_substr($url, 4));
......
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