Merge branch 'stable30' into backport/48723/stable30

.github/CODEOWNERS

@@ -2,14 +2,18 @@
 /apps/admin_audit/appinfo/info.xml            @luka-nextcloud @blizzz
 /apps/cloud_federation_api/appinfo/info.xml   @mejo-
 /apps/comments/appinfo/info.xml               @edward-ly @Pytal
-/apps/contactsinteraction/appinfo/info.xml    @kesselb @miaulalala @ChristophWurst @GretaD @hamza221 @st3iny
-/apps/dashboard/appinfo/info.xml              @julien-nc @juliushaertl
-/apps/dav/lib/CalDAV                          @ChristophWurst @miaulalala @tcitworld
-/apps/dav/lib/CardDAV                         @ChristophWurst @miaulalala @tcitworld
+/apps/contactsinteraction/appinfo/info.xml    @kesselb @SebastianKrupinski
+/apps/contactsinteraction/lib                 @kesselb @SebastianKrupinski
+/apps/contactsinteraction/tests               @kesselb @SebastianKrupinski
+/apps/dashboard/appinfo/info.xml              @julien-nc @juliusknorr
+/apps/dav/lib/CalDAV                          @st3iny @SebastianKrupinski @tcitworld
+/apps/dav/lib/CardDAV                         @hamza221 @SebastianKrupinski
+/apps/dav/tests/unit/CalDAV                   @st3iny @SebastianKrupinski @tcitworld
+/apps/dav/tests/unit/CardDAV                  @hamza221 @SebastianKrupinski
 /apps/encryption/appinfo/info.xml             @come-nc @icewind1991
 /apps/federatedfilesharing/appinfo/info.xml   @icewind1991 @danxuliu
-/apps/federation/appinfo/info.xml             @datenangebot
-/apps/files/appinfo/info.xml                  @skjnldsv @Pytal @ArtificialOwl @come-nc @artonge @icewind1991 @szaimen @susnux @Fenn-CS
+/apps/federation/appinfo/info.xml             @nfebe
+/apps/files/appinfo/info.xml                  @skjnldsv @Pytal @ArtificialOwl @come-nc @artonge @icewind1991 @szaimen @susnux @nfebe
 /apps/files_external/appinfo/info.xml         @icewind1991 @artonge
 /apps/files_reminders/appinfo/info.xml        @Pytal
 /apps/files_sharing/appinfo/info.xml          @skjnldsv @come-nc
@@ -20,14 +24,14 @@
 /apps/settings/appinfo/info.xml               @Pytal @JuliaKirschenheuter
 /apps/sharebymail/appinfo/info.xml            @Altahrim
 /apps/systemtags/appinfo/info.xml             @Antreesy @marcelklehr
-/apps/theming/appinfo/info.xml                @skjnldsv @juliushaertl
+/apps/theming/appinfo/info.xml                @skjnldsv @juliusknorr
 /apps/twofactor_backupcodes/appinfo/info.xml  @st3iny @miaulalala @ChristophWurst
 /apps/updatenotification/appinfo/info.xml     @Pytal @JuliaKirschenheuter
 /apps/user_ldap/appinfo/info.xml              @come-nc @blizzz
 /apps/user_status/appinfo/info.xml            @Antreesy @nickvergessen
-/apps/weather_status/appinfo/info.xml         @julien-nc @juliushaertl
+/apps/weather_status/appinfo/info.xml         @julien-nc @juliusknorr
 /apps/webhook_listeners/appinfo/info.xml      @come-nc @julien-nc
-/apps/workflowengine/appinfo/info.xml         @blizzz @juliushaertl
+/apps/workflowengine/appinfo/info.xml         @blizzz @juliusknorr
 
 # Frontend expertise
 /apps/files/src*                  @skjnldsv
@@ -38,7 +42,7 @@
 
 # Security team
 /resources/codesigning              @mgallien @miaulalala @nickvergessen
-/resources/config/ca-bundle.crt     @ChristophWurst @miaulalala @nickvergessen
+/resources/config/ca-bundle.crt     @miaulalala @nickvergessen
 /.drone.yml                         @nickvergessen
 
 # Two-Factor Authentication
@@ -65,6 +69,10 @@ ResponseDefinitions.php @provokateurin
 /lib/public/Talk                    @nickvergessen
 /lib/public/UserStatus              @nickvergessen
 
+# Groupware
+/build/integration/dav_features/caldav.feature    @miaulalala @st3iny @SebastianKrupinski
+/build/integration/dav_features/carddav.feature   @miaulalala @st3iny @SebastianKrupinski
+
 # Personal interest
 */Activity/*                        @nickvergessen
 */Notifications/*                   @nickvergessen

.reuse/dep5

@@ -7,6 +7,10 @@ Files: lib/l10n/*.js lib/l10n/*.json core/l10n/*.js core/l10n/*.json apps/admin_
 Copyright: 2016 ownCloud, Inc., 2016-2024 Nextcloud translators
 License: AGPL-3.0-only OR AGPL-3.0-or-later
 
+Files: lib/l10n/zh_TW.js lib/l10n/zh_TW.json core/l10n/zh_TW.js core/l10n/zh_TW.json apps/admin_audit/l10n/zh_TW.js apps/admin_audit/l10n/zh_TW.json apps/comments/l10n/zh_TW.js apps/comments/l10n/zh_TW.json apps/dav/l10n/zh_TW.js apps/dav/l10n/zh_TW.json apps/encryption/l10n/zh_TW.js apps/encryption/l10n/zh_TW.json apps/federatedfilesharing/l10n/zh_TW.js apps/federatedfilesharing/l10n/zh_TW.json apps/federation/l10n/zh_TW.js apps/federation/l10n/zh_TW.json apps/files/l10n/zh_TW.js apps/files/l10n/zh_TW.json apps/files_external/l10n/zh_TW.js apps/files_external/l10n/zh_TW.json apps/files_sharing/l10n/zh_TW.js apps/files_sharing/l10n/zh_TW.json apps/files_trashbin/l10n/zh_TW.js apps/files_trashbin/l10n/zh_TW.json apps/files_versions/l10n/zh_TW.js apps/files_versions/l10n/zh_TW.json apps/provisioning_api/l10n/zh_TW.js apps/provisioning_api/l10n/zh_TW.json apps/settings/l10n/zh_TW.js apps/settings/l10n/zh_TW.json apps/systemtags/l10n/zh_TW.js apps/systemtags/l10n/zh_TW.json apps/testing/l10n/zh_TW.js apps/testing/l10n/zh_TW.json apps/updatenotification/l10n/zh_TW.js apps/updatenotification/l10n/zh_TW.json apps/user_ldap/l10n/zh_TW.js apps/user_ldap/l10n/zh_TW.json lib/l10nm/zh_TW.js lib/l10nm/zh_TW.json
+Copyright: 2016 ownCloud, Inc., 2016-2024 Nextcloud translators, 2024 moda-l10n <https://ocf.tw/>
+License: AGPL-3.0-only OR AGPL-3.0-or-later
+
 Files: tests/data/block-aligned-plus-one.txt tests/data/block-aligned.txt tests/data/data.tar.gz tests/data/data.zip tests/data/desktopapp.png tests/data/desktopapp.svg tests/data/certificates/badCertificate.crt tests/data/certificates/expiredCertificate.crt tests/data/certificates/goodCertificate.crt tests/data/certificates/openSslTrustedCertificate.crt tests/data/integritycheck/app/AnotherFile.txt tests/data/integritycheck/app/subfolder/file.txt tests/data/integritycheck/appWithInvalidData/AnotherFile.txt tests/data/integritycheck/appWithInvalidData/UnecessaryFile apps/user_ldap/tests/Integration/data/avatar-invalid.gif apps/user_ldap/tests/Integration/data/avatar-valid.jpg apps/user_ldap/img/copy.png apps/user_ldap/img/copy.svg
 Copyright: 2015 ownCloud, Inc.
 License: AGPL-3.0-only

apps/dav/composer/composer/autoload_classmap.php

@@ -111,6 +111,7 @@
     'OCA\\DAV\\CalDAV\\Sharing\\Service' => $baseDir . '/../lib/CalDAV/Sharing/Service.php',
     'OCA\\DAV\\CalDAV\\Status\\StatusService' => $baseDir . '/../lib/CalDAV/Status/StatusService.php',
     'OCA\\DAV\\CalDAV\\TimezoneService' => $baseDir . '/../lib/CalDAV/TimezoneService.php',
+    'OCA\\DAV\\CalDAV\\TipBroker' => $baseDir . '/../lib/CalDAV/TipBroker.php',
     'OCA\\DAV\\CalDAV\\Trashbin\\DeletedCalendarObject' => $baseDir . '/../lib/CalDAV/Trashbin/DeletedCalendarObject.php',
     'OCA\\DAV\\CalDAV\\Trashbin\\DeletedCalendarObjectsCollection' => $baseDir . '/../lib/CalDAV/Trashbin/DeletedCalendarObjectsCollection.php',
     'OCA\\DAV\\CalDAV\\Trashbin\\Plugin' => $baseDir . '/../lib/CalDAV/Trashbin/Plugin.php',

apps/dav/composer/composer/autoload_static.php

@@ -126,6 +126,7 @@ class ComposerStaticInitDAV
         'OCA\\DAV\\CalDAV\\Sharing\\Service' => __DIR__ . '/..' . '/../lib/CalDAV/Sharing/Service.php',
         'OCA\\DAV\\CalDAV\\Status\\StatusService' => __DIR__ . '/..' . '/../lib/CalDAV/Status/StatusService.php',
         'OCA\\DAV\\CalDAV\\TimezoneService' => __DIR__ . '/..' . '/../lib/CalDAV/TimezoneService.php',
+        'OCA\\DAV\\CalDAV\\TipBroker' => __DIR__ . '/..' . '/../lib/CalDAV/TipBroker.php',
         'OCA\\DAV\\CalDAV\\Trashbin\\DeletedCalendarObject' => __DIR__ . '/..' . '/../lib/CalDAV/Trashbin/DeletedCalendarObject.php',
         'OCA\\DAV\\CalDAV\\Trashbin\\DeletedCalendarObjectsCollection' => __DIR__ . '/..' . '/../lib/CalDAV/Trashbin/DeletedCalendarObjectsCollection.php',
         'OCA\\DAV\\CalDAV\\Trashbin\\Plugin' => __DIR__ . '/..' . '/../lib/CalDAV/Trashbin/Plugin.php',

apps/dav/l10n/ar.js

@@ -251,9 +251,9 @@ OC.L10N.register(
     "Failed to clear your absence settings" : "تعذّر محو إعداداتك للغياب",
     "Time zone:" : "منطقة زمنية:",
     "to" : "إلى",
-    "Delete slot" : "حذف فُرَضَةٍ slot زمنيّةٍ",
+    "Delete slot" : "حذف الخانة الزمنية",
     "No working hours set" : "لم يتم تحديد ساعات العمل",
-    "Add slot" : "إضافة فترة زمنية",
+    "Add slot" : "إضافة خانة زمنية",
     "Weekdays" : "أيام الأسبوع",
     "Pick a start time for {dayName}" : "إختَر وقت البدء ليوم {dayName}",
     "Pick a end time for {dayName}" : "إختَر وقت الانتهاء ليوم {dayName}",

apps/dav/l10n/ar.json

@@ -249,9 +249,9 @@
     "Failed to clear your absence settings" : "تعذّر محو إعداداتك للغياب",
     "Time zone:" : "منطقة زمنية:",
     "to" : "إلى",
-    "Delete slot" : "حذف فُرَضَةٍ slot زمنيّةٍ",
+    "Delete slot" : "حذف الخانة الزمنية",
     "No working hours set" : "لم يتم تحديد ساعات العمل",
-    "Add slot" : "إضافة فترة زمنية",
+    "Add slot" : "إضافة خانة زمنية",
     "Weekdays" : "أيام الأسبوع",
     "Pick a start time for {dayName}" : "إختَر وقت البدء ليوم {dayName}",
     "Pick a end time for {dayName}" : "إختَر وقت الانتهاء ليوم {dayName}",

apps/dav/l10n/es.js

@@ -72,9 +72,25 @@ OC.L10N.register(
     "Description: %s" : "Descripción: %s",
     "Where: %s" : "Lugar: %s",
     "%1$s via %2$s" : "%1$s vía %2$s",
+    "In a %1$s on %2$s for the entire day" : "En un(a) %1$s el %2$s todo el día",
+    "In a %1$s on %2$s between %3$s - %4$s" : "En un(a) %1$s el %2$s entre las %3$s - %4$s",
+    "In %1$s %2$s on %3$s for the entire day" : "En %1$s %2$s el %3$s todo el día",
+    "In %1$s %2$s on %3$s between %4$s - %5$s" : "En %1$s %2$s el %3$s entre las %4$s - %5$s",
+    "Could not generate when statement" : "No se ha podido general la declaración de cuándo",
     "Every Day for the entire day" : "Todos los días durante todo el día",
+    "Every Day for the entire day until %1$s" : "Cada day todo el día hasta el %1$s",
     "Every Day between %1$s - %2$s" : "Todos los días entre %1$s - %2$s",
     "Every Day between %1$s - %2$s until %3$s" : "Todos los días entre %1$s - %2$s hasta %3$s",
+    "Every %1$d Days for the entire day" : "Cada %1$d días todo el día",
+    "Every %1$d Days for the entire day until %2$s" : "Cada %1$d días todo el día hasta el %2$s",
+    "Every %1$d Days between %2$s - %3$s" : "Cada %1$d días entre las %2$s y %3$s",
+    "Every %1$d Days between %2$s - %3$s until %4$s" : "Cada %1$d días entre las %2$s y %3$s hasta el %4$s",
+    "Could not generate event recurrence statement" : "No se ha podido generar la declaración de recurrencia",
+    "Every Week on %1$s for the entire day" : "Cada semana el %1$s todo el día",
+    "Every Week on %1$s for the entire day until %2$s" : "Cada %1$s días todo el día hasta el %2$s",
+    "Every Week on %1$s between %2$s - %3$s" : "Cada semana el %1$s entre %2$s y %3$s",
+    "Every Week on %1$s between %2$s - %3$s until %4$s" : "Cada semana el %1$s entre %2$s y %3$s hasta el %4$s",
+    "Every %1$d Weeks on %2$s for the entire day" : "Cada %1$d semanas el %2$s todo el día",
     "Cancelled: %1$s" : "Cancelado: %1$s",
     "\"%1$s\" has been canceled" : "\"%1$s\" ha sido cancelada",
     "Re: %1$s" : "Re: %1$s",

apps/dav/l10n/es.json

@@ -70,9 +70,25 @@
     "Description: %s" : "Descripción: %s",
     "Where: %s" : "Lugar: %s",
     "%1$s via %2$s" : "%1$s vía %2$s",
+    "In a %1$s on %2$s for the entire day" : "En un(a) %1$s el %2$s todo el día",
+    "In a %1$s on %2$s between %3$s - %4$s" : "En un(a) %1$s el %2$s entre las %3$s - %4$s",
+    "In %1$s %2$s on %3$s for the entire day" : "En %1$s %2$s el %3$s todo el día",
+    "In %1$s %2$s on %3$s between %4$s - %5$s" : "En %1$s %2$s el %3$s entre las %4$s - %5$s",
+    "Could not generate when statement" : "No se ha podido general la declaración de cuándo",
     "Every Day for the entire day" : "Todos los días durante todo el día",
+    "Every Day for the entire day until %1$s" : "Cada day todo el día hasta el %1$s",
     "Every Day between %1$s - %2$s" : "Todos los días entre %1$s - %2$s",
     "Every Day between %1$s - %2$s until %3$s" : "Todos los días entre %1$s - %2$s hasta %3$s",
+    "Every %1$d Days for the entire day" : "Cada %1$d días todo el día",
+    "Every %1$d Days for the entire day until %2$s" : "Cada %1$d días todo el día hasta el %2$s",
+    "Every %1$d Days between %2$s - %3$s" : "Cada %1$d días entre las %2$s y %3$s",
+    "Every %1$d Days between %2$s - %3$s until %4$s" : "Cada %1$d días entre las %2$s y %3$s hasta el %4$s",
+    "Could not generate event recurrence statement" : "No se ha podido generar la declaración de recurrencia",
+    "Every Week on %1$s for the entire day" : "Cada semana el %1$s todo el día",
+    "Every Week on %1$s for the entire day until %2$s" : "Cada %1$s días todo el día hasta el %2$s",
+    "Every Week on %1$s between %2$s - %3$s" : "Cada semana el %1$s entre %2$s y %3$s",
+    "Every Week on %1$s between %2$s - %3$s until %4$s" : "Cada semana el %1$s entre %2$s y %3$s hasta el %4$s",
+    "Every %1$d Weeks on %2$s for the entire day" : "Cada %1$d semanas el %2$s todo el día",
     "Cancelled: %1$s" : "Cancelado: %1$s",
     "\"%1$s\" has been canceled" : "\"%1$s\" ha sido cancelada",
     "Re: %1$s" : "Re: %1$s",

apps/dav/l10n/ja.js

@@ -64,7 +64,7 @@ OC.L10N.register(
     "_%n month_::_%n months_" : ["%nヶ月"],
     "_%n day_::_%n days_" : ["%n日"],
     "_%n hour_::_%n hours_" : ["%n時間"],
-    "_%n minute_::_%n minutes_" : ["%n秒"],
+    "_%n minute_::_%n minutes_" : ["%n分钟"],
     "%s (in %s)" : "%s（%s後）",
     "%s (%s ago)" : "%s（%s前）",
     "Calendar: %s" : "カレンダー:%s",

apps/dav/l10n/ja.json

@@ -62,7 +62,7 @@
     "_%n month_::_%n months_" : ["%nヶ月"],
     "_%n day_::_%n days_" : ["%n日"],
     "_%n hour_::_%n hours_" : ["%n時間"],
-    "_%n minute_::_%n minutes_" : ["%n秒"],
+    "_%n minute_::_%n minutes_" : ["%n分钟"],
     "%s (in %s)" : "%s（%s後）",
     "%s (%s ago)" : "%s（%s前）",
     "Calendar: %s" : "カレンダー:%s",

apps/dav/lib/CalDAV/Activity/Provider/Base.php

@@ -52,14 +52,14 @@ protected function generateCalendarParameter($data, IL10N $l) {
 			$data['name'] === CalDavBackend::PERSONAL_CALENDAR_NAME) {
 			return [
 				'type' => 'calendar',
-				'id' => $data['id'],
+				'id' => (string)$data['id'],
 				'name' => $l->t('Personal'),
 			];
 		}
 
 		return [
 			'type' => 'calendar',
-			'id' => $data['id'],
+			'id' => (string)$data['id'],
 			'name' => $data['name'],
 		];
 	}
@@ -72,7 +72,7 @@ protected function generateCalendarParameter($data, IL10N $l) {
 	protected function generateLegacyCalendarParameter($id, $name) {
 		return [
 			'type' => 'calendar',
-			'id' => $id,
+			'id' => (string)$id,
 			'name' => $name,
 		];
 	}

apps/dav/lib/CalDAV/Schedule/IMipPlugin.php

@@ -109,8 +109,16 @@ public function beforeWriteContent($uri, INode $node, $data, $modified): void {
 	 * @return void
 	 */
 	public function schedule(Message $iTipMessage) {
-		// Not sending any emails if the system considers the update
-		// insignificant.
+
+		// 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) {
 				$iTipMessage->scheduleStatus = '1.0;We got the message, but it\'s not significant enough to warrant an email';

apps/dav/lib/CalDAV/Schedule/Plugin.php

@@ -10,6 +10,7 @@
 use OCA\DAV\CalDAV\Calendar;
 use OCA\DAV\CalDAV\CalendarHome;
 use OCA\DAV\CalDAV\DefaultCalendarValidator;
+use OCA\DAV\CalDAV\TipBroker;
 use OCP\IConfig;
 use Psr\Log\LoggerInterface;
 use Sabre\CalDAV\ICalendar;
@@ -84,6 +85,13 @@ public function initialize(Server $server) {
 		);
 	}
 
+	/**
+	 * Returns an instance of the iTip\Broker.
+	 */
+	protected function createITipBroker(): TipBroker {
+		return new TipBroker();
+	}
+
 	/**
 	 * Allow manual setting of the object change URL
 	 * to support public write
@@ -167,7 +175,7 @@ public function calendarObjectChange(RequestInterface $request, ResponseInterfac
 			$calendarNode = $this->server->tree->getNodeForPath($calendarPath);
 			// extract addresses for owner
 			$addresses = $this->getAddressesForPrincipal($calendarNode->getOwner());
-			// determain if request is from a sharee
+			// determine if request is from a sharee
 			if ($calendarNode->isShared()) {
 				// extract addresses for sharee and add to address collection
 				$addresses = array_merge(