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

fix propfind depth:1 on bind to external url

Browse Source
This commit is contained in:
Rob Ostensen 2011-11-08 09:26:54 -06:00 committed by Andrew McMillan
parent 7080b2671f
commit f7420b1a9b
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
inc/DAVResource.php
View File

@ -451,7 +451,6 @@ EOSQL;
else else
$this->collection->type = 'collection'; $this->collection->type = 'collection';
if ( strlen($row->external_url) > 8 ) { if ( strlen($row->external_url) > 8 ) {
$this->collection->bound_from = $row->external_url;
$this->_is_external = true; $this->_is_external = true;
if ( $row->external_type == 'calendar' ) if ( $row->external_type == 'calendar' )
$this->collection->type = 'calendar'; $this->collection->type = 'calendar';
@ -639,7 +638,7 @@ EOQRY;
protected function FetchPrivileges() { protected function FetchPrivileges() {
global $session, $request; global $session, $request;
if ( $this->dav_name == '/' || $this->dav_name == '' ) { if ( $this->dav_name == '/' || $this->dav_name == '' || $this->_is_external ) {
$this->privileges = (1 | 16 | 32); // read + read-acl + read-current-user-privilege-set $this->privileges = (1 | 16 | 32); // read + read-acl + read-current-user-privilege-set
dbg_error_log( 'DAVResource', ':FetchPrivileges: Read permissions for user accessing /' ); dbg_error_log( 'DAVResource', ':FetchPrivileges: Read permissions for user accessing /' );
return; return;
@ -1584,8 +1583,13 @@ EOQRY;
case 'DAV::owner': case 'DAV::owner':
// The principal-URL of the owner // The principal-URL of the owner
if ( !isset($this->principal) ) $this->FetchPrincipal(); if ( $this->IsExternal() ){
$reply->DAVElement( $prop, 'owner', $reply->href( $this->principal->url() ) ); $reply->DAVElement( $prop, 'owner', $reply->href( $this->collection->bound_from ) );
}
else {
if ( !isset($this->principal) ) $this->FetchPrincipal();
$reply->DAVElement( $prop, 'owner', $reply->href( $this->principal->url() ) );
}
break; break;
// Empty tag responses. // Empty tag responses.