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

Fix group participant issue

Browse Source
This commit is contained in:
Jörg Lehrke 2010-04-12 07:26:21 +00:00
parent 3f6180affa
commit 682c363bb4
1 changed files with 26 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1943,9 +1943,16 @@ class calendar_ical extends calendar_boupdate
break; break;
case 'file': // used outside of SyncML, eg. by the calendar itself ==> all possible fields case 'file': // used outside of SyncML, eg. by the calendar itself ==> all possible fields
if ($this->cal_prefs['export_timezone']) if (isset($this->cal_prefs['export_timezone']))
{ {
$this->tzid = $this->cal_prefs['export_timezone']; switch ($this->cal_prefs['export_timezone'])
{
case 1:
$this->tzid = false; // use event's TZ
break;
default:
$this->tzid = $this->cal_prefs['export_timezone'];
}
} }
else else
{ {
@ -2611,10 +2618,10 @@ class calendar_ical extends calendar_boupdate
// ... and for provided CN // ... and for provided CN
if (!empty($attributes['params']['CN'])) if (!empty($attributes['params']['CN']))
{ {
if ($attributes['params']['CN'][0] == '"' $cn = $attributes['params']['CN'];
&& substr($attributes['params']['CN'],-1) == '"') if ($cn[0] == '"' && substr($cn,-1) == '"')
{ {
$cn = substr($attributes['params']['CN'],1,-1); $cn = substr($cn,1,-1);
} }
$searcharray['n_fn'] = $cn; $searcharray['n_fn'] = $cn;
} }
@ -2623,9 +2630,21 @@ class calendar_ical extends calendar_boupdate
$searcharray['n_fn'] = $cn; $searcharray['n_fn'] = $cn;
} }
//elseif (//$attributes['params']['CUTYPE'] == 'GROUP' if ($this->log)
if (preg_match('/(.*) Group/', $cn, $matches))
{ {
error_log(__FILE__.'['.__LINE__.'] '.__METHOD__
. "() Search participant: '$cn', '$email'\n",3,$this->logfile);
}
//elseif (//$attributes['params']['CUTYPE'] == 'GROUP'
if (preg_match('/(.*) '. lang('Group') . '/', $cn, $matches))
{
// we found a group
if ($this->log)
{
error_log(__FILE__.'['.__LINE__.'] '.__METHOD__
. "() Found group: '$matches[1]', '$cn', '$email'\n",3,$this->logfile);
}
if (($uid = $GLOBALS['egw']->accounts->name2id($matches[1], 'account_lid', 'g'))) if (($uid = $GLOBALS['egw']->accounts->name2id($matches[1], 'account_lid', 'g')))
{ {
//Horde::logMessage("vevent2egw: group participant $uid", //Horde::logMessage("vevent2egw: group participant $uid",