From 9e13999040c6cee62e4cb2169a1ca7cdd90b25ef Mon Sep 17 00:00:00 2001
From: David Siegfried <david.siegfried@uni-vechta.de>
Date: Sat, 28 Sep 2024 10:44:13 +0000
Subject: [PATCH] fixes add files via url, fixes #4644
Closes #4644
Merge request studip/studip!3456
---
lib/filesystem/URLFile.php | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/lib/filesystem/URLFile.php b/lib/filesystem/URLFile.php
index 4794a3f2f29..39de08b0aeb 100644
--- a/lib/filesystem/URLFile.php
+++ b/lib/filesystem/URLFile.php
@@ -15,14 +15,14 @@ class URLFile extends StandardFile
$file = new File();
$file['name'] = $data['name'] ?: ($meta['filename'] ?: 'unknown');
- $file['size'] = $meta['Content-Length'] ?: '0';
- $file['mime_type'] = $meta['Content-Type'] ? mb_strstr($meta['Content-Type'], ';', true) : get_mime_type($file['name']);
+ $file['size'] = $meta['Content-Length'] ?? '0';
+ $file['mime_type'] = !empty($meta['Content-Type']) ? mb_strstr($meta['Content-Type'], ';', true) : get_mime_type($file['name']);
$file['metadata'] = [
'url' => $data['url'],
- 'access_type' => $data['access_type'] ?: "redirect"
+ 'access_type' => $data['access_type'] ?? "redirect"
];
$file['user_id'] = $user_id;
- $file['author_name'] = $data['author_name'] ?: get_fullname($file['user_id']);
+ $file['author_name'] = $data['author_name'] ?? get_fullname($file['user_id']);
$file['filetype'] = get_called_class();
$file->store();
@@ -30,8 +30,8 @@ class URLFile extends StandardFile
$fileref['file_id'] = $file->getId();
$fileref['name'] = $file['name'];
$fileref['downloads'] = 0;
- $fileref['description'] = $data['description'] ?: "";
- $fileref['content_terms_of_use_id'] = $data['content_terms_of_use_id'] ?: ContentTermsOfUse::findDefault()->id;
+ $fileref['description'] = $data['description'] ?? '';
+ $fileref['content_terms_of_use_id'] = $data['content_terms_of_use_id'] ?? ContentTermsOfUse::findDefault()->id;
$fileref['user_id'] = $user_id;
return new static($fileref);
--
GitLab