From 03dd4b60b3ed9581aba811589d795bd7fd58dc7d Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <bruederli@kolabsys.com>
Date: Mon, 2 Mar 2015 12:32:40 +0100
Subject: [PATCH] Exclude cancelled events from count query on invitations
 calendar

---
 .../calendar/drivers/kolab/kolab_invitation_calendar.php   | 7 ++++++-
 plugins/libkolab/lib/kolab_format_xcal.php                 | 4 ++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/plugins/calendar/drivers/kolab/kolab_invitation_calendar.php b/plugins/calendar/drivers/kolab/kolab_invitation_calendar.php
index 0ffdee5f..d63a77d8 100644
--- a/plugins/calendar/drivers/kolab/kolab_invitation_calendar.php
+++ b/plugins/calendar/drivers/kolab/kolab_invitation_calendar.php
@@ -284,6 +284,11 @@ class kolab_invitation_calendar
       }
     }
 
+    $filter = array(
+      array('tags','!=','x-status:cancelled'),
+      array($subquery, 'OR')
+    );
+
     // aggregate counts from all calendar folders
     $count = 0;
     foreach (kolab_storage::list_folders('', '*', 'event', null) as $foldername) {
@@ -291,7 +296,7 @@ class kolab_invitation_calendar
       if ($cal->get_namespace() == 'other')
         continue;
 
-      $count += $cal->count_events($start, $end, array(array($subquery, 'OR')));
+      $count += $cal->count_events($start, $end, $filter);
     }
 
     return $count;
diff --git a/plugins/libkolab/lib/kolab_format_xcal.php b/plugins/libkolab/lib/kolab_format_xcal.php
index 605d557a..8c63b263 100644
--- a/plugins/libkolab/lib/kolab_format_xcal.php
+++ b/plugins/libkolab/lib/kolab_format_xcal.php
@@ -635,6 +635,10 @@ abstract class kolab_format_xcal extends kolab_format
             }
         }
 
+        if (!empty($object['status'])) {
+          $tags[] = 'x-status:' . strtolower($object['status']);
+        }
+
         return array_unique($tags);
     }