R30710 - /trunk/calendar/inc/class.calendar_ical.inc.php

Old eGW-svn
1

Author: jlehrke
New Revision: 30710

URL: http://www.egroupware.org/viewvc/egroupware?rev=30710&view=rev
Log:
Set recurrence enddate to end time and use device TZ for vCalendar 1.0

Modified:
trunk/calendar/inc/class.calendar_ical.inc.php

Modified: trunk/calendar/inc/class.calendar_ical.inc.php
URL: http://www.egroupware.org/viewvc/egroupware/trunk/calendar/inc/class.calendar_ical.inc.php?rev=30710&r1=30709&r2=30710&view=diff

— trunk/calendar/inc/class.calendar_ical.inc.php (original)
+++ trunk/calendar/inc/class.calendar_ical.inc.php Fri Jun 11 08:19:22 2010
@@ -347,7 +347,17 @@
$time = new egw_time($event[‘recur_enddate’],egw_time::$server_timezone);
// all calculations in the event’s timezone
$time->setTimezone(self::$tz_cache[$event[‘tzid’]]);

  •   		$time->setTime(23, 59, 59);

  •   		if (empty($event['whole_day']) && !empty($event['end']))

  •   		{

  •   			$end = new egw_time($event['end'],egw_time::$server_timezone);

  •   			$end->setTimezone(self::$tz_cache[$event['tzid']]);

  •   			$arr = egw_time::to($end,'array');

  •   			$time->setTime($arr['hour'],$arr['minute'],$arr['second']);

  •   		}

  •   		else

  •   		{

  •   			$time->setTime(23, 59, 59);

  •   		}
  		$event['recur_enddate'] = egw_time::to($time, 'server');
  	}

@@ -613,6 +623,10 @@
$rrule = $rriter->generate_rrule($version);
if ($version == ‘1.0’)
{

  •   					if ($event['recur_enddate'])

  •   					{	

  •   						$rrule['UNTIL'] = self::getDateTime($event['recur_enddate'],$tzid);

  •   					}
  					$attributes['RRULE'] = $rrule['FREQ'].' '.$rrule['UNTIL'];
  				}
  				else // $version == '2.0'

ThinkGeek and WIRED’s GeekDad team up for the Ultimate
GeekDad Father’s Day Giveaway. ONE MASSIVE PRIZE to the
lucky parental unit. See the prize list and enter to win:
http://p.sf.net/sfu/thinkgeek-promo

eGroupWare-cvs mailing list
eGroupWare-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/egroupware-cvs