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

Further cases in rewrite of URL parsing.

Browse Source
This commit is contained in:
Andrew McMillan 2008-10-26 01:48:09 +13:00
parent 1b02c0c567
commit 04bd671111
1 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
inc/CalDAVRequest.php
View File

@ -211,8 +211,6 @@ class CalDAVRequest
header( "Content-Location: $this->path" );
}
if ( $row->dav_name == $this->path ) $this->_is_collection = true;
$this->collection_id = $row->collection_id;
$this->collection_path = $row->path;
$this->collection = $row;
@ -235,6 +233,24 @@ EOSQL;
$this->collection = $row;
}
}
else if ( preg_match( '#^(/[^/]+)/?$#', $this->path, $matches) ) {
$this->collection_id = -1;
$this->collection_path = $matches[1].'/'; // Enforce trailling '/'
$this->collection_type = 'principal';
$this->_is_principal = true;
if ( $this->collection_path == $this->path."/" ) {
$this->path .= '/';
dbg_error_log( "caldav", "Path is actually a collection - sending Content-Location header." );
header( "Content-Location: $this->path" );
}
}
else if ( $this->path == '/' ) {
$this->collection_id = -1;
$this->collection_path = '/';
$this->collection_type = 'root';
}
if ( $this->collection_path == $this->path ) $this->_is_collection = true;
dbg_error_log( "caldav", " Collection '%s' is %d, type %s", $this->collection_path, $this->collection_id, $this->collection_type );
/**
@ -261,6 +277,7 @@ EOSQL;
xml_parser_set_option ( $xml_parser, XML_OPTION_CASE_FOLDING, 0 );
xml_parse_into_struct( $xml_parser, $this->raw_post, $this->xml_tags );
xml_parser_free($xml_parser);
dbg_error_log( "caldav", " Parsed incoming XML request body." );
}
/**