Merge pull request #49779 from nextcloud/backport/49503/stable29

nextcloud · Dec 11, 2024 · c1451b2 · c1451b2
2 parents 274c98d + f186279
commit c1451b2
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 27 deletions.
diff --git a/apps/dav/lib/CalDAV/Schedule/IMipPlugin.php b/apps/dav/lib/CalDAV/Schedule/IMipPlugin.php
@@ -133,14 +133,6 @@ public function beforeWriteContent($uri, INode $node, $data, $modified): void {
 	 */
 	public function schedule(Message $iTipMessage) {
 
-		// do not send imip messages if external system already did
-		/** @psalm-suppress UndefinedPropertyFetch */
-		if ($iTipMessage->message?->VEVENT?->{'X-NC-DISABLE-SCHEDULING'}?->getValue() === 'true') {
-			if (!$iTipMessage->scheduleStatus) {
-				$iTipMessage->scheduleStatus = '1.0;We got the message, but iMip messages are disabled for this event';
-			}
-			return;
-		}
 		// Not sending any emails if the system considers the update insignificant
 		if (!$iTipMessage->significantChange) {
 			if (!$iTipMessage->scheduleStatus) {

diff --git a/apps/dav/lib/CalDAV/Schedule/Plugin.php b/apps/dav/lib/CalDAV/Schedule/Plugin.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @copyright Copyright (c) 2016, Roeland Jago Douma <roeland@famdouma.nl>
  * @copyright Copyright (c) 2016, Joas Schilling <coding@schilljs.com>

diff --git a/apps/dav/tests/unit/CalDAV/Schedule/IMipPluginTest.php b/apps/dav/tests/unit/CalDAV/Schedule/IMipPluginTest.php
@@ -783,23 +783,4 @@ public function testNoButtons(): void {
 		$this->plugin->schedule($message);
 		$this->assertEquals('1.1', $message->getScheduleStatus());
 	}
-
-	public function testImipDisabledForEvent(): void {
-		// construct iTip message with event and attendees
-		$calendar = new VCalendar();
-		$calendar->add('VEVENT', ['UID' => 'uid-1234']);
-		$event = $calendar->VEVENT;
-		$event->add('ORGANIZER', 'mailto:gandalf@wiz.ard');
-		$event->add('ATTENDEE', 'mailto:' . 'frodo@hobb.it', ['RSVP' => 'TRUE',  'CN' => 'Frodo']);
-		$event->add('X-NC-DISABLE-SCHEDULING', 'true');
-		$message = new Message();
-		$message->method = 'REQUEST';
-		$message->message = $calendar;
-		$message->sender = 'mailto:gandalf@wiz.ard';
-		$message->senderName = 'Mr. Wizard';
-		$message->recipient = 'mailto:' . 'frodo@hobb.it';
-
-		$this->plugin->schedule($message);
-		$this->assertEquals('1.0;We got the message, but iMip messages are disabled for this event', $message->scheduleStatus);
-	}
 }
diff --git a/apps/dav/tests/unit/CalDAV/Schedule/PluginTest.php b/apps/dav/tests/unit/CalDAV/Schedule/PluginTest.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @copyright Copyright (c) 2016 Lukas Reschke <lukas@statuscode.ch>
  *
-Original file line number
+Diff line change
@@ -1,4 +1,5 @@
     <?php
     /**
      * @copyright Copyright (c) 2016 Lukas Reschke <lukas@statuscode.ch>
      *
@@ Expand Down @@