Author: leithoff
New Revision: 29069
URL: http://www.egroupware.org/viewvc/egroupware?rev=29069&view=rev
Log:
as you can now see other apps in calendar, you must make sure you read only true calendar events for recurring dates, participants and customfields
Modified:
trunk/calendar/inc/class.calendar_so.inc.php
Modified: trunk/calendar/inc/class.calendar_so.inc.php
URL: http://www.egroupware.org/viewvc/egroupware/trunk/calendar/inc/class.calendar_so.inc.php?rev=29069&r1=29068&r2=29069&view=diff
— trunk/calendar/inc/class.calendar_so.inc.php (original)
+++ trunk/calendar/inc/class.calendar_so.inc.php Mon Feb 1 11:35:05 2010
@@ -460,22 +460,22 @@
$recur_dates[] = $row[‘cal_recur_date’];
}
if ($row[‘participants’])
-
{ -
$row['participants'] = explode(',',$row['participants']); -
$row['participants'] = array_combine($row['participants'], -
array_fill(0,count($row['participants']),'')); -
} -
else -
{ -
$row['participants'] = array(); -
} -
$row['alarm'] = array();
-
{ -
$row['participants'] = explode(',',$row['participants']); -
$row['participants'] = array_combine($row['participants'], -
array_fill(0,count($row['participants']),'')); -
} -
else -
{ -
$row['participants'] = array(); -
} -
$row['alarm'] = array(); $row['recur_exception'] = $row['recur_exception'] ? explode(',',$row['recur_exception']) : array(); $events[$id] = egw_db::strip_array_keys($row,'cal_'); } //_debug_array($events);
-
if (count($events))
-
if (count($ids)) { // now ready all users with the given cal_id AND (cal_recur_date=0 or the fitting recur-date) // This will always read the first entry of each recuring event too, we eliminate it later
The Planet: dedicated and managed hosting, cloud storage, colocation
Stay online with enterprise data centers and the best network in the business
Choose flexible plans and management services without long-term contracts
Personal 24x7 support from experience hosting pros just a phone call away.
http://p.sf.net/sfu/theplanet-com
eGroupWare-cvs mailing list
eGroupWare-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/egroupware-cvs