From 4410d7e94a6dfb28b186c06386196481952d5d5c Mon Sep 17 00:00:00 2001 From: Florian Schlichting Date: Thu, 11 May 2017 22:59:17 +0200 Subject: [PATCH] dont put caldav.php in special URLs --- htdocs/always.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/htdocs/always.php b/htdocs/always.php index 962ed0c9..f594c25c 100644 --- a/htdocs/always.php +++ b/htdocs/always.php @@ -367,6 +367,11 @@ function ConstructURL( $partial_path, $force_script = false ) { $url = str_replace( 'caldav.php/caldav.php', 'caldav.php', $url ); // Ensure we don't double any 'caldav.php/' } + // don't put the script name in special URLs, these would not be valid resources + $url = str_replace('/principals/users/caldav.php/', '/principals/users/', $url ); + $url = str_replace('/principals/resources/caldav.php/', '/principals/resources/', $url ); + $url = str_replace('/__uids__/caldav.php/', '/__uids__/', $url ); + return $url; }