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

Request for a collection URL with no events will no longer 404.

Browse Source
This commit is contained in:
Andrew McMillan 2008-11-01 11:01:00 +13:00
parent 151489f071
commit 3870581855
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
inc/caldav-GET.php
View File

@ -4,8 +4,8 @@
* *
* @package davical * @package davical
* @subpackage caldav * @subpackage caldav
* @author Andrew McMillan <andrew@catalyst.net.nz> * @author Andrew McMillan <andrew@mcmillan.net.nz>
* @copyright Catalyst .Net Ltd * @copyright Catalyst .Net Ltd, Morphoss Ltd <http://www.morphoss.com/>
* @license http://gnu.org/copyleft/gpl.html GNU GPL v2 * @license http://gnu.org/copyleft/gpl.html GNU GPL v2
*/ */
dbg_error_log("get", "GET method handler"); dbg_error_log("get", "GET method handler");
@ -29,24 +29,31 @@ if ( $request->IsCollection() ) {
else { else {
$qry = new PgQuery( "SELECT caldav_data, caldav_data.dav_etag, class, caldav_type, calendar_item.user_no FROM caldav_data INNER JOIN calendar_item USING ( dav_id ) WHERE caldav_data.user_no = ? AND caldav_data.dav_name = ? $privacy_clause;", $request->user_no, $request->path); $qry = new PgQuery( "SELECT caldav_data, caldav_data.dav_etag, class, caldav_type, calendar_item.user_no FROM caldav_data INNER JOIN calendar_item USING ( dav_id ) WHERE caldav_data.user_no = ? AND caldav_data.dav_name = ? $privacy_clause;", $request->user_no, $request->path);
} }
dbg_error_log("get", "%s", $qry->querystring );
if ( $qry->Exec("GET") && $qry->rows == 1 ) { if ( !$qry->Exec("GET") ) {
$request->DoResponse( 500, translate("Database Error") );
}
else if ( $qry->rows == 1 ) {
$event = $qry->Fetch(); $event = $qry->Fetch();
header( "Etag: \"$event->dav_etag\"" ); header( "Etag: \"$event->dav_etag\"" );
header( "Content-Length: ".strlen($event->caldav_data) ); header( "Content-Length: ".strlen($event->caldav_data) );
$request->DoResponse( 200, ($request->method == "HEAD" ? "" : $event->caldav_data), "text/calendar" ); $request->DoResponse( 200, ($request->method == "HEAD" ? "" : $event->caldav_data), "text/calendar" );
} }
else if ( $qry->rows < 1 ) { else if ( $qry->rows < 1 && ! $request->IsCollection() ) {
/** TODO: If we are attempting to read a collection we should return an empty VCALENDAR rather than a 404 */
$request->DoResponse( 404, translate("Calendar Resource Not Found.") ); $request->DoResponse( 404, translate("Calendar Resource Not Found.") );
} }
else if ( $qry->rows > 1 ) { else {
/** /**
* Here we are constructing a whole calendar response for this collection, including * Here we are constructing a whole calendar response for this collection, including
* the timezones that are referred to by the events we have selected. * the timezones that are referred to by the events we have selected.
*/ */
include_once("iCalendar.php"); include_once("iCalendar.php");
$response = iCalendar::iCalHeader(); $response = iCalendar::iCalHeader();
/**
* @TODO: CalDAVRequest should have read the collection record, so we should not have to reread it here
* @TODO: This should be structured to not use the iCalHeader() and iCalFooter methods. See caldav-POST.php for the bones of a better approach.
*/
$collqry = new PgQuery( "SELECT * FROM collection WHERE collection.user_no = ? AND collection.dav_name = ?;", $request->user_no, $request->path); $collqry = new PgQuery( "SELECT * FROM collection WHERE collection.user_no = ? AND collection.dav_name = ?;", $request->user_no, $request->path);
if ( $collqry->Exec("GET") && $collection = $collqry->Fetch() ) { if ( $collqry->Exec("GET") && $collection = $collqry->Fetch() ) {
$response .= "X-WR-CALNAME:$collection->dav_displayname\r\n"; $response .= "X-WR-CALNAME:$collection->dav_displayname\r\n";
@ -105,7 +112,4 @@ else if ( $qry->rows > 1 ) {
header( "Content-Length: ".strlen($response) ); header( "Content-Length: ".strlen($response) );
$request->DoResponse( 200, ($request->method == "HEAD" ? "" : $response), "text/calendar" ); $request->DoResponse( 200, ($request->method == "HEAD" ? "" : $response), "text/calendar" );
} }
else {
$request->DoResponse( 500, translate("Database Error") );
}