From dab4aa74b6b161fdd9f631243c31983734759cce Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Sun, 5 Oct 2008 09:22:45 +0000 Subject: [PATCH] use the client UID for all iCal exports, but SyncML --- calendar/inc/class.calendar_boupdate.inc.php | 2 +- calendar/inc/class.calendar_uiforms.inc.php | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/calendar/inc/class.calendar_boupdate.inc.php b/calendar/inc/class.calendar_boupdate.inc.php index 1562dfc36f..e7c77b31f1 100644 --- a/calendar/inc/class.calendar_boupdate.inc.php +++ b/calendar/inc/class.calendar_boupdate.inc.php @@ -571,7 +571,7 @@ class calendar_boupdate extends calendar_bo break; case 'ical': - $ics = ExecMethod2('calendar.calendar_ical.exportVCal',$event['id'],'2.0',$method); + $ics = ExecMethod2('calendar.calendar_ical.exportVCal',$event['id'],'2.0',$method,false); if ($method == 'REQUEST') { $attachment = array( 'string' => $ics, diff --git a/calendar/inc/class.calendar_uiforms.inc.php b/calendar/inc/class.calendar_uiforms.inc.php index 1afe0fec0b..d965b97047 100644 --- a/calendar/inc/class.calendar_uiforms.inc.php +++ b/calendar/inc/class.calendar_uiforms.inc.php @@ -607,7 +607,7 @@ class calendar_uiforms extends calendar_ui list($subject,$body) = $this->bo->get_update_message($event,$added ? MSG_ADDED : MSG_MODIFIED); // update-message is in TZ of the user $boical = new calendar_ical(); - $ics = $boical->exportVCal(array($event),'2.0','request'); + $ics = $boical->exportVCal(array($event),'2.0','request',false); $ics_file = tempnam($GLOBALS['egw_info']['server']['temp_dir'],'ics'); if(($f = fopen($ics_file,'w'))) @@ -1328,7 +1328,7 @@ class calendar_uiforms extends calendar_ui { if (is_numeric($cal_id = $content ? $content : $_REQUEST['cal_id'])) { - if (!($ical =& ExecMethod2('calendar.calendar_ical.exportVCal',$cal_id,'2.0'))) + if (!($ical =& ExecMethod2('calendar.calendar_ical.exportVCal',$cal_id,'2.0','PUBLISH',false))) { $msg = lang('Permission denied'); @@ -1357,7 +1357,7 @@ class calendar_uiforms extends calendar_ui } else { - $ical =& ExecMethod2('calendar.calendar_ical.exportVCal',$events,'2.0'/*$content['version']*/); + $ical =& ExecMethod2('calendar.calendar_ical.exportVCal',$events,'2.0'/*$content['version']*/,'PUBLISH',false); $GLOBALS['egw']->browser->content_header($content['file'] ? $content['file'] : 'event.ics','text/calendar',bytes($ical)); echo $ical; $GLOBALS['egw']->common->egw_exit();