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

Add handling of PRIVATE events to GET.

Browse Source
This commit is contained in:
Andrew McMillan 2007-03-06 14:59:18 +13:00
parent c8bbcc1df6
commit ddfbd624a7
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
inc/caldav-GET.php
View File

@ -13,16 +13,20 @@ dbg_error_log("get", "GET method handler");
if ( ! $request->AllowedTo('read') ) { if ( ! $request->AllowedTo('read') ) {
$request->DoResponse( 403, translate("You may not access that calendar") ); $request->DoResponse( 403, translate("You may not access that calendar") );
} }
$privacy_clause = "";
if ( ! $request->AllowedTo('all') ) {
$privacy_clause = "AND calendar_item.class != 'PRIVATE'";
}
if ( $request->IsCollection() ) { if ( $request->IsCollection() ) {
/** /**
* The CalDAV specification does not define GET on a collection, but typically this is * The CalDAV specification does not define GET on a collection, but typically this is
* used as a .ics download for the whole collection, which is what we do also. * used as a .ics download for the whole collection, which is what we do also.
*/ */
$qry = new PgQuery( "SELECT caldav_data FROM caldav_data WHERE user_no = ? AND dav_name ~ ? ;", $request->user_no, $request->path.'[^/]+$'); $qry = new PgQuery( "SELECT caldav_data FROM caldav_data LEFT JOIN calendar_item USING ( dav_name ) WHERE caldav_data.user_no = ? AND caldav_data.dav_name ~ ? $privacy_clause;", $request->user_no, $request->path.'[^/]+$');
} }
else { else {
$qry = new PgQuery( "SELECT caldav_data, dav_etag FROM caldav_data WHERE user_no = ? AND dav_name = ? ;", $request->user_no, $request->path); $qry = new PgQuery( "SELECT caldav_data, caldav_data.dav_etag FROM caldav_data LEFT JOIN calendar_item USING ( dav_name ) WHERE caldav_data.user_no = ? AND caldav_data.dav_name = ? $privacy_clause;", $request->user_no, $request->path);
} }
dbg_error_log("get", "%s", $qry->querystring ); dbg_error_log("get", "%s", $qry->querystring );
if ( $qry->Exec("GET") && $qry->rows == 1 ) { if ( $qry->Exec("GET") && $qry->rows == 1 ) {