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

Allow e-mail based URL references.

Browse Source
This commit is contained in:
Andrew McMillan 2008-10-26 11:20:33 +13:00
parent ecea83fb03
commit 9a58b26636
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
inc/CalDAVRequest.php
View File

@ -233,6 +233,11 @@ EOSQL;
$this->collection = $row;
}
}
else if ( preg_match( '#/(\S+@\S+[.]\S+)/?$#', $this->path) ) {
$this->collection_id = -1;
$this->collection_type = 'email';
$this->collection_path = $this->path;
}
else if ( preg_match( '#^(/[^/]+)/?$#', $this->path, $matches) ) {
$this->collection_id = -1;
$this->collection_path = $matches[1].'/'; // Enforce trailling '/'
@ -311,7 +316,7 @@ EOSQL;
$path_split = explode('/', $this->path );
$this->username = $path_split[1];
@dbg_error_log( "caldav", "Path split into at least /// %s /// %s /// %s", $path_split[1], $path_split[2], $path_split[3] );
if ( isset($this->options['allow_by_email']) && preg_match( '#/(\S+@\S+[.]\S+)$#', $this->path, $matches) ) {
if ( isset($this->options['allow_by_email']) && preg_match( '#/(\S+@\S+[.]\S+)/?$#', $this->path, $matches) ) {
$this->by_email = $matches[1];
// $qry = new PgQuery("SELECT user_no FROM usr WHERE email = ? AND get_permissions(?,user_no) ~ '[FRA]';", $this->by_email, $session->user_no );
$qry = new PgQuery("SELECT user_no FROM usr WHERE email = ?;", $this->by_email );