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

Get the collection_id into the request variable.

Browse Source
This commit is contained in:
Andrew McMillan 2008-01-26 21:59:02 +13:00
parent fe49f7cb9e
commit fd007a4ca7
1 changed files with 26 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
inc/CalDAVRequest.php
View File

@ -154,21 +154,6 @@ class CalDAVRequest
$this->DoResponse( 400, translate("The calendar path contains illegal characters.") ); $this->DoResponse( 400, translate("The calendar path contains illegal characters.") );
} }
/**
* RFC2518, 5.2: URL pointing to a collection SHOULD end in '/', and if it does not then
* we SHOULD return a Content-location header with the correction...
*/
if ( !preg_match( '#/$#', $this->path ) ) {
dbg_error_log( "caldav", "Checking whether path might be a collection" );
$qry = new PgQuery( "SELECT count(1) AS is_collection FROM collection WHERE dav_name = ?;", $this->path . '/');
if ( $qry->Exec('caldav') && $qry->rows == 1 && ($row = $qry->Fetch()) && $row->is_collection == 1 ) {
dbg_error_log( "caldav", "Path is actually a collection - sending Content-Location header." );
$this->path .= '/';
header( "Content-Location: $this->path" );
$this->_is_collection = true;
}
}
$this->user_no = $session->user_no; $this->user_no = $session->user_no;
$this->username = $session->username; $this->username = $session->username;
@ -180,6 +165,32 @@ class CalDAVRequest
if ( isset($this->principal->username)) $this->username = $this->principal->username; if ( isset($this->principal->username)) $this->username = $this->principal->username;
if ( isset($this->principal->by_email)) $this->by_email = true; if ( isset($this->principal->by_email)) $this->by_email = true;
/**
* RFC2518, 5.2: URL pointing to a collection SHOULD end in '/', and if it does not then
* we SHOULD return a Content-location header with the correction...
*/
if ( !preg_match( '#/$#', $this->path ) ) {
dbg_error_log( "caldav", "Checking whether path might be a collection" );
$qry = new PgQuery( "SELECT collection_id FROM collection WHERE user_no = ? AND dav_name = ?;", $this->user_no, $this->path . '/');
if ( $qry->Exec('caldav') && $qry->rows == 1 && ($row = $qry->Fetch()) ) {
dbg_error_log( "caldav", "Path is actually a collection - sending Content-Location header." );
$this->path .= '/';
header( "Content-Location: $this->path" );
$this->_is_collection = true;
$this->collection_id = $row->collection_id;
}
}
/**
* Get the ID of the collection we are referring to
*/
if ( !isset($this->collection_id) && preg_match( '#^(/.+/.+/)[^/]*$#', $this->path ) ) {
$qry = new PgQuery( "SELECT collection_id FROM collection WHERE user_no = ? AND dav_name = ?;", $this->user_no, $this->path );
if ( $qry->Exec('caldav') && $qry->rows == 1 && ($row = $qry->Fetch()) ) {
$this->collection_id = $row->collection_id;
}
}
/** /**
* Evaluate our permissions for accessing the target * Evaluate our permissions for accessing the target