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

Refactor our calculation of the collection URL applying to this request.

Browse Source
This commit is contained in:
Andrew McMillan 2008-10-25 20:35:07 +13:00
parent 3acdc1eb7f
commit ceb1586f03
1 changed files with 63 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
inc/CalDAVRequest.php
View File

@ -49,6 +49,12 @@ class CalDAVRequest
*/ */
var $principal; var $principal;
/**
* The 'current_user_principal_xml' the DAV:current-user-principal answer. An
* XMLElement object with an <href> or <unauthenticated> fragment.
*/
var $current_user_principal_xml;
/** /**
* The user agent making the request. * The user agent making the request.
*/ */
@ -173,49 +179,46 @@ class CalDAVRequest
$this->user_no = $session->user_no; $this->user_no = $session->user_no;
$this->username = $session->username; $this->username = $session->username;
if ( $session->user_no > 0 ) {
/** $this->current_user_principal_url = new XMLElement('href', ConstructURL('/'.$session->username.'/') );
* Extract the user whom we are accessing }
*/ else {
$this->principal = new CalDAVPrincipal( array( "path" => $this->path, "options" => $this->options ) ); $this->current_user_principal_url = new XMLElement('unauthenticated' );
if ( isset($this->principal->user_no) ) $this->user_no = $this->principal->user_no; }
if ( isset($this->principal->username)) $this->username = $this->principal->username;
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 * 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... * we SHOULD return a Content-location header with the correction...
*
* We therefore look for a collection which matches one of the following URLs:
* - The exact request.
* - If the exact request, doesn't end in '/', then the request URL with a '/' appended
* - The request URL truncated to the last '/'
* The collection URL for this request is therefore the longest row in the result, so we
* can "... ORDER BY LENGTH(dav_name) DESC LIMIT 1"
*/ */
$sql = "SELECT * FROM collection WHERE dav_name = ".qpg($this->path);
if ( !preg_match( '#/$#', $this->path ) ) { if ( !preg_match( '#/$#', $this->path ) ) {
dbg_error_log( "caldav", "Checking whether path might be a collection" ); $sql .= " OR dav_name = ".qpg(preg_replace( '#[^/]*$#', '', $this->path));
$qry = new PgQuery( "SELECT collection_id FROM collection WHERE user_no = ? AND dav_name = ?;", $this->user_no, $this->path . '/'); $sql .= " OR dav_name = ".qpg($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;
$this->collection_path = $this->path;
} }
$sql .= "ORDER BY LENGTH(dav_name) DESC LIMIT 1";
$qry = new PgQuery( $sql );
if ( $qry->Exec('caldav') && $qry->rows == 1 && ($row = $qry->Fetch()) ) {
if ( $row->dav_name == $this->path."/" ) {
$this->path = $row->dav_name;
dbg_error_log( "caldav", "Path is actually a collection - sending Content-Location header." );
header( "Content-Location: $this->path" );
} }
/** if ( $row->dav_name == $this->path ) $this->_is_collection = true;
* Get the ID of the collection we are referring to
*/
if ( preg_match( '#^(/.+/.+/)[^/]*$#', $this->path, $matches ) ) {
$this->collection_type = 'calendar';
if ( preg_match( '#^(/[^/]+/\.(in|out)/)[^/]*$#', $this->path, $matches ) ) {
$this->collection_type = $matches[2];
}
if ( ! isset($this->collection_id) ) {
$qry = new PgQuery( "SELECT collection_id FROM collection WHERE user_no = ? AND dav_name = ?;",
($this->collection_type == 'calendar' ? $this->user_no : $session->user_no), $matches[1] );
if ( $qry->Exec('caldav') && $qry->rows == 1 && ($row = $qry->Fetch()) ) {
$this->collection_id = $row->collection_id; $this->collection_id = $row->collection_id;
$this->collection_path = $matches[1]; $this->collection_path = $row->path;
$this->collection = $row;
} }
else if ( preg_match( '#^((/[^/]+/)\.(in|out)/)[^/]*$#', $this->path, $matches ) ) { else if ( preg_match( '#^((/[^/]+/)\.(in|out)/)[^/]*$#', $this->path, $matches ) ) {
// Request is for a scheduling inbox or outbox (or something inside one) and we should auto-create it // The request is for a scheduling inbox or outbox (or something inside one) and we should auto-create it
$displayname = $session->fullname . ($matches[3] == 'in' ? ' Inbox' : ' Outbox'); $displayname = $session->fullname . ($matches[3] == 'in' ? ' Inbox' : ' Outbox');
$sql = <<<EOSQL $sql = <<<EOSQL
INSERT INTO collection ( user_no, parent_container, dav_name, dav_displayname, is_calendar, created, modified ) INSERT INTO collection ( user_no, parent_container, dav_name, dav_displayname, is_calendar, created, modified )
@ -225,16 +228,23 @@ EOSQL;
$qry->Exec('caldav'); $qry->Exec('caldav');
dbg_error_log( "caldav", "Created new collection as '$displayname'." ); dbg_error_log( "caldav", "Created new collection as '$displayname'." );
$qry = new PgQuery( "SELECT collection_id FROM collection WHERE user_no = ? AND dav_name = ?;", $session->user_no, $matches[1] ); $qry = new PgQuery( "SELECT * FROM collection WHERE user_no = ? AND dav_name = ?;", $session->user_no, $matches[1] );
if ( $qry->Exec('caldav') && $qry->rows == 1 && ($row = $qry->Fetch()) ) { if ( $qry->Exec('caldav') && $qry->rows == 1 && ($row = $qry->Fetch()) ) {
$this->collection_id = $row->collection_id; $this->collection_id = $row->collection_id;
$this->collection_path = $matches[1]; $this->collection_path = $matches[1];
} $this->collection = $row;
}
} }
} }
dbg_error_log( "caldav", " Collection '%s' is %d, type %s", $this->collection_path, $this->collection_id, $this->collection_type ); dbg_error_log( "caldav", " Collection '%s' is %d, type %s", $this->collection_path, $this->collection_id, $this->collection_type );
/**
* Extract the user whom we are accessing
*/
$this->principal = new CalDAVPrincipal( array( "path" => $this->path, "options" => $this->options ) );
if ( isset($this->principal->user_no) ) $this->user_no = $this->principal->user_no;
if ( isset($this->principal->username)) $this->username = $this->principal->username;
if ( isset($this->principal->by_email)) $this->by_email = true;
/** /**
* Evaluate our permissions for accessing the target * Evaluate our permissions for accessing the target
*/ */