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

Ensure there are spaces in the SQL for CardDAV.

Browse Source
This commit is contained in:
Andrew McMillan 2010-10-10 01:51:31 -04:00
parent 1fd83c54ca
commit 344e3cb9a1
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -76,15 +76,15 @@ foreach( $mg_hrefs AS $k => $v ) {
}
$where = " WHERE caldav_data.collection_id = " . $collection->resource_id();
$where .= "AND caldav_data.dav_name IN ( $href_in ) ";
$where .= " AND caldav_data.dav_name IN ( $href_in ) ";
if ( $mode == 'caldav' ) {
if ( $collection->Privileges() != privilege_to_bits('DAV::all') ) {
$where .= "AND (calendar_item.class != 'PRIVATE' OR calendar_item.class IS NULL) ";
$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') ";
$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)