"MAILTO href in ATTENDEE, is just the email address, NO cn"

This commit is contained in:
Ralf Becker 2008-05-07 09:09:33 +00:00
parent faae1ce6b6
commit 121752ed72

View File

@ -197,7 +197,8 @@
$mailto = $GLOBALS['egw']->accounts->id2name($uid,'account_email'); $mailto = $GLOBALS['egw']->accounts->id2name($uid,'account_email');
$cn = trim($GLOBALS['egw']->accounts->id2name($uid,'account_firstname'). ' ' . $cn = trim($GLOBALS['egw']->accounts->id2name($uid,'account_firstname'). ' ' .
$GLOBALS['egw']->accounts->id2name($uid,'account_lastname')); $GLOBALS['egw']->accounts->id2name($uid,'account_lastname'));
$attributes['ATTENDEE'][] = $mailto ? 'MAILTO:'. $cn .'<'. $mailto .'>' : ''; // RB: MAILTO href contains only the email-address, NO cn!
$attributes['ATTENDEE'][] = $mailto ? 'MAILTO:'.$mailto : '';
// ROLE={CHAIR|REQ-PARTICIPANT|OPT-PARTICIPANT|NON-PARTICIPANT} NOT used by eGW atm. // ROLE={CHAIR|REQ-PARTICIPANT|OPT-PARTICIPANT|NON-PARTICIPANT} NOT used by eGW atm.
$role = $uid == $event['owner'] ? 'CHAIR' : 'REQ-PARTICIPANT'; $role = $uid == $event['owner'] ? 'CHAIR' : 'REQ-PARTICIPANT';
// RSVP={TRUE|FALSE} // resonse expected, not set in eGW => status=U // RSVP={TRUE|FALSE} // resonse expected, not set in eGW => status=U
@ -231,18 +232,18 @@
} }
break; break;
case 'CLASS': case 'CLASS':
$attributes['CLASS'] = $event['public'] ? 'PUBLIC' : 'PRIVATE'; $attributes['CLASS'] = $event['public'] ? 'PUBLIC' : 'PRIVATE';
break; break;
case 'ORGANIZER': // according to iCalendar standard, ORGANIZER not used for events in the own calendar case 'ORGANIZER': // according to iCalendar standard, ORGANIZER not used for events in the own calendar
if (!isset($event['participants'][$event['owner']]) || count($event['participants']) > 1) if (!isset($event['participants'][$event['owner']]) || count($event['participants']) > 1)
{ {
$mailtoOrganizer = $GLOBALS['egw']->accounts->id2name($event['owner'],'account_email'); $mailtoOrganizer = $GLOBALS['egw']->accounts->id2name($event['owner'],'account_email');
$attributes['ORGANIZER'] = $mailtoOrganizer ? 'MAILTO:'.$mailtoOrganizer : ''; $attributes['ORGANIZER'] = $mailtoOrganizer ? 'MAILTO:'.$mailtoOrganizer : '';
$parameters['ORGANIZER']['CN'] = trim($GLOBALS['egw']->accounts->id2name($event['owner'],'account_firstname').' '. $parameters['ORGANIZER']['CN'] = trim($GLOBALS['egw']->accounts->id2name($event['owner'],'account_firstname').' '.
$GLOBALS['egw']->accounts->id2name($event['owner'],'account_lastname')); $GLOBALS['egw']->accounts->id2name($event['owner'],'account_lastname'));
} }
break; break;
case 'DTEND': case 'DTEND':
@ -263,7 +264,7 @@
foreach($this->recur_days_1_0 as $id => $day) foreach($this->recur_days_1_0 as $id => $day)
{ {
if ($event['recur_data'] & $id) $days[] = strtoupper(substr($day,0,2)); if ($event['recur_data'] & $id) $days[] = strtoupper(substr($day,0,2));
} }
$rrule['BYDAY'] = implode(' ',$days); $rrule['BYDAY'] = implode(' ',$days);
$rrule['FREQ'] = $rrule['FREQ'].' '.$rrule['BYDAY']; $rrule['FREQ'] = $rrule['FREQ'].' '.$rrule['BYDAY'];
break; break;