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

Add support for the addressbook-multiget REPORT. Untested.

Browse Source
This commit is contained in:
Andrew McMillan 2010-05-12 22:13:46 +12:00
parent 8f22d87a82
commit f1a1c2fa73
3 changed files with 41 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
inc/DAVResource.php
View File

@ -783,6 +783,15 @@ EOQRY;
)
);
}
if ( $this->collection->is_addressbook ) {
$this->supported_reports = array_merge(
$this->supported_reports,
array(
// 'urn:ietf:params:xml:ns:carddav:addressbook-query' => '',
'urn:ietf:params:xml:ns:carddav:addressbook-multiget' => ''
)
);
}
return $this->supported_reports;
}
@ -1451,6 +1460,7 @@ EOQRY;
$reply->NSElement($prop, $tag, $cal->Render() );
break;
case 'urn:ietf:params:xml:ns:carddav:address-data':
case 'urn:ietf:params:xml:ns:caldav:calendar-data':
if ( $this->_is_collection ) return false;
if ( !isset($this->resource) ) $this->FetchResource();

29
inc/caldav-REPORT-multiget.php
View File

@ -25,12 +25,12 @@ function check_for_expansion( $calendar_data_node ) {
/**
* Build the array of properties to include in the report output
*/
$qry_content = $xmltree->GetContent('urn:ietf:params:xml:ns:caldav:calendar-multiget');
$proptype = $qry_content[0]->GetTag();
$properties = array();
switch( $proptype ) {
case 'DAV::prop':
$qry_props = $xmltree->GetPath('/urn:ietf:params:xml:ns:caldav:calendar-multiget/'.$proptype.'/*');
$qry_props = $xmltree->GetPath('/*/'.$proptype.'/*');
foreach( $qry_content[0]->GetElements() AS $k => $v ) {
$propertyname = preg_replace( '/^.*:/', '', $v->GetTag() );
$properties[$propertyname] = 1;
@ -59,7 +59,7 @@ $bound_from = $collection->bound_from();
/**
* Build the href list for the IN ( href, href, href, ... ) clause.
*/
$mg_hrefs = $xmltree->GetPath('/urn:ietf:params:xml:ns:caldav:calendar-multiget/DAV::href');
$mg_hrefs = $xmltree->GetPath('/*/DAV::href');
$href_in = '';
$params = array();
foreach( $mg_hrefs AS $k => $v ) {
@ -77,16 +77,27 @@ foreach( $mg_hrefs AS $k => $v ) {
$where = " WHERE caldav_data.collection_id = " . $collection->resource_id();
$where .= "AND caldav_data.dav_name IN ( $href_in ) ";
if ( $collection->Privileges() != privilege_to_bits('DAV::all') ) {
$where .= "AND (calendar_item.class != 'PRIVATE' OR calendar_item.class IS NULL) ";
}
if ( isset($c->hide_TODO) && $c->hide_TODO && ! $collection->Privileges() == privilege_to_bits('all') ) {
$where .= "AND caldav_data.caldav_type NOT IN ('VTODO') ";
if ( $mode == 'caldav' ) {
if ( $collection->Privileges() != privilege_to_bits('DAV::all') ) {
$where .= "AND (calendar_item.class != 'PRIVATE' OR calendar_item.class IS NULL) ";
}
if ( isset($c->hide_TODO) && $c->hide_TODO && ! $collection->Privileges() == privilege_to_bits('all') ) {
$where .= "AND caldav_data.caldav_type NOT IN ('VTODO') ";
}
$sql = 'SELECT caldav_data.*,calendar_item.* FROM caldav_data
LEFT JOIN calendar_item USING(dav_id, user_no, dav_name, collection_id)
LEFT JOIN collection USING(collection_id)';
}
else if ( $mode == 'carddav' ) {
$sql = 'SELECT caldav_data.*, addressbook_resource.* FROM caldav_data
LEFT JOIN addressbook_resource USING(dav_id)
LEFT JOIN collection USING(collection_id)';
}
if ( isset($c->strict_result_ordering) && $c->strict_result_ordering ) $where .= " ORDER BY caldav_data.dav_id";
$qry = new AwlQuery( "SELECT caldav_data.*,calendar_item.* FROM caldav_data INNER JOIN calendar_item USING(dav_id, user_no, dav_name, collection_id) LEFT JOIN collection USING(collection_id)". $where, $params );
$qry = new AwlQuery( $sql . $where, $params );
if ( $qry->Exec('REPORT',__LINE__,__FILE__) && $qry->rows() > 0 ) {
while( $calendar_object = $qry->Fetch() ) {
if ( $bound_from != $collection->dav_name() ) {

12
inc/caldav-REPORT.php
View File

@ -172,9 +172,19 @@ if ( $xmltree->GetTag() == "urn:ietf:params:xml:ns:caldav:calendar-query" ) {
include("caldav-REPORT-calquery.php");
}
elseif ( $xmltree->GetTag() == "urn:ietf:params:xml:ns:caldav:calendar-multiget" ) {
$multiget = $xmltree->GetPath("/urn:ietf:params:xml:ns:caldav:calendar-multiget/*");
$mode = 'caldav';
$qry_content = $xmltree->GetContent('urn:ietf:params:xml:ns:caldav:calendar-multiget');
include("caldav-REPORT-multiget.php");
}
elseif ( $xmltree->GetTag() == "urn:ietf:params:xml:ns:carddav:addressbook-multiget" ) {
$mode = 'carddav';
$qry_content = $xmltree->GetContent('urn:ietf:params:xml:ns:carddav:addressbook-multiget');
include("caldav-REPORT-multiget.php");
}
elseif ( $xmltree->GetTag() == "urn:ietf:params:xml:ns:carddav:addressbook-query" ) {
$cardquery = $xmltree->GetPath("/urn:ietf:params:xml:ns:carddav:addressbook-query/*");
include("caldav-REPORT-cardquery.php");
}
else {
$request->DoResponse( 501, "The XML is not a supported REPORT query document" );
}