From b901981c7c4be7a91747cfbb6d1b151b4a7bdea7 Mon Sep 17 00:00:00 2001
From: Andrew McMillan <andrew@morphoss.com>
Date: Wed, 24 Aug 2011 20:38:32 +1200
Subject: [PATCH] Fix calendar-query handling of properties.

---
 inc/caldav-REPORT-calquery.php | 2 +-
 inc/ui/collection-edit.php     | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/inc/caldav-REPORT-calquery.php b/inc/caldav-REPORT-calquery.php
index b8bdf82b..61d63c56 100644
--- a/inc/caldav-REPORT-calquery.php
+++ b/inc/caldav-REPORT-calquery.php
@@ -26,10 +26,10 @@ function check_for_expansion( $calendar_data_node ) {
  */
 $qry_content = $xmltree->GetContent('urn:ietf:params:xml:ns:caldav:calendar-query');
 
+$properties = array();
 while (list($idx, $qqq) = each($qry_content))
 {
   $proptype = $qry_content[$idx]->GetTag();
-  $properties = array();
   switch( $proptype ) {
     case 'DAV::prop':
       $qry_props = $xmltree->GetPath('/urn:ietf:params:xml:ns:caldav:calendar-query/'.$proptype.'/*');
diff --git a/inc/ui/collection-edit.php b/inc/ui/collection-edit.php
index b1e6dfd3..14e47b82 100644
--- a/inc/ui/collection-edit.php
+++ b/inc/ui/collection-edit.php
@@ -317,7 +317,9 @@ label.privilege {
  <tr> <th class="right">$prompt_collection_id:</th>    <td class="left">$value_id</td> </tr>
  <tr> <th class="right">$prompt_dav_name:</th>         <td class="left">$value_dav_name</td> </tr>
  <tr> <th class="right">$prompt_entries:</th>          <td class="left">$entries</td> </tr>
- <tr> <th class="right">$prompt_load_file:</th>        <td class="left">##ics_file.file.60##</td> </tr>
+ <tr> <th class="right">$prompt_load_file:</th>        <td class="left">##ics_file.file.60##
+  <label class="privilege" title="Should the uploaded entries be appended to the calendar"><input type="checkbox" name="mode" value="append">Append</label>
+ </td> </tr> 
  <tr> <th class="right">$prompt_displayname:</th>      <td class="left">##dav_displayname.input.50##</td> </tr>
  <tr> <th class="right">$prompt_public:</th>           <td class="left">##publicly_readable.checkbox##</td> </tr>
  <tr> <th class="right">$prompt_calendar:</th>         <td class="left">##is_calendar.checkbox##</td> </tr>
@@ -352,6 +354,7 @@ toggle_visible('fld_use_default_privs','!privileges_settings');
 
 EOTEMPLATE;
 
+ 
 
 $editor->SetTemplate( $template );
 $page_elements[] = $editor;