Fix bugs causing the calendar-data not to be included in the REPORT output.

This commit is contained in:
Andrew McMillan 2006-10-01 23:23:29 +13:00
parent 4c7e2fbc07
commit ddf01af76b
3 changed files with 13 additions and 8 deletions

6
debian/changelog vendored
View File

@ -1,3 +1,9 @@
rscds (0.1.6) unstable; urgency=low
* Fix some bugs in caldav-REPORT, which was not working with Lightning.
-- Andrew McMillan <debian@mcmillan.net.nz> Sun, 1 Oct 2006 23:22:37 +1300
rscds (0.1.5) unstable; urgency=low
* Support for some parts of PROPFIND and MKCALENDAR now in an effort to

View File

@ -159,7 +159,7 @@ header("Content-type: text/xml;charset=UTF-8");
$response_tpl = <<<RESPONSETPL
<D:response>%s
<D:propstat>
<D:prop>%s
<D:prop>%s%s
</D:prop>
<D:status>HTTP/1.1 200 OK</D:status>
</D:propstat>
@ -223,9 +223,9 @@ REPORTHDR;
case 'GETCONTENTTYPE': $value = "text/calendar"; break;
case 'RESOURCETYPE': $value = "VEVENT"; break;
}
$value = sprintf( $property_tpl, strtolower($k), $value, strtolower($k));
$properties .= sprintf( $property_tpl, strtolower($k), $value, strtolower($k));
}
printf( $response_tpl, $calhref, $value, $caldata );
printf( $response_tpl, $calhref, $properties, $caldata );
dbg_error_log("REPORT", "ETag >>%s<< >>http://%s:%s%s%s<<", $event->dav_etag,
$_SERVER['SERVER_NAME'], $_SERVER['SERVER_PORT'], $_SERVER['SCRIPT_NAME'], $event->dav_name);
}

View File

@ -25,7 +25,6 @@
<item url="htdocs/caldav.php" uploadstatus="1" />
<item url="inc/BasicAuthSession.php" uploadstatus="1" />
<item url="inc/session-util.php" uploadstatus="1" />
<item url="inc/vEvent.php" uploadstatus="1" />
<item url="debian/" uploadstatus="1" />
<item url="debian/rules" uploadstatus="1" />
<item url="dba/rscds.sql" uploadstatus="1" />
@ -47,9 +46,9 @@
<item url="inc/caldav-PROPFIND.php" uploadstatus="1" />
<item url="inc/caldav-MKCALENDAR.php" uploadstatus="1" />
<item url="inc/XMLElement.php" uploadstatus="1" />
<item url="htdocs/js/" />
<item url="htdocs/js/browse.js" />
<item url="htdocs/css/browse.css" />
<item url="htdocs/css/" />
<item url="htdocs/js/" uploadstatus="1" />
<item url="htdocs/js/browse.js" uploadstatus="1" />
<item url="htdocs/css/browse.css" uploadstatus="1" />
<item url="htdocs/css/" uploadstatus="1" />
</project>
</webproject>