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

"fixed problem with Lighting: a weekly repeating event of a single weekday does not set BYDAY"

Browse Source
This commit is contained in:
Ralf Becker 2008-05-17 14:34:23 +00:00
parent 499ac36bff
commit 17ce8469fe
1 changed files with 38 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
calendar/inc/class.boical.inc.php
View File

@ -577,6 +577,11 @@
// 1 is invalid,, egw uses 0 for interval // 1 is invalid,, egw uses 0 for interval
$vcardData['recur_interval'] = (int) $matches[1] != 0 ? (int) $matches[1] : 0; $vcardData['recur_interval'] = (int) $matches[1] != 0 ? (int) $matches[1] : 0;
} }
if (!isset($vcardData['start'])) // it might not yet be set, because the RRULE is before it
{
$vcardData['start'] = self::_get_attribute($component->_attributes,'DTSTART');
$vcardData['end'] = self::_get_attribute($component->_attributes,'DTEND');
}
$vcardData['recur_data'] = 0; $vcardData['recur_data'] = 0;
switch($type) switch($type)
{ {
@ -596,6 +601,11 @@
$days = explode(',',$recurenceMatches[1]); $days = explode(',',$recurenceMatches[1]);
$recur_days = $this->recur_days; $recur_days = $this->recur_days;
} }
else // no day given, use the day of dtstart
{
$vcardData['recur_data'] |= 1 << (int)date('w',$vcardData['start']);
$vcardData['recur_type'] = MCAL_RECUR_WEEKLY;
}
if ($days) if ($days)
{ {
foreach($recur_days as $id => $day) foreach($recur_days as $id => $day)
@ -742,7 +752,7 @@
$event['uid'] = $vcardData['uid'] = $attributes['value']; $event['uid'] = $vcardData['uid'] = $attributes['value'];
if ($cal_id <= 0 && !empty($vcardData['uid']) && ($uid_event = $this->read($vcardData['uid']))) if ($cal_id <= 0 && !empty($vcardData['uid']) && ($uid_event = $this->read($vcardData['uid'])))
{ {
$event['id'] = $uid_event['id']; $cal_id = $event['id'] = $uid_event['id'];
unset($uid_event); unset($uid_event);
} }
break; break;
@ -852,10 +862,6 @@
{ {
$event['id'] = $cal_id; $event['id'] = $cal_id;
} }
elseif($event['id'] && $cal_id <= 0)
{
$cal_id = $event['id']; // event[id] set via uid
}
while(($fieldName = array_shift($supportedFields))) while(($fieldName = array_shift($supportedFields)))
{ {
switch($fieldName) switch($fieldName)
@ -988,7 +994,27 @@
return $Ok; return $Ok;
} }
function valarm2egw(&$alarms, &$valarm) /**
* get the value of an attribute by its name
*
* @param array $attributes
* @param string $name eg. 'DTSTART'
* @param string $what='value'
* @return mixed
*/
static function _get_attribute($components,$name,$what='value')
{
foreach($components as $attribute)
{
if ($attribute['name'] == $name)
{
return !$what ? $attribute : $attribute[$what];
}
}
return false;
}
static function valarm2egw(&$alarms, &$valarm)
{ {
$count = 0; $count = 0;
foreach($valarm->_attributes as $vattr) foreach($valarm->_attributes as $vattr)