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

Allow namespacing of privileges. Disable getctag and getetag on principals.

Browse Source
This commit is contained in:
Andrew McMillan 2009-09-11 23:47:17 +12:00
parent 04daf91d32
commit ba4aec1d12
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
inc/CalDAVPrincipal.php
View File

@ -153,7 +153,8 @@ class CalDAVPrincipal
if ( !isset($this->created) ) $this->created = ISODateToHTTPDate($this->joined);
$this->by_email = false;
$this->url = ConstructURL( '/'.$this->username.'/', true );
$this->principal_url = ConstructURL( '/'.$this->username.'/', true );
$this->url = $this->principal_url;
$this->calendar_home_set = array( $this->url );
@ -311,9 +312,12 @@ class CalDAVPrincipal
* Returns the array of privilege names converted into XMLElements
*/
function RenderPrivileges($privilege_names, $container='privilege') {
global $reply;
$privileges = array();
foreach( $privilege_names AS $k => $v ) {
$privileges[] = new XMLElement($container, new XMLElement($k));
$privilege = new XMLElement($container);
$reply->NSElement($privilege,$k);
$privileges[] = $privilege;
}
return $privileges;
}
@ -352,7 +356,7 @@ class CalDAVPrincipal
break;
case 'DAV::principal-URL':
$prop->NewElement('principal-URL', $reply->href($this->url) );
$prop->NewElement('principal-URL', $reply->href($this->principal_url) );
break;
case 'DAV::getlastmodified':
@ -446,12 +450,12 @@ class CalDAVPrincipal
$prop->NewElement( $reply->Tag($tag));
break;
case 'http://calendarserver.org/ns/:getctag':
$reply->CalendarServerElement( $prop, 'getctag', '"'.md5($this->username . $this->updated).'"' );
break;
case 'DAV::getetag':
$reply->DAVElement( $prop, 'getetag', '"'.md5($this->username . $this->updated).'"' );
break;
// case 'http://calendarserver.org/ns/:getctag':
// $reply->CalendarServerElement( $prop, 'getctag', '"'.md5($this->username . $this->updated).'"' );
// break;
// case 'DAV::getetag':
// $reply->DAVElement( $prop, 'getetag', '"'.md5($this->username . $this->updated).'"' );
// break;
case 'SOME-DENIED-PROPERTY': /** @todo indicating the style for future expansion */
$denied[] = $reply->Tag($tag);