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

Only apply the filter criteria once.

Browse Source
This commit is contained in:
Andrew McMillan 2007-05-28 15:54:39 +12:00
parent 10716cd412
commit 73fab0b489
1 changed files with 12 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
inc/caldav-REPORT.php
View File

@ -356,18 +356,6 @@ for ( $i=0; $i <= $reportnum; $i++ ) {
if ( isset( $report[$i]['end'] ) ) {
$where .= "AND dtstart <= ".qpg($report[$i]['end'])."::timestamp with time zone ";
}
if ( isset( $report[$i]['filters'] ) ) {
/**
* Only report on the filtered types that were specified
*/
$filters = "";
foreach( $report[$i]['filters'] AS $k => $v ) {
$filters .= ($filters == "" ? "" : ", ") . " '$k'";
}
if ( $filters != "" ) {
$where .= "AND caldav_data.caldav_type IN ( $filters ) ";
}
}
break;
case 'CALENDAR-MULTIGET':
@ -387,18 +375,19 @@ for ( $i=0; $i <= $reportnum; $i++ ) {
dbg_error_log("REPORT", "Unhandled report type of '%s'", $report[$i]['type'] );
}
$type_filters = '';
if ( isset($report[$i]['filters']['VEVENT']) ) {
$type_filters .= ($type_filters == '' ? '' : ', ');
$type_filters .= qpg('VEVENT');
}
if ( isset($report[$i]['filters']['VTODO']) ) {
$type_filters .= ($type_filters == '' ? '' : ', ');
$type_filters .= qpg('VTODO');
}
if ( $type_filters != '' ) {
$where .= " AND caldav_data.caldav_type IN ( $type_filters ) ";
if ( isset( $report[$i]['filters'] ) ) {
/**
* Only report on the filtered types that were specified
*/
$filters = "";
foreach( $report[$i]['filters'] AS $k => $v ) {
$filters .= ($filters == "" ? "" : ", ") . qpg($k);
}
if ( $filters != "" ) {
$where .= "AND caldav_data.caldav_type IN ( $filters ) ";
}
}
$where .= "AND (calendar_item.class != 'PRIVATE' OR calendar_item.class IS NULL OR get_permissions($session->user_no,caldav_data.user_no) ~ 'A') "; // Must have 'all' permissions to see confidential items
$qry = new PgQuery( "SELECT * , get_permissions($session->user_no,caldav_data.user_no) as permissions FROM caldav_data INNER JOIN calendar_item USING(user_no, dav_name)". $where );
if ( $qry->Exec("REPORT",__LINE__,__FILE__) && $qry->rows > 0 ) {