Add all properties while creating a subscription (#25318)

Fixes #24469

1 files changed, 15 insertions, 10 deletions

diff --git a/apps/dav/lib/CalDAV/CalDavBackend.php b/apps/dav/lib/CalDAV/CalDavBackend.php
index ce494082976..565ad0ec663 100644
--- a/apps/dav/lib/CalDAV/CalDavBackend.php
+++ b/apps/dav/lib/CalDAV/CalDavBackend.php
@@ -1079,22 +1079,27 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription
 			'lastmodified' => time(),
 		];
 
-		foreach($this->subscriptionPropertyMap as $xmlName=>$dbName) {
-			if (isset($properties[$xmlName])) {
+		$propertiesBoolean = ['striptodos', 'stripalarms', 'stripattachments'];
 
-				$values[$dbName] = $properties[$xmlName];
-				$fieldNames[] = $dbName;
+		foreach($this->subscriptionPropertyMap as $xmlName=>$dbName) {
+			if (array_key_exists($xmlName, $properties)) {
+					$values[$dbName] = $properties[$xmlName];
+					if (in_array($dbName, $propertiesBoolean)) {
+						$values[$dbName] = true;
+				}
 			}
 		}
 
+		$valuesToInsert = array();
+
 		$query = $this->db->getQueryBuilder();
+
+		foreach (array_keys($values) as $name) {
+			$valuesToInsert[$name] = $query->createNamedParameter($values[$name]);
+		}
+
 		$query->insert('calendarsubscriptions')
-			->values([
-				'principaluri' => $query->createNamedParameter($values['principaluri']),
-				'uri'          => $query->createNamedParameter($values['uri']),
-				'source'       => $query->createNamedParameter($values['source']),
-				'lastmodified' => $query->createNamedParameter($values['lastmodified']),
-			])
+			->values($valuesToInsert)
 			->execute();
 
 		return $this->db->lastInsertId('*PREFIX*calendarsubscriptions');