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

GetProperty() now returns a clone() if it is an object. New url() method.

Browse Source 
Signed-off-by: Andrew McMillan <andrew@morphoss.com>
This commit is contained in:
Andrew McMillan 2010-12-26 17:43:57 +13:00
parent b15fcb3f77
commit 6328126c04
1 changed files with 43 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
inc/DAVResource.php
View File

@ -485,20 +485,20 @@ EOSQL;
function FetchPrincipal() { function FetchPrincipal() {
if ( isset($this->principal) ) return; if ( isset($this->principal) ) return;
$this->principal = new CalDAVPrincipal( array( "path" => $this->bound_from() ) ); $this->principal = new CalDAVPrincipal( array( "path" => $this->bound_from() ) );
if ( $this->_is_principal && $this->principal->Exists() ) { if ( $this->_is_principal ) {
$this->exists = true; $this->exists = $this->principal->Exists();
$this->unique_tag = '"'.$this->principal->dav_etag.'"';
$this->created = $this->principal->created;
$this->modified = $this->principal->modified;
$this->resourcetypes = '<DAV::collection/><DAV::principal/>';
$this->resource_id = $this->principal->principal_id;
$this->collection = $this->principal->AsCollection();
$this->user_no = $this->principal->user_no;
}
elseif ( $this->_is_principal ) {
$this->exists = false;
$this->collection->dav_name = $this->dav_name; $this->collection->dav_name = $this->dav_name;
$this->collection->type = 'principal'; $this->collection->type = 'principal';
if ( $this->exists ) {
$this->displayname = $this->principal->GetProperty('displayname');
$this->unique_tag = '"'.$this->principal->dav_etag.'"';
$this->created = $this->principal->created;
$this->modified = $this->principal->modified;
$this->resourcetypes = '<DAV::collection/><DAV::principal/>';
$this->resource_id = $this->principal->principal_id;
$this->collection = $this->principal->AsCollection();
$this->user_no = $this->principal->user_no;
}
} }
} }
@ -1018,6 +1018,17 @@ EOQRY;
} }
/**
* Returns the URL of our resource
*/
function url() {
if ( !isset($this->dav_name) ) {
throw Exception("What! How can dav_name not be set?");
}
return ConstructURL($this->dav_name);
}
/** /**
* Returns the dav_name of the resource in our internal namespace * Returns the dav_name of the resource in our internal namespace
*/ */
@ -1069,10 +1080,7 @@ EOQRY;
*/ */
function principal_url() { function principal_url() {
if ( !isset($this->principal) ) $this->FetchPrincipal(); if ( !isset($this->principal) ) $this->FetchPrincipal();
if ( $this->principal->Exists() ) { return $this->principal->url();
return $this->principal->principal_url;
}
return null;
} }
@ -1236,8 +1244,21 @@ EOQRY;
return $type_list; return $type_list;
} }
case 'resource':
if ( !isset($this->resource) ) $this->FetchResource();
return clone($this->resource);
break;
case 'principal':
if ( !isset($this->principal) ) $this->FetchPrincipal();
return clone($this->principal);
break;
default: default:
if ( isset($this->{$name}) ) return $this->{$name}; if ( isset($this->{$name}) ) {
if ( ! is_object($this->{$name}) ) return $this->{$name};
return clone($this->{$name});
}
if ( $this->_is_principal ) { if ( $this->_is_principal ) {
if ( !isset($this->principal) ) $this->FetchPrincipal(); if ( !isset($this->principal) ) $this->FetchPrincipal();
if ( isset($this->principal->{$name}) ) return $this->principal->{$name}; if ( isset($this->principal->{$name}) ) return $this->principal->{$name};
@ -1254,7 +1275,11 @@ EOQRY;
if ( isset($this->principal->{$name}) ) return $this->principal->{$name}; if ( isset($this->principal->{$name}) ) return $this->principal->{$name};
if ( isset($this->collection->{$name}) ) return $this->collection->{$name}; if ( isset($this->collection->{$name}) ) return $this->collection->{$name};
} }
// dbg_error_log( 'DAVResource', ':GetProperty: Failed to find property "%s" on "%s".', $name, $this->dav_name ); if ( isset($this->{$name}) ) {
if ( ! is_object($this->{$name}) ) return $this->{$name};
return clone($this->{$name});
}
// dbg_error_log( 'DAVResource', ':GetProperty: Failed to find property "%s" on "%s".', $name, $this->dav_name );
} }
return $value; return $value;