extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-05 05:29:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

"improved import of iCal, specially participants"

Browse Source
This commit is contained in:
Ralf Becker 2008-10-22 09:32:14 +00:00
parent ae2431ef28
commit d76143310e
1 changed files with 36 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -125,8 +125,8 @@ class calendar_ical extends calendar_boupdate
'ATTENDEE' => array('dbName' => 'participants'), 'ATTENDEE' => array('dbName' => 'participants'),
'RRULE' => array('dbName' => 'recur_type'), 'RRULE' => array('dbName' => 'recur_type'),
'EXDATE' => array('dbName' => 'recur_exception'), 'EXDATE' => array('dbName' => 'recur_exception'),
'PRIORITY' => array('dbName' => 'priority'), 'PRIORITY' => array('dbName' => 'priority'),
'TRANSP' => array('dbName' => 'non_blocking'), 'TRANSP' => array('dbName' => 'non_blocking'),
'CATEGORIES' => array('dbName' => 'category'), 'CATEGORIES' => array('dbName' => 'category'),
); );
if(!is_array($this->supportedFields)) if(!is_array($this->supportedFields))
@ -789,15 +789,22 @@ class calendar_ical extends calendar_boupdate
case 'ATTENDEE': case 'ATTENDEE':
if (preg_match('/MAILTO:([@.a-z0-9_-]+)/i',$attributes['value'],$matches) || if (preg_match('/MAILTO:([@.a-z0-9_-]+)/i',$attributes['value'],$matches) ||
preg_match('/<([@.a-z0-9_-]+)>/i',$attributes['value'],$matches)) preg_match('/<([@.a-z0-9_-]+)>/i',$attributes['value'],$matches))
{ {
$email = $matches[1]; $email = $matches[1];
} }
elseif(strpos($attributes['value'],'@') !== false) elseif(strpos($attributes['value'],'@') !== false)
{ {
$email = $attributes['value']; $email = $attributes['value'];
} }
if (($uid = $attributes['params']['X-EGROUPWARE-UID']) && else
($info = $this->resource_info($uid)) && $info['email'] == $email) {
$email = false; // no email given
}
$searcharray = array();
if ($email) $searcharray = array('email' => $email, 'email_home' => $email);
if (isset($attributes['params']['CN']) && $attributes['params']['CN']) $searcharray['n_fn'] = $attributes['params']['CN'];
if (($uid = $attributes['params']['X-EGROUPWARE-UID']) &&
($info = $this->resource_info($uid)) && (!$email || $info['email'] == $email))
{ {
// we use the (checked) X-EGROUPWARE-UID // we use the (checked) X-EGROUPWARE-UID
} }
@ -809,19 +816,22 @@ class calendar_ical extends calendar_boupdate
{ {
$uid = $GLOBALS['egw_info']['user']['account_id']; $uid = $GLOBALS['egw_info']['user']['account_id'];
} }
elseif (($uid = $GLOBALS['egw']->accounts->name2id($email,'account_email'))) elseif ($email && ($uid = $GLOBALS['egw']->accounts->name2id($email,'account_email')))
{ {
// we use the account we found // we use the account we found
} }
elseif ((list($data) = ExecMethod2('addressbook.addressbook_bo.search',array( elseif(!$searcharray)
'email' => $email, {
'email_home' => $email, continue; // participants without email AND CN --> ignore it
),true,'','','',false,'OR'))) }
elseif ((list($data) = ExecMethod2('addressbook.addressbook_bo.search',$searcharray,
'id,account_id,n_fn','account_id IS NOT NULL DESC, n_fn IS NOT NULL DESC','','',false,'OR')))
{ {
$uid = 'c'.$data['id']; $uid = $data['account_id'] ? (int)$data['account_id'] : 'c'.$data['id'];
} }
else else
{ {
if (!$email) $email = 'no-email@egroupware.org'; // set dummy email to store the CN
$uid = 'e'.($attributes['params']['CN'] ? $attributes['params']['CN'].' <'.$email.'>' : $email); $uid = 'e'.($attributes['params']['CN'] ? $attributes['params']['CN'].' <'.$email.'>' : $email);
} }
$event['participants'][$uid] = isset($attributes['params']['PARTSTAT']) ? $event['participants'][$uid] = isset($attributes['params']['PARTSTAT']) ?
@ -918,8 +928,8 @@ class calendar_ical extends calendar_boupdate
} }
// If this is an updated meeting, and the client doesn't support // If this is an updated meeting, and the client doesn't support
// participants, add them back // participants OR the event no longer contains participants, add them back
if( $cal_id > 0 && !isset($this->supportedFields['participants'])) if( $cal_id > 0 && (!isset($this->supportedFields['participants']) || !count($event['participants'])))
{ {
if (($egw_event = $this->read($cal_id))) if (($egw_event = $this->read($cal_id)))
{ {
@ -947,9 +957,14 @@ class calendar_ical extends calendar_boupdate
} }
// check if iCal changes the organizer, which is not allowed // check if iCal changes the organizer, which is not allowed
if ($cal_id > 0 && ($egw_event = $this->read($cal_id)) && $event['owner'] != $egw_event['owner']) if ($cal_id > 0 && ($egw_event = $this->read($cal_id)))
{ {
$event['owner'] = $egw_event['owner']; // set it back to the original owner $event['owner'] = $egw_event['owner']; // do NOT change the original owner
}
// check for new events if an owner is set and the current user has add rights for that owners calendar
elseif (!isset($event['owner']) || $this->check_perms(EGW_ACL_ADD,0,$event['owner']))
{
$event['owner'] = $GLOBALS['egw_info']['user']['account_id']; // if not set the current user
} }
#error_log('ALARMS'); #error_log('ALARMS');