From 9fce06e650bf35b17834ebe5f34c1894c0581662 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Mon, 28 Sep 2015 08:11:31 +0000 Subject: [PATCH] * Calendar/CalDAV: fix Outlook does not import invitations with wired error "organizer needs not to send responses" caused by new Horde Icalendar class exporting all integer x-properties as empty string, casting X-EGROUPWARE-UID not explicit to string before passing it to Horde code --- calendar/inc/class.calendar_ical.inc.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/calendar/inc/class.calendar_ical.inc.php b/calendar/inc/class.calendar_ical.inc.php index 6d38fc7bd7..052652cdb2 100644 --- a/calendar/inc/class.calendar_ical.inc.php +++ b/calendar/inc/class.calendar_ical.inc.php @@ -459,7 +459,7 @@ class calendar_ical extends calendar_boupdate $organizerURL = $participantURL; $rsvp = ''; $organizerCN = $participantCN; - $organizerUID = ($info['type'] != 'e' ? $uid : ''); + $organizerUID = ($info['type'] != 'e' ? (string)$uid : ''); } // PARTSTAT={NEEDS-ACTION|ACCEPTED|DECLINED|TENTATIVE|DELEGATED|COMPLETED|IN-PROGRESS} everything from delegated is NOT used by eGW atm. $status = $this->status_egw2ical[$status]; @@ -480,7 +480,7 @@ class calendar_ical extends calendar_boupdate 'PARTSTAT' => 'NEEDS-ACTION', 'CUTYPE' => 'INDIVIDUAL', 'RSVP' => 'TRUE', - 'X-EGROUPWARE-UID' => $this->user, + 'X-EGROUPWARE-UID' => (string)$this->user, ); $event['participants'][$this->user] = true; } @@ -517,8 +517,8 @@ class calendar_ical extends calendar_boupdate { $options['EMAIL'] = $info['email']; // only add EMAIL attribute, if not already URL, as eg. Akonadi is reported to have problems with it } - if ($info['type'] != 'e') $options['X-EGROUPWARE-UID'] = $uid; - if ($quantity > 1) $options['X-EGROUPWARE-QUANTITY'] = $quantity; + if ($info['type'] != 'e') $options['X-EGROUPWARE-UID'] = (string)$uid; + if ($quantity > 1) $options['X-EGROUPWARE-QUANTITY'] = (string)$quantity; $attributes['ATTENDEE'][] = $participantURL; $parameters['ATTENDEE'][] = $options; }