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

DAVPrincipal: delete funny tabs and other unusual whitespace

Browse Source
This commit is contained in:
Florian Schlichting 2016-11-30 23:03:06 +01:00
parent fd1fce90c3
commit b7d1ad513e
1 changed files with 31 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
inc/DAVPrincipal.php
View File

@ -313,7 +313,7 @@ class DAVPrincipal extends Principal
if ( isset($this->{$property_id}) ) {
if ( ! is_object($this->{$property_id}) ) return $this->{$property_id};
return clone($this->{$property_id});
}
}
return null;
}
@ -376,30 +376,27 @@ class DAVPrincipal extends Principal
/**
* The property calendar-free-busy-set has been dropped from draft 5 of the scheduling extensions for CalDAV,
* and is not present in the final official RFC (6638).
* Hence, by default we do not call this method and do not populate the property.
* Enable the config value $c->support_obsolete_free_busy_property if you really need it, however be aware that
* performance may be adversely affected if you do so, since the resulting query over the collection table is slow.
* The property calendar-free-busy-set has been dropped from draft 5 of the scheduling extensions for CalDAV,
* and is not present in the final official RFC (6638).
* Hence, by default we do not call this method and do not populate the property.
* Enable the config value $c->support_obsolete_free_busy_property if you really need it, however be aware that
* performance may be adversely affected if you do so, since the resulting query over the collection table is slow.
*/
function calendar_free_busy_set() {
if (!isset($this->calendar_free_busy_set))
{
$this->calendar_free_busy_set = array();
$qry = new AwlQuery('SELECT dav_name FROM collection WHERE is_calendar AND (schedule_transp = \'opaque\' OR schedule_transp IS NULL) AND dav_name ~ :dav_name_start ORDER BY user_no, collection_id',
array(':dav_name_start' => '^' . $this->dav_name));
if ($qry->Exec('principal', __LINE__, __FILE__))
{
while ($calendar = $qry->Fetch())
{
$this->calendar_free_busy_set[] = ConstructURL($calendar->dav_name, true);
}
}
}
if (!isset($this->calendar_free_busy_set)) {
$this->calendar_free_busy_set = array();
$qry = new AwlQuery('SELECT dav_name FROM collection WHERE is_calendar AND (schedule_transp = \'opaque\' OR schedule_transp IS NULL) AND dav_name ~ :dav_name_start ORDER BY user_no, collection_id',
array(':dav_name_start' => '^' . $this->dav_name));
if ($qry->Exec('principal', __LINE__, __FILE__)) {
while ($calendar = $qry->Fetch()) {
$this->calendar_free_busy_set[] = ConstructURL($calendar->dav_name, true);
}
}
}
return $this->calendar_free_busy_set;
}
/**
* Return the privileges bits for the current session user to this resource
*/
@ -410,7 +407,7 @@ class DAVPrincipal extends Principal
if ( $this->_is_group ) {
if ( isset($session->principal) && in_array($session->principal->url(), $this->GroupMemberSet()) ) {
$this->privileges |= privilege_to_bits( array('DAV::read', 'DAV::read-current-user-privilege-set') );
}
}
}
return $this->privileges;
}
@ -451,7 +448,7 @@ class DAVPrincipal extends Principal
* Returns properties which are specific to this principal
*/
function PrincipalProperty( $tag, $prop, &$reply, &$denied ) {
global $c;
global $c;
dbg_error_log('principal',':PrincipalProperty: Principal Property "%s"', $tag );
switch( $tag ) {
@ -532,19 +529,20 @@ class DAVPrincipal extends Principal
break;
case 'urn:ietf:params:xml:ns:caldav:calendar-free-busy-set':
/** Note that this property was dropped from the scheduling extensions for CalDAV.
* We only populate it if the config value support_obsolete_free_busy_property is set.
* This should not be enabled unless your CalDAV client requires the property; beware
* that doing so may also adversely affect PROPFIND performance. */
if ( isset($c->support_obsolete_free_busy_property) && $c->support_obsolete_free_busy_property )
$reply->CalDAVElement( $prop, 'calendar-free-busy-set', $reply->href( $this->calendar_free_busy_set() ) );
else
return false;
break;
/** Note that this property was dropped from the scheduling extensions for CalDAV.
* We only populate it if the config value support_obsolete_free_busy_property is set.
* This should not be enabled unless your CalDAV client requires the property; beware
* that doing so may also adversely affect PROPFIND performance.
*/
if ( isset($c->support_obsolete_free_busy_property) && $c->support_obsolete_free_busy_property )
$reply->CalDAVElement( $prop, 'calendar-free-busy-set', $reply->href( $this->calendar_free_busy_set() ) );
else
return false;
break;
case 'urn:ietf:params:xml:ns:caldav:calendar-user-address-set':
$reply->CalDAVElement($prop, 'calendar-user-address-set', $reply->href($this->user_address_set));
break;
$reply->CalDAVElement($prop, 'calendar-user-address-set', $reply->href($this->user_address_set));
break;
case 'DAV::owner':
// After a careful reading of RFC3744 we see that this must be the principal-URL of the owner