Merge branch 'main' into issue-3911issue-3911

1 files changed, 16 insertions, 9 deletions

diff --git a/lib/filesystem/TimedFolder.php b/lib/filesystem/TimedFolder.php
index 442c084..0c159d6 100644
--- a/lib/filesystem/TimedFolder.php
+++ b/lib/filesystem/TimedFolder.php
@@ -81,7 +81,7 @@ class TimedFolder extends PermissionEnabledFolder
                 ($this->end_time == 0 || $this->end_time >= $now)
                 ||
                 $GLOBALS['perm']->have_studip_perm($this->must_have_perm, $this->range_id, $user_id)) &&
-            parent::isReadable($user_id);
+            StandardFolder::isReadable($user_id);
     }
 
     public function isWritable($user_id = null)
@@ -96,6 +96,19 @@ class TimedFolder extends PermissionEnabledFolder
     }
 
     /**
+     * Determines if a user may see the file.
+     * @param FileRef|string $fileref_or_id
+     * @param string $user_id
+     * @return bool
+     */
+    public function isFileVisible($fileref_or_id, $user_id)
+    {
+        $fileref = FileRef::toObject($fileref_or_id);
+
+        return $fileref->user_id === $user_id || parent::isReadable($user_id);
+    }
+
+    /**
      * This function returns the suitable Icon for this folder type (TimedFolder)
      *
      * @return Icon The icon object for this folder type
@@ -132,7 +145,7 @@ class TimedFolder extends PermissionEnabledFolder
     /**
      * Returns the description template for a instance of a TimedFolder type.
      *
-     * @return Flexi_Template A description template for a instance of the type TimedFolder
+     * @return Flexi\Template A description template for a instance of the type TimedFolder
      */
     public function getDescriptionTemplate()
     {
@@ -143,19 +156,13 @@ class TimedFolder extends PermissionEnabledFolder
         $template->folder     = $this;
         $template->folderdata = $this->folderdata;
 
-        if (!Seminar_Perm::get()->have_studip_perm('tutor', $this->range_id) &&
-                $this->isWritable($GLOBALS['user']->id) && !$this->isReadable($GLOBALS['user']->id)) {
-            $files = new SimpleCollection($this->getFiles());
-            $template->own_files = $files->findBy('user_id', $GLOBALS['user']->id)->orderBy('name');
-        }
-
         return $template;
     }
 
     /**
      * Returns the edit template for this folder type.
      *
-     * @return Flexi_Template
+     * @return Flexi\Template
      */
     public function getEditTemplate()
     {