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

Don't match parameterised url parts as part of collection name.

Browse Source
This commit is contained in:
Andrew McMillan 2012-07-09 00:50:46 +12:00
parent fed84f8daf
commit 07bce5f8bd
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
inc/CalDAVRequest.php
View File

@ -404,7 +404,7 @@ EOSQL;
$this->collection_path = $this->path; $this->collection_path = $this->path;
$this->_is_principal = true; $this->_is_principal = true;
} }
else if ( preg_match( '#^(/[^/]+)/?$#', $this->path, $matches) || preg_match( '#^(/principals/[^/]+/[^/]+)/?$#', $this->path, $matches) ) { else if ( preg_match( '#^(/[^/?]+)/?$#', $this->path, $matches) || preg_match( '#^(/principals/[^/]+/[^/]+)/?$#', $this->path, $matches) ) {
$this->collection_id = -1; $this->collection_id = -1;
$this->collection_path = $matches[1].'/'; // Enforce trailling '/' $this->collection_path = $matches[1].'/'; // Enforce trailling '/'
$this->collection_type = 'principal'; $this->collection_type = 'principal';
@ -412,7 +412,7 @@ EOSQL;
if ( $this->collection_path == $this->path."/" ) { if ( $this->collection_path == $this->path."/" ) {
$this->path .= '/'; $this->path .= '/';
dbg_error_log( "caldav", "Path is actually a collection - sending Content-Location header." ); dbg_error_log( "caldav", "Path is actually a collection - sending Content-Location header." );
header( "Content-Location: ".ConstructURL($this->path) ); header( "Content-Loca3tion: ".ConstructURL($this->path) );
} }
if ( preg_match( '#^(/principals/[^/]+/[^/]+)/?$#', $this->path, $matches) ) { if ( preg_match( '#^(/principals/[^/]+/[^/]+)/?$#', $this->path, $matches) ) {
// Force a depth of 0 on these, which are at the wrong URL. // Force a depth of 0 on these, which are at the wrong URL.