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

Cleaned up the call to create_email_preferences().

Browse Source
This commit is contained in:
skeeter 2001-11-13 12:17:10 +00:00
parent 10285c366e
commit 7e77cf8439
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2955,7 +2955,7 @@ class boicalendar
// time limit should be controlled elsewhere // time limit should be controlled elsewhere
@set_time_limit(0); @set_time_limit(0);
$GLOBALS['phpgw']->common->create_emailpreferences(); $GLOBALS['phpgw_info']['user']['preferences'] = $GLOBALS['phpgw']->preferences->create_email_preferences();
$users_email = $GLOBALS['phpgw_info']['user']['preferences']['email']['address']; $users_email = $GLOBALS['phpgw_info']['user']['preferences']['email']['address'];
$cats = CreateObject('phpgwapi.categories'); $cats = CreateObject('phpgwapi.categories');
$ical = $this->parse($mime_msg); $ical = $this->parse($mime_msg);
@ -2976,6 +2976,10 @@ class boicalendar
{ {
$uid_exists = $so_event->find_uid($ical['event'][$i]['uid']['value']); $uid_exists = $so_event->find_uid($ical['event'][$i]['uid']['value']);
} }
else
{
$uid_exists = False;
}
if($uid_exists) if($uid_exists)
{ {
$event = $so_event->read_entry($uid_exists); $event = $so_event->read_entry($uid_exists);
@ -3085,11 +3089,11 @@ 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(isset($ical['event'][$i]['rrule']['until']))
{ {
$recur_enddate['year'] = $ical['event'][$i]['rrule']['until']['year']; $recur_enddate['year'] = intval($ical['event'][$i]['rrule']['until']['year']);
$recur_enddate['month'] = $ical['event'][$i]['rrule']['until']['month']; $recur_enddate['month'] = intval($ical['event'][$i]['rrule']['until']['month']);
$recur_enddate['mday'] = $ical['event'][$i]['rrule']['until']['mday']; $recur_enddate['mday'] = intval($ical['event'][$i]['rrule']['until']['mday']);
} }
else else
{ {
@ -3100,7 +3104,7 @@ class boicalendar
// recur_data // recur_data
$recur_data = 0; $recur_data = 0;
if($ical['event'][$i]['rrule']['byday']) if(isset($ical['event'][$i]['rrule']['byday']))
{ {
$week_days = Array( $week_days = Array(
MCAL_M_SUNDAY => 'SU', MCAL_M_SUNDAY => 'SU',
@ -3137,14 +3141,14 @@ class boicalendar
$recur_type = MCAL_RECUR_DAILY; $recur_type = MCAL_RECUR_DAILY;
break; break;
case WEEKLY: case WEEKLY:
$so_event->set_recur_weekly(intval($recur_enddate['year']),intval($recur_enddate['month']),intval($recur_enddate['mday']),$interval,$recur_data); $so_event->set_recur_weekly($recur_enddate['year'],$recur_enddate['month'],$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($recur_enddate['year']),intval($recur_enddate['month']),intval($recur_enddate['mday']),$interval); $so_event->set_recur_yearly($recur_enddate['year'],$recur_enddate['month'],$recur_enddate['mday'],$interval);
break; break;
} }
} }