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

use the client UID for all iCal exports, but SyncML

Browse Source
This commit is contained in:
Ralf Becker 2008-10-05 09:22:45 +00:00
parent 1d7f34ff62
commit dab4aa74b6
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
calendar/inc/class.calendar_boupdate.inc.php
View File

@ -571,7 +571,7 @@ class calendar_boupdate extends calendar_bo
break; break;
case 'ical': 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') if ($method == 'REQUEST')
{ {
$attachment = array( 'string' => $ics, $attachment = array( 'string' => $ics,

6
calendar/inc/class.calendar_uiforms.inc.php
View File

@ -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 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(); $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'); $ics_file = tempnam($GLOBALS['egw_info']['server']['temp_dir'],'ics');
if(($f = fopen($ics_file,'w'))) 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 (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'); $msg = lang('Permission denied');
@ -1357,7 +1357,7 @@ class calendar_uiforms extends calendar_ui
} }
else 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)); $GLOBALS['egw']->browser->content_header($content['file'] ? $content['file'] : 'event.ics','text/calendar',bytes($ical));
echo $ical; echo $ical;
$GLOBALS['egw']->common->egw_exit(); $GLOBALS['egw']->common->egw_exit();