From ddb45c8158dfefde4391f3879505ce8e29d6c1a9 Mon Sep 17 00:00:00 2001
From: Andrew McMillan <andrew@morphoss.com>
Date: Sun, 27 Dec 2009 14:17:25 +1300
Subject: [PATCH] Move MKCOL/MKCALENDAR to NeedPrivilege()

---
 inc/caldav-MKCOL.php | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/inc/caldav-MKCOL.php b/inc/caldav-MKCOL.php
index 5b323d22..92e62a8c 100644
--- a/inc/caldav-MKCOL.php
+++ b/inc/caldav-MKCOL.php
@@ -10,9 +10,7 @@
 */
 dbg_error_log('MKCOL', 'method handler');
 
-if ( ! $request->AllowedTo('bind') ) {
-  $request->DoResponse( 403, translate('You may not create a calendar there.') );
-}
+$request->NeedPrivilege('DAV::bind');
 
 $displayname = $request->path;
 
@@ -51,7 +49,7 @@ if ( isset($request->xml_tags) ) {
   if ( $xmltree->GetTag() == 'DAV::mkcol' ) $request_type = 'extended-mkcol';
 
   if ( $xmltree->GetTag() != 'urn:ietf:params:xml:ns:caldav:mkcalendar' && $request_type != 'extended-mkcol' ) {
-    $request->DoResponse( 403, sprintf('The XML is not a "DAV::mkcol" or "urn:ietf:params:xml:ns:caldav:mkcalendar" document (%s)', $xmltree->GetTag()) );
+    $request->DoResponse( 406, sprintf('The XML is not a "DAV::mkcol" or "urn:ietf:params:xml:ns:caldav:mkcalendar" document (%s)', $xmltree->GetTag()) );
   }
   $setprops = $xmltree->GetContent();   // <set>
   $setprops = $setprops[0]->GetContent();  // <prop>