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

Properly insert resourcetypes on MKCOL.

Browse Source
This commit is contained in:
Andrew McMillan 2010-03-20 01:06:07 +13:00
parent 8db20b966f
commit d92361cb0d
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
inc/caldav-MKCOL.php
View File

@ -74,14 +74,20 @@ if ( isset($request->xml_tags) ) {
case 'DAV::resourcetype':
/** Any value for resourcetype other than 'calendar' is ignored */
dbg_error_log( 'MKCOL', 'Extended MKCOL with resourcetype specified. "%s"', $content);
if ( preg_match( '/urn:ietf:params:xml:ns:caldav:calendar/', $content ) ) {
$is_calendar = true;
$is_addressbook = count($setting->GetPath('DAV::resourcetype/urn:ietf:params:xml:ns:carddav:addressbook'));
$is_calendar = count($setting->GetPath('DAV::resourcetype/urn:ietf:params:xml:ns:caldav:calendar'));
if ( $is_addressbook && $is_calendar ) {
$failure['set-'.$tag] = new XMLElement( 'propstat', array(
new XMLElement( 'prop', new XMLElement($reply->Tag($tag))),
new XMLElement( 'status', 'HTTP/1.1 409 Conflict' ),
new XMLElement('responsedescription', translate('Collections may not be both CalDAV calendars and CardDAV addressbooks at the same time') )
));
}
if ( preg_match( '/urn:ietf:params:xml:ns:carddav:addressbook/', $content ) ) {
$is_addressbook = true;
else {
$resourcetypes = $setting->GetPath('DAV::resourcetype/*');
$resourcetypes = str_replace( "\n", "", implode('',$resourcetypes));
$success[$tag] = 1;
}
$resourcetypes = preg_replace( '/\s+/', '', $content);
$success[$tag] = 1;
break;
case 'DAV::displayname':