A (still broken) start on parsing VCARD on PUT.

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;

inc/caldav-PUT-vcard.php

@@ -0,0 +1,85 @@
+<?php
+/**
+* CalDAV Server - handle PUT method on VCARD content-types
+*
+* @package   davical
+* @subpackage   caldav
+* @author    Andrew McMillan <andrew@morphoss.com>
+* @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 );

inc/vcard.php

@@ -0,0 +1,53 @@
+<?php
+/**
+* Extend the vComponent to specifically handle VCARD resources
+*/
+
+require_once('vComponent.php');
+
+class VCard extends vComponent {
+
+  /**
+  * Into tables like this:
+  *
+CREATE TABLE addressbook_resource (
+  dav_id INT8 NOT NULL REFERENCES caldav_data(dav_id) ON UPDATE CASCADE ON DELETE CASCADE PRIMARY KEY,
+  version TEXT,
+  uid TEXT,
+  nickname TEXT,
+  fn TEXT, -- fullname
+  n TEXT, -- Name Surname;First names
+  note TEXT,
+  org TEXT,
+  url TEXT
+);
+
+CREATE TABLE addressbook_address_adr (
+  dav_id INT8 NOT NULL REFERENCES caldav_data(dav_id) ON UPDATE CASCADE ON DELETE CASCADE,
+  type TEXT,
+  adr TEXT,
+  property TEXT -- The full text of the property
+);
+
+CREATE TABLE addressbook_address_tel (
+  dav_id INT8 NOT NULL REFERENCES caldav_data(dav_id) ON UPDATE CASCADE ON DELETE CASCADE,
+  type TEXT,
+  tel TEXT,
+  property TEXT -- The full text of the property
+);
+
+CREATE TABLE addressbook_address_email (
+  dav_id INT8 NOT NULL REFERENCES caldav_data(dav_id) ON UPDATE CASCADE ON DELETE CASCADE,
+  type TEXT,
+  email TEXT,
+  property TEXT -- The full text of the property
+);
+  *
+  */
+  function Write( $dav_name ) {
+    $addresses = $this->GetProperties('ADR');
+    $telephones = $this->GetProperties('TEL');
+    $emails = $this->GetProperties('EMAIL');
+  }
+
+}