From 8a5ba6a07ecfeae8ca9c6bb04eb69ccd09328f97 Mon Sep 17 00:00:00 2001 From: Andrew McMillan Date: Wed, 12 May 2010 22:17:10 +1200 Subject: [PATCH] A (still broken) start on parsing VCARD on PUT. --- htdocs/caldav.php | 5 ++- inc/caldav-PUT-vcard.php | 85 ++++++++++++++++++++++++++++++++++++++++ inc/vcard.php | 53 +++++++++++++++++++++++++ 3 files changed, 141 insertions(+), 2 deletions(-) create mode 100644 inc/caldav-PUT-vcard.php create mode 100644 inc/vcard.php diff --git a/htdocs/caldav.php b/htdocs/caldav.php index c25a27c0..a547b42b 100644 --- a/htdocs/caldav.php +++ b/htdocs/caldav.php @@ -72,9 +72,10 @@ switch ( $request->method ) { /** use original DAViCal 'PUT' code which will be rewritten */ include('caldav-PUT.php'); break; -/* case 'text/vcard': + case 'text/vcard': + case 'text/x-vcard': include('caldav-PUT-vcard.php'); - break;*/ + break; default: include('caldav-PUT-default.php'); break; diff --git a/inc/caldav-PUT-vcard.php b/inc/caldav-PUT-vcard.php new file mode 100644 index 00000000..551fd4f2 --- /dev/null +++ b/inc/caldav-PUT-vcard.php @@ -0,0 +1,85 @@ + +* @copyright Morphoss Ltd +* @license http://gnu.org/copyleft/gpl.html GNU GPL v2 or later +*/ +dbg_error_log("PUT", "method handler"); + +require_once('DAVResource.php'); + +if ( ! ini_get('open_basedir') && (isset($c->dbg['ALL']) || (isset($c->dbg['put']) && $c->dbg['put'])) ) { + $fh = fopen('/tmp/PUT.txt','w'); + if ( $fh ) { + fwrite($fh,$request->raw_post); + fclose($fh); + } +} + +$lock_opener = $request->FailIfLocked(); + +$dest = new DAVResource($request->path); + +$container = $dest->FetchParentContainer(); +if ( ! $dest->Exists() ) { + if ( $container->IsPrincipal() ) { + $request->DoResponse(403,translate('A DAViCal principal collection may only contain collections')); + } + if ( ! $container->Exists() ) { + $request->DoResponse( 409, translate('Destination collection does not exist') ); + } + $container->NeedPrivilege('DAV::bind'); +} +else { + if ( $dest->IsCollection() ) { + if ( ! isset($c->readonly_webdav_collections) || $c->readonly_webdav_collections ) { + $request->DoResponse(403,translate('You may not PUT to a collection URL')); + } + $request->DoResponse(403,translate('PUT on a collection is only allowed for text/calendar content against a calendar collection')); + } + $dest->NeedPrivilege('DAV::write-content'); +} + +if ( isset($request->etag_none_match) && $request->etag_none_match != '*' && $dest->Exists() ) { + $request->DoResponse(412); +} + +if ( isset($request->etag_if_match) && $request->etag_if_match != $dest->unique_tag() ) { + $request->DoResponse(412); +} + +$collection_id = $container->GetProperty('collection_id'); + +$qry = new AwlQuery(); +$qry->Begin(); + +$params = array( + ':user_no' => $dest->GetProperty('user_no'), + ':dav_name' => $dest->bound_from(), + ':etag' => md5($request->raw_post), + ':dav_data' => $request->raw_post, + ':session_user' => $session->user_no +); +if ( $dest->Exists() ) { + $sql = 'UPDATE caldav_data SET caldav_data=:dav_data, dav_etag=:etag, logged_user=:session_user, + modified=current_timestamp WHERE user_no=:user_no AND dav_name=:dav_name'; + $response_code = 200; +} +else { + $sql = 'INSERT INTO caldav_data ( user_no, dav_name, dav_etag, caldav_data, logged_user, created, modified, collection_id ) + VALUES( :user_no, :dav_name, :etag, :dav_data, :session_user, current_timestamp, current_timestamp, :collection_id )'; + $params[':collection_id'] = $collection_id; + $response_code = 201; +} +$qry->QDo( $sql, $params ); + +$qry->QDo("SELECT write_sync_change( $collection_id, $response_code, :dav_name)", array(':dav_name' => $dest->bound_from() ) ); + +$qry = new AwlQuery('COMMIT'); +if ( !$qry->Exec('move') ) rollback(500); + +$request->DoResponse( $response_code ); diff --git a/inc/vcard.php b/inc/vcard.php new file mode 100644 index 00000000..0e922f0a --- /dev/null +++ b/inc/vcard.php @@ -0,0 +1,53 @@ +GetProperties('ADR'); + $telephones = $this->GetProperties('TEL'); + $emails = $this->GetProperties('EMAIL'); + } + +} \ No newline at end of file