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

Catch the privileges on resources via a bound ticket.

Browse Source
This commit is contained in:
Andrew McMillan 2010-03-18 20:01:24 +13:00
parent 4d9dd91988
commit a1c720d92b
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
inc/DAVResource.php
View File

@ -572,7 +572,7 @@ EOQRY;
$this->privileges = $this->collection->path_privs; $this->privileges = $this->collection->path_privs;
if ( is_string($this->privileges) ) $this->privileges = bindec( $this->privileges ); if ( is_string($this->privileges) ) $this->privileges = bindec( $this->privileges );
if ( isset($request->ticket) && $request->ticket->MatchesPath($this->dav_name) ) { if ( isset($request->ticket) && $request->ticket->MatchesPath($this->bound_from()) ) {
$this->privileges |= $request->ticket->privileges(); $this->privileges |= $request->ticket->privileges();
dbg_error_log( 'DAVResource', 'Applying permissions for ticket "%s" now: %s', $request->ticket->id(), decbin($this->privileges) ); dbg_error_log( 'DAVResource', 'Applying permissions for ticket "%s" now: %s', $request->ticket->id(), decbin($this->privileges) );
} }
@ -580,7 +580,7 @@ EOQRY;
if ( isset($this->tickets) ) { if ( isset($this->tickets) ) {
if ( !isset($this->resource_id) ) $this->FetchResource(); if ( !isset($this->resource_id) ) $this->FetchResource();
foreach( $this->tickets AS $k => $ticket ) { foreach( $this->tickets AS $k => $ticket ) {
if ( $ticket->MatchesResource($this->resource_id) || $ticket->MatchesPath($this->dav_name) ) { if ( $ticket->MatchesResource($this->resource_id()) || $ticket->MatchesPath($this->bound_from()) ) {
$this->privileges |= $ticket->privileges(); $this->privileges |= $ticket->privileges();
dbg_error_log( 'DAVResource', 'Applying permissions for ticket "%s" now: %s', $ticket->id(), decbin($this->privileges) ); dbg_error_log( 'DAVResource', 'Applying permissions for ticket "%s" now: %s', $ticket->id(), decbin($this->privileges) );
} }
@ -998,7 +998,7 @@ EOQRY;
/** /**
* Returns the principal-URL for this resource * Returns the unique_tag (ETag or getctag) for this resource
*/ */
function unique_tag() { function unique_tag() {
if ( isset($this->unique_tag) ) return $this->unique_tag; if ( isset($this->unique_tag) ) return $this->unique_tag;