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

Properly handle addressbooks in multiget.

Browse Source 
Signed-off-by: Andrew McMillan <andrew@morphoss.com>
This commit is contained in:
Andrew McMillan 2010-11-30 12:37:45 +13:00
parent 4380fb12c9
commit a0dee7f461
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -93,15 +93,11 @@ if ( $mode == 'caldav' ) {
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
$sql = 'SELECT calendar_item.*, addressbook_resource.*, caldav_data.* FROM caldav_data
LEFT JOIN calendar_item USING(dav_id, user_no, dav_name, collection_id)
LEFT JOIN addressbook_resource USING(dav_id)
LEFT JOIN collection USING(collection_id)';
}
/**
* @todo: Add stanzas for missing rows, so we don't just return a blank multistatus but