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

Merge branch 'Fix-getting-freebusy-by-email' into 'master'

Browse Source 
Fix getting freebusy info from email

See merge request davical-project/davical!67
This commit is contained in:
Andrewkra 2026-05-15 11:34:03 +00:00
commit bacfec93b4
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
inc/CalDAVRequest.php
View File

@ -352,8 +352,6 @@ class CalDAVRequest
if ( ! isset($this->timeout) || $this->timeout == 0 ) $this->timeout = (isset($c->default_lock_timeout) ? $c->default_lock_timeout : 900);
}
$this->principal = new Principal('path',$this->path);
/**
* 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...
@ -466,7 +464,14 @@ EOSQL;
/**
* Extract the user whom we are accessing
*/
$this->principal = new DAVPrincipal( array( "path" => $this->path, "options" => $this->options ) );
if ( $this->options['allow_by_email'] && preg_match( '{^/(\S+@[a-z0-9][a-z0-9-]*[.][a-z0-9.-]+)/?$}i', $this->path, $matches ) ) {
$this->principal = new DAVPrincipal( array( "email" => $matches[1], "options" => $this->options ) );
// @dbg_error_log('caldav', 'DAVPrincipal by email: %s', print_r($this->principal, true) );
} else {
$this->principal = new DAVPrincipal( array( "path" => $this->path, "options" => $this->options ) );
// @dbg_error_log('caldav', 'Principal by path: %s', $this->path );
}
$this->user_no = $this->principal->user_no();
$this->username = $this->principal->username();
$this->by_email = $this->principal->byEmail();