nik/davical
1
0
Fork 0
mirror of https://gitlab.com/davical-project/davical.git synced 2026-03-09 07:23:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Correctly test for repeated caldav.php in URL.

Browse Source
This commit is contained in:
Andrew McMillan 2012-07-08 11:53:21 +12:00
parent 2c12586a42
commit 2f82e69cfb
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/always.php
View File

@ -315,7 +315,7 @@ function ConstructURL( $partial_path, $force_script = false ) {
$url = preg_replace( '#^(https?://.+)//#', '$1/', $url ); // Ensure we don't double any '/'
$url = preg_replace('#^https?://[^/]+#', '', $url ); // Remove any protocol + hostname portion
if ( strstr($url, 'caldav.php/caldav.php') ) {
if ( strstr($url, 'caldav.php/caldav.php') !== false ) {
trace_bug('Duplicated caldav.php/ in URL "%s" from partial_path=%s, force_script=%s', $url, $partial_path, ($force_script?'true':'false'));
$url = str_replace( 'caldav.php/caldav.php', 'caldav.php', $url ); // Ensure we don't double any 'caldav.php/'
}

2
inc/always.php.in
View File

@ -315,7 +315,7 @@ function ConstructURL( $partial_path, $force_script = false ) {
$url = preg_replace( '#^(https?://.+)//#', '$1/', $url ); // Ensure we don't double any '/'
$url = preg_replace('#^https?://[^/]+#', '', $url ); // Remove any protocol + hostname portion
if ( strstr($url, 'caldav.php/caldav.php') ) {
if ( strstr($url, 'caldav.php/caldav.php') !== false ) {
trace_bug('Duplicated caldav.php/ in URL "%s" from partial_path=%s, force_script=%s', $url, $partial_path, ($force_script?'true':'false'));
$url = str_replace( 'caldav.php/caldav.php', 'caldav.php', $url ); // Ensure we don't double any 'caldav.php/'
}