From 232b458be41440210dec1553965fddd2f6c40589 Mon Sep 17 00:00:00 2001 From: Thomas Bruederli Date: Tue, 14 Oct 2014 09:21:51 +0200 Subject: [PATCH] Parse and display event/task status from iTip messages --- plugins/libcalendaring/lib/libcalendaring_itip.php | 6 +++++- plugins/libcalendaring/libvcalendar.php | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/plugins/libcalendaring/lib/libcalendaring_itip.php b/plugins/libcalendaring/lib/libcalendaring_itip.php index 5ce2f09f..b2ec3b8b 100644 --- a/plugins/libcalendaring/lib/libcalendaring_itip.php +++ b/plugins/libcalendaring/lib/libcalendaring_itip.php @@ -625,7 +625,11 @@ class libcalendaring_itip } if ($event['sensitivity'] && $event['sensitivity'] != 'public') { $table->add('label', $this->plugin->gettext('sensitivity'), $this->domain); - $table->add('sensitivity', ucfirst($this->plugin->gettext($event['sensitivity'])) . '!'); + $table->add('sensitivity', ucfirst($this->plugin->gettext($event['sensitivity'], $this->domain)) . '!'); + } + if ($event['status'] == 'COMPLETED' || $event['status'] == 'CANCELLED') { + $table->add('label', $this->plugin->gettext('status'), $this->domain); + $table->add('status', $this->plugin->gettext('status-' . strtolower($event['status']), $this->domain)); } if ($event['comment']) { $table->add('label', $this->plugin->gettext('comment'), $this->domain); diff --git a/plugins/libcalendaring/libvcalendar.php b/plugins/libcalendaring/libvcalendar.php index c80565dc..1e10ddcb 100644 --- a/plugins/libcalendaring/libvcalendar.php +++ b/plugins/libcalendaring/libvcalendar.php @@ -415,8 +415,8 @@ class libvcalendar implements Iterator $event['cancelled'] = true; else if ($prop->value == 'COMPLETED') $event['complete'] = 100; - else - $event['status'] = strval($prop->value); + + $event['status'] = strval($prop->value); break; case 'PRIORITY':