From f9932b02fee0a8bd89968632d211106bead8e481 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Wed, 4 Dec 2024 08:10:59 +0000
Subject: don't count own downloads and downloads for files in homework
 folders, fixes #4591

Closes #4591

Merge request studip/studip!3414
---
 app/views/files/index.php | 3 ++-
 lib/models/FileRef.php    | 7 +++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/app/views/files/index.php b/app/views/files/index.php
index 6bf28f7..5645d4e 100644
--- a/app/views/files/index.php
+++ b/app/views/files/index.php
@@ -7,7 +7,8 @@
         }
     }
 
-    $show_downloads = Config::get()->DISPLAY_DOWNLOAD_COUNTER === 'always';
+    $show_downloads = Config::get()->DISPLAY_DOWNLOAD_COUNTER === 'always'
+                   && !($topFolder instanceof HomeworkFolder);
     $vue_breadcrumbs = [];
     $folder = $topFolder;
     do {
diff --git a/lib/models/FileRef.php b/lib/models/FileRef.php
index 6bffbf3..2a7f485 100644
--- a/lib/models/FileRef.php
+++ b/lib/models/FileRef.php
@@ -223,6 +223,13 @@ class FileRef extends SimpleORMap implements PrivacyObject, FeedbackRange
      */
     public function incrementDownloadCounter()
     {
+        if (
+            $this->user_id === User::findCurrent()->id
+            || $this->folder instanceof HomeworkFolder
+        ) {
+            return 0;
+        }
+
         $this->downloads += 1;
         if (!$this->isNew()) {
             $where_query = join(' AND ' , $this->getWhereQuery());
-- 
cgit v1.0