summaryrefslogtreecommitdiff
path: root/plugins/libcalendaring
diff options
context:
space:
mode:
authorThomas Bruederli <bruederli@kolabsys.com>2014-10-14 07:21:51 (GMT)
committerThomas Bruederli <bruederli@kolabsys.com>2014-10-14 07:21:51 (GMT)
commit232b458be41440210dec1553965fddd2f6c40589 (patch)
tree55a557fa3d71381e4819b59fad5dca5f6c956db8 /plugins/libcalendaring
parent738b56cfd8a7c14480a0645cb78a6b03b11229bb (diff)
downloadroundcubemail-plugins-kolab-232b458be41440210dec1553965fddd2f6c40589.tar.gz
Parse and display event/task status from iTip messages
Diffstat (limited to 'plugins/libcalendaring')
-rw-r--r--plugins/libcalendaring/lib/libcalendaring_itip.php6
-rw-r--r--plugins/libcalendaring/libvcalendar.php4
2 files changed, 7 insertions, 3 deletions
diff --git a/plugins/libcalendaring/lib/libcalendaring_itip.php b/plugins/libcalendaring/lib/libcalendaring_itip.php
index 5ce2f09..b2ec3b8 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 c80565d..1e10ddc 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':