nik/davical
1
0
Fork 0
mirror of https://gitlab.com/davical-project/davical.git synced 2026-08-22 17:16:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Basic support for RFC5995 - Using POST to add collection members.

Browse Source
This commit is contained in:
Andrew McMillan 2012-03-22 14:10:43 +13:00
parent f401bfcd9e
commit 6e02c08c44
3 changed files with 60 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
inc/caldav-PUT-default.php
View File

@ -22,7 +22,18 @@ if ( ! ini_get('open_basedir') && (isset($c->dbg['ALL']) || (isset($c->dbg['put'
$lock_opener = $request->FailIfLocked();
$dest = new DAVResource($request->path);
if ( $add_member ) {
$request->path = $request->dav_name() . uuid();
$dest = new DAVResource($request->path);
if ( $dest->Exists() ) {
$request->path = $request->dav_name() . uuid();
$dest = new DAVResource($request->path);
if ( $dest->Exists() ) throw new Exception("Failed to generate unique segment name for add-member!");
}
}
else {
$dest = new DAVResource($request->path);
}
$container = $dest->GetParentContainer();
if ( $container->IsCalendar() ) {

26
inc/caldav-PUT-vcalendar.php
View File

@ -12,7 +12,30 @@ dbg_error_log("PUT", "method handler");
require_once('DAVResource.php');
$dav_resource = new DAVResource($request->path);
include_once('caldav-PUT-functions.php');
$vcalendar = new vCalendar( $request->raw_post );
$uid = $vcalendar->GetUID();
if ( empty($uid) ) {
$uid = uuid();
$vcalendar->SetUID($uid);
}
if ( $add_member ) {
$request->path = $request->dav_name() . $uid . '.ics';
$dav_resource = new DAVResource($request->path);
if ( $dav_resource->Exists() ) {
$uid = uuid();
$vcalendar->SetUID($uid);
$request->path = $request->dav_name() . $uid . '.ics';
$dav_resource = new DAVResource($request->path);
if ( $dav_resource->Exists() ) throw new Exception("Failed to generate unique segment name for add-member!");
}
}
else {
$dav_resource = new DAVResource($request->path);
}
if ( ! $dav_resource->HavePrivilegeTo('DAV::write-content') ) {
$request->DoResponse(403,'No write permission');
}
@ -29,7 +52,6 @@ if ( ! ini_get('open_basedir') && (isset($c->dbg['ALL']) || (isset($c->dbg['put'
}
}
include_once('caldav-PUT-functions.php');
controlRequestContainer( $dav_resource->GetProperty('username'), $dav_resource->GetProperty('user_no'), $dav_resource->bound_from(), true);
$lock_opener = $request->FailIfLocked();

27
inc/caldav-PUT-vcard.php
View File

@ -22,7 +22,28 @@ if ( ! ini_get('open_basedir') && (isset($c->dbg['ALL']) || (isset($c->dbg['put'
$lock_opener = $request->FailIfLocked();
$dest = new DAVResource($request->path);
require_once('vcard.php');
$vcard = new vCard( $request->raw_post );
$uid = $vcard->GetPValue('UID');
if ( empty($uid) ) {
$uid = uuid();
$vcard->AddProperty('UID',$uid);
}
if ( $add_member ) {
$request->path = $request->dav_name() . $uid . '.vcf';
$dest = new DAVResource($request->path);
if ( $dest->Exists() ) {
$uid = uuid();
$vcard->AddProperty('UID',$uid);
$request->path = $request->dav_name() . $uid . '.vcf';
$dest = new DAVResource($request->path);
if ( $dest->Exists() ) throw new Exception("Failed to generate unique segment name for add-member!");
}
}
else {
$dest = new DAVResource($request->path);
}
$container = $dest->GetParentContainer();
if ( ! $dest->Exists() ) {
@ -56,8 +77,6 @@ $collection_id = $container->GetProperty('collection_id');
$original_etag = md5($request->raw_post);
require_once('vcard.php');
$vcard = new vCard( $request->raw_post );
$qry = new AwlQuery();
$qry->Begin();
@ -127,6 +146,8 @@ if ( !$qry->Commit() ) {
$cache = getCacheInstance();
$cache->delete( 'collection-'.$container->dav_name(), null );
if ( $add_member ) header('Location: '.$c->protocol_server_port_script.$request->path);
if ( $etag == $original_etag ) header('ETag: "'. $etag . '"' ); // Only send the ETag if we didn't change what they gave us.
if ( $response_code == 200 ) $response_code = 204;
$request->DoResponse( $response_code );