holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed 2 errors with the notifications mentioned on the lists:

Browse Source 
- the old boicalendar class was tried to call to create ical attachments for meating requests
- the generated link in "extended" notifications was sometimes wrong
This commit is contained in:
Ralf Becker 2006-07-28 16:30:16 +00:00
parent 2e0b22691a
commit 448a819cb6
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
calendar/inc/class.bocalupdate.inc.php
View File

@ -578,11 +578,7 @@ class bocalupdate extends bocal
break; break;
case 'ical': case 'ical':
$ics = ExecMethod('calendar.boicalendar.export',array( $ics = ExecMethod2('calendar.boical.exportVCal',$event['id'],'2.0',$method);
'l_event_id' => array($event),
'method' => $method,
'chunk_split' => False
));
if ($method == "request") if ($method == "request")
{ {
$send->AddStringAttachment($ics, "cal.ics", "8bit", "text/calendar; method=$method"); $send->AddStringAttachment($ics, "cal.ics", "8bit", "text/calendar; method=$method");
@ -800,14 +796,15 @@ class bocalupdate extends bocal
$details['participants'] = $details['participants'] ? implode("\n",$details['participants']) : ''; $details['participants'] = $details['participants'] ? implode("\n",$details['participants']) : '';
$event_arr['link']['field'] = lang('URL'); $event_arr['link']['field'] = lang('URL');
$event_arr['link']['data'] = $details['link'] = $GLOBALS['egw_info']['server']['webserver_url'].'/index.php?menuaction=calendar.uiforms.view&cal_id='.$event['id'].'&no_popup=1'; $link = $GLOBALS['egw_info']['server']['webserver_url'].'/index.php?menuaction=calendar.uiforms.view&cal_id='.$event['id'].'&no_popup=1';
// if url is only a path, try guessing the rest ;-) // if url is only a path, try guessing the rest ;-)
if ($GLOBALS['egw_info']['server']['webserver_url'][0] == '/') if ($link{0} == '/')
{ {
$details['link'] = ($GLOBALS['egw_info']['server']['enforce_ssl'] || $_SERVER['HTTPS'] ? 'https://' : 'http://'). $link = ($GLOBALS['egw_info']['server']['enforce_ssl'] || $_SERVER['HTTPS'] ? 'https://' : 'http://').
($GLOBALS['egw_info']['server']['hostname'] ? $GLOBALS['egw_info']['server']['hostname'] : 'localhost'). ($GLOBALS['egw_info']['server']['hostname'] ? $GLOBALS['egw_info']['server']['hostname'] : $_SERVER['HTTP_HOST']).
$details['link']; $details['link'];
} }
$event_arr['link']['data'] = $details['link'] = $link;
$dis = array(); $dis = array();
foreach($disinvited as $uid) foreach($disinvited as $uid)
{ {