From 541525919f6aa5a396818d95f89073d2c5f7c968 Mon Sep 17 00:00:00 2001 From: Andrew McMillan Date: Thu, 25 Mar 2010 14:59:10 +1300 Subject: [PATCH] Logging addition, comment removal. --- inc/DAVResource.php | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/inc/DAVResource.php b/inc/DAVResource.php index 118f4a66..b88132cc 100644 --- a/inc/DAVResource.php +++ b/inc/DAVResource.php @@ -600,17 +600,11 @@ EOQRY; } $this->privileges = $this->collection->path_privs; -/* if ( ! $this->exists && isset($this->collection) ) { -// $this->collection->path_privs = $this->parent->Privileges(); - $this->collection->user_no = $this->parent->GetProperty('user_no'); - $this->collection->principal_id = $this->parent->GetProperty('principal_id'); - } - if ( $this->IsCollection() ) { - $this->privileges = $this->collection->path_privs; - } -*/ if ( is_string($this->privileges) ) $this->privileges = bindec( $this->privileges ); + dbg_error_log( 'DAVResource', 'Privileges of "%s" for user "%s" accessing "%s"', + decbin($this->privileges), $session->username, $this->dav_name() ); + if ( isset($request->ticket) && $request->ticket->MatchesPath($this->bound_from()) ) { $this->privileges |= $request->ticket->privileges(); dbg_error_log( 'DAVResource', 'Applying permissions for ticket "%s" now: %s', $request->ticket->id(), decbin($this->privileges) );