From acbab439904e0c7561aadb6727e6736116e93d41 Mon Sep 17 00:00:00 2001
From: Andrew McMillan <andrew@morphoss.com>
Date: Mon, 14 Sep 2009 21:11:14 +1200
Subject: [PATCH] Minor cosmetic code changes.

---
 htdocs/collection.php   | 1 -
 inc/CalDAVPrincipal.php | 2 +-
 inc/CalDAVRequest.php   | 1 +
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/collection.php b/htdocs/collection.php
index a8951de2..3eac0a49 100644
--- a/htdocs/collection.php
+++ b/htdocs/collection.php
@@ -46,4 +46,3 @@ include("page-header.php");
 echo $browser->Render();
 
 include("page-footer.php");
-?>
diff --git a/inc/CalDAVPrincipal.php b/inc/CalDAVPrincipal.php
index 8c8c058a..d9ae6959 100644
--- a/inc/CalDAVPrincipal.php
+++ b/inc/CalDAVPrincipal.php
@@ -234,7 +234,7 @@ class CalDAVPrincipal
       }
     }
 
-    dbg_error_log( 'principal', 'User: %s (%d) URL: %s, Home: %s, By Email: %d', $this->username, $this->user_no, $this->url, $this->calendar_home_set, $this->by_email );
+    dbg_error_log( 'principal', ' User: %s (%d) URL: %s, Home: %s, By Email: %d', $this->username, $this->user_no, $this->url, $this->calendar_home_set, $this->by_email );
   }
 
 
diff --git a/inc/CalDAVRequest.php b/inc/CalDAVRequest.php
index 2af6617e..27e9b664 100644
--- a/inc/CalDAVRequest.php
+++ b/inc/CalDAVRequest.php
@@ -232,6 +232,7 @@ class CalDAVRequest
 
       $this->collection_id = $row->collection_id;
       $this->collection_path = $row->dav_name;
+      $this->collection_type = ($row->is_calendar == 't' ? 'calendar' : 'collection');
       $this->collection = $row;
     }
     else if ( preg_match( '#^((/[^/]+/)\.(in|out)/)[^/]*$#', $this->path, $matches ) ) {