From dfb82f9c81fd30e0a7cf3f65b5b2c50ded35880d Mon Sep 17 00:00:00 2001
From: Andrew McMillan <andrew@morphoss.com>
Date: Sat, 17 Mar 2012 21:49:28 +1300
Subject: [PATCH] Principals don't (yet) have a sync-token.

---
 inc/DAVResource.php | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/inc/DAVResource.php b/inc/DAVResource.php
index 7580f8e2..a22684c3 100644
--- a/inc/DAVResource.php
+++ b/inc/DAVResource.php
@@ -1263,12 +1263,13 @@ EOQRY;
    * Returns the current sync_token for this collection, or the containing collection
    */
   function sync_token() {
+    if ( $this->IsPrincipal() ) return null;
     if ( !isset($this->sync_token) ) { 
       $sql = 'SELECT sync_token FROM sync_tokens WHERE collection_id = :collection_id ORDER BY sync_token DESC LIMIT 1';
       $params = array( ':collection_id' => $this->collection_id());
       $qry = new AwlQuery($sql, $params );
       if ( !$qry->Exec() || !$row = $qry->Fetch() ) {
-        if ( !$qry->QDo('SELECT new_sync_token( 0, :collection_id) AS sync_token', $params) ) throw new Exception('Problem with database query');
+        if ( !$qry->QDo('SELECT new_sync_token( 0, :collection_id) AS sync_token', $params) )  throw new Exception('Problem with database query');
       }
       $this->sync_token = 'data:,'.$row->sync_token;
     }
@@ -1608,6 +1609,11 @@ EOQRY;
         }
         break;
 
+      case 'DAV::add-member':
+        if ( ! $this->_is_collection ) return false;
+        $reply->DAVElement( $prop, 'add-member', $reply->href($this->collection->dav_name().'?add-member') );
+        break;
+
       // Empty tag responses.
       case 'DAV::group':
       case 'DAV::alternate-URI-set':
@@ -1625,7 +1631,7 @@ EOQRY;
         break;
 
       case 'DAV::sync-token':
-        if ( ! $this->_is_collection ) return false;
+        if ( ! $this->_is_collection || $this->_is_principal ) return false;
         $reply->NSElement($prop, $tag, $this->sync_token() );
         break;