Merge pull request #279 from nextcloud/fix/calendar-names

lukasdotcom · web-flow · commit 5b6b60165fd6 · 2025-09-15T17:29:40.000+02:00
fix: remove url encoding from calendar names
diff --git a/lib/Service/GoogleCalendarAPIService.php b/lib/Service/GoogleCalendarAPIService.php
@@ -174,11 +174,13 @@ public function importCalendar(string $userId, string $calId, string $calName, ?
 			$params['{http://apple.com/ns/ical/}calendar-color'] = $color;
 		}
 
-		$newCalName = urlencode(trim($calName) . ' (' . $this->l10n->t('Google Calendar import') . ')');
+		$newCalName = trim($calName) . ' (' . $this->l10n->t('Google Calendar import') . ')';
+		$params['{DAV:}displayname'] = $newCalName;
+
 		$ncCalId = $this->calendarExists($userId, $newCalName);
 		$calendarIsNew = is_null($ncCalId);
 		if (is_null($ncCalId)) {
-			$ncCalId = $this->caldavBackend->createCalendar('principals/users/' . $userId, $newCalName, $params);
+			$ncCalId = $this->caldavBackend->createCalendar('principals/users/' . $userId, urlencode($newCalName), $params);
 		}
 
 		// get color list

Original file line number	Diff line number	Diff line change
`@@ -174,11 +174,13 @@ public function importCalendar(string $userId, string $calId, string $calName, ?`
`174`	`174`	`$params['{http://apple.com/ns/ical/}calendar-color'] = $color;`
`175`	`175`	`}`
`176`	`176`
`177`		`- $newCalName = urlencode(trim($calName) . ' (' . $this->l10n->t('Google Calendar import') . ')');`
	`177`	`+ $newCalName = trim($calName) . ' (' . $this->l10n->t('Google Calendar import') . ')';`
	`178`	`+ $params['{DAV:}displayname'] = $newCalName;`
	`179`	`+`
`178`	`180`	`$ncCalId = $this->calendarExists($userId, $newCalName);`
`179`	`181`	`$calendarIsNew = is_null($ncCalId);`
`180`	`182`	`if (is_null($ncCalId)) {`
`181`		`- $ncCalId = $this->caldavBackend->createCalendar('principals/users/' . $userId, $newCalName, $params);`
	`183`	`+ $ncCalId = $this->caldavBackend->createCalendar('principals/users/' . $userId, urlencode($newCalName), $params);`
`182`	`184`	`}`
`183`	`185`
`184`	`186`	`// get color list`