extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-10-06 18:12:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

reverting accidental commit r36964

Browse Source
This commit is contained in:
Ralf Becker 2011-10-16 08:51:11 +00:00
parent 377a32ef7a
commit 49a6cdd34d
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
calendar/inc/class.calendar_ical.inc.php
View File

@ -466,8 +466,8 @@ class calendar_ical extends calendar_boupdate
$cutype = 'GROUP';
if ($this->productManufacturer == 'groupdav')
{
$participantURL = 'urn:uuid:'.common::generate_uid('group', substr($uid, 1));
$cutype = 'GROUP';
$participantURL = 'invalid:nomail';
$cutype = 'INDIVIDUAL';
}
$members = $GLOBALS['egw']->accounts->members($uid, true);
if (!isset($event['participants'][$this->user]) && in_array($this->user, $members))
@ -487,8 +487,7 @@ class calendar_ical extends calendar_boupdate
}
break;
case 'r':
$participantURL = 'urn:uuid:'.common::generate_uid('resources', substr($uid, 1));
$cutype = ExecMethod2('phpgwapi.groupdav_principals.resouce_is_location', substr($uid, 1)) ? 'ROOM' : 'RESOURCE';
$cutype = 'RESOURCE';
break;
case 'u': // account
case 'c': // contact
@ -506,10 +505,7 @@ class calendar_ical extends calendar_boupdate
if (!empty($status)) $options['PARTSTAT'] = $status;
if (!empty($cutype)) $options['CUTYPE'] = $cutype;
if (!empty($rsvp)) $options['RSVP'] = $rsvp;
if (!empty($info['email']) && $participantURL != 'MAILTO:'.$info['email'])
{
$options['EMAIL'] = $info['email']; // only add EMAIL attribute, if not already URL, as eg. Akonadi is reported to have problems with it
}
if (!empty($info['email'])) $options['EMAIL'] = $info['email'];
if ($info['type'] != 'e') $options['X-EGROUPWARE-UID'] = $uid;
if ($quantity > 1) $options['X-EGROUPWARE-QUANTITY'] = $quantity;
$attributes['ATTENDEE'][] = $participantURL;