From a41aaf90883a76ab2900d0be5ee061cb19377781 Mon Sep 17 00:00:00 2001
From: Daniel Spitzer <daniel.spitzer@inode.at>
Date: Sun, 7 Sep 2025 21:39:02 +0200
Subject: [PATCH] =?UTF-8?q?Calender=20Update=20*=20Abgesagte=20Serientermi?=
 =?UTF-8?q?ne=20werden=20nun=20auch=20ausgeblendet=20wenn=20der=20Button?=
 =?UTF-8?q?=20gedr=C3=BCckt=20wurde?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/Calendar/CalendarModel.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/application/Calendar/CalendarModel.php b/application/Calendar/CalendarModel.php
index 1a5cfeb53..50a761bd7 100644
--- a/application/Calendar/CalendarModel.php
+++ b/application/Calendar/CalendarModel.php
@@ -270,6 +270,10 @@ class CalendarModel
                     $recurrence = json_decode($data['recurrence'], true);
                     $rrule_events = json_decode($data['rrule_events'], true);
                     foreach ($rrule_events as $key => $value) {
+                        if ($r->visibleCancellation === "0" && (str_starts_with(trim($value['subject']), "Abgesagt:") || str_starts_with(trim($value['subject']), "Abgesage:") || str_starts_with(trim($value['subject']), "Canceled:"))) {
+                            unset($rrule_events[$key]);
+                            continue;
+                        }
                         $rrule_events[$key]['start'] = self::convertToSummertime(strtotime($value['start']));
                         $rrule_events[$key]['end'] = self::convertToSummertime(strtotime($value['end']));
                     }
@@ -914,7 +918,7 @@ WHERE `TimerecordingCategory`.`hourday`!='1' AND `TimerecordingCategory`.`hourda
             $allday = 0;
         } else {
             $start = $start + 7200;
-            $originalend= $end + 7200;
+            $originalend = $end + 7200;
             $end = $end + 7200 + 86400;
         }
         if ($reminder == 'NULL') {