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

Some cleanups to the [iv]cal imports.

Browse Source
This commit is contained in:
skeeter 2001-11-13 02:03:58 +00:00
parent 0b9d3e5f44
commit 4e8d88a9c4
1 changed files with 29 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
calendar/inc/class.boicalendar.inc.php
View File

@ -2976,7 +2976,6 @@ class boicalendar
{ {
$uid_exists = $so_event->find_uid($ical['event'][$i]['uid']['value']); $uid_exists = $so_event->find_uid($ical['event'][$i]['uid']['value']);
} }
if($uid_exists) if($uid_exists)
{ {
$event = $so_event->read_entry($uid_exists); $event = $so_event->read_entry($uid_exists);
@ -3086,19 +3085,20 @@ class boicalendar
if(isset($ical['event'][$i]['rrule'])) if(isset($ical['event'][$i]['rrule']))
{ {
// recur_enddate // recur_enddate
// if($ical['event'][$i]['rrule']['until']) if($ical['event'][$i]['rrule']['until'])
// { {
// $recur_enddate['year'] = $ical['event'][$i]['rrule']['until']['year']; $recur_enddate['year'] = $ical['event'][$i]['rrule']['until']['year'];
// $recur_enddate['month'] = $ical['event'][$i]['rrule']['until']['month']; $recur_enddate['month'] = $ical['event'][$i]['rrule']['until']['month'];
// $recur_enddate['day'] = $ical['event'][$i]['rrule']['until']['mday']; $recur_enddate['mday'] = $ical['event'][$i]['rrule']['until']['mday'];
// } }
// else else
// { {
// $recur_enddate['year'] = 0; $recur_enddate['year'] = 0;
// $recur_enddate['month'] = 0; $recur_enddate['month'] = 0;
// $recur_enddate['day'] = 0; $recur_enddate['mday'] = 0;
// } }
// recur_data
$recur_data = 0; $recur_data = 0;
if($ical['event'][$i]['rrule']['byday']) if($ical['event'][$i]['rrule']['byday'])
{ {
@ -3121,29 +3121,39 @@ class boicalendar
} }
} }
// interval
if(!isset($ical['event'][$i]['rrule']['interval'])) if(!isset($ical['event'][$i]['rrule']['interval']))
{ {
$ical['event'][$i]['rrule']['interval'] = 1; $interval = 1;
} }
else
{
$interval = intval($ical['event'][$i]['rrule']['interval']);
}
// recur_type
switch($ical['event'][$i]['rrule']['freq']) switch($ical['event'][$i]['rrule']['freq'])
{ {
case DAILY: case DAILY:
$recur_type = MCAL_RECUR_DAILY; $recur_type = MCAL_RECUR_DAILY;
break; break;
case WEEKLY: case WEEKLY:
$so_event->set_recur_weekly(intval($ical['event'][$i]['rrule']['until']['year']),intval($ical['event'][$i]['rrule']['until']['month']),intval($ical['event'][$i]['rrule']['until']['mday']),intval($ical['event'][$i]['rrule']['interval']),$recur_data); $so_event->set_recur_weekly(intval($recur_enddate['year']),intval($recur_enddate['month']),intval($recur_enddate['mday']),$interval,$recur_data);
break; break;
case MONTHLY: case MONTHLY:
// Still need to determine if this is by day or by week for the month.. // Still need to determine if this is by day or by week for the month..
// $recur_type = MCAL_RECUR_M??????; // $recur_type = MCAL_RECUR_M??????;
break; break;
case YEARLY: case YEARLY:
$so_event->set_recur_yearly(intval($ical['event'][$i]['rrule']['until']['year']),intval($ical['event'][$i]['rrule']['until']['month']),intval($ical['event'][$i]['rrule']['until']['mday']),intval($ical['event'][$i]['rrule']['interval'])); $so_event->set_recur_yearly(intval($recur_enddate['year']),intval($recur_enddate['month']),intval($recur_enddate['mday']),$interval);
break; break;
} }
} }
else
{
$so_event->set_recur_none();
}
// Owner
if(!isset($ical['event'][$i]['organizer']) || (isset($ical['event'][$i]['organizer']) && $this->is_owner($ical['event'][$i]['organizer']))) if(!isset($ical['event'][$i]['organizer']) || (isset($ical['event'][$i]['organizer']) && $this->is_owner($ical['event'][$i]['organizer'])))
{ {
$so_event->add_attribute('owner',$GLOBALS['phpgw_info']['user']['account_id']); $so_event->add_attribute('owner',$GLOBALS['phpgw_info']['user']['account_id']);