extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-06-22 02:41:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix daywise search

Browse Source
This commit is contained in:
Jörg Lehrke 2010-02-19 17:10:15 +00:00
parent 7304df7dcd
commit ce7324f12f
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
calendar/inc/class.calendar_bo.inc.php
View File

@ -16,6 +16,10 @@ if (!defined('ACL_TYPE_IDENTIFER')) // used to mark ACL-values for the debug_mes
define('ACL_TYPE_IDENTIFER','***ACL***'); define('ACL_TYPE_IDENTIFER','***ACL***');
} }
define('HOUR_s',60*60);
define('DAY_s',24*HOUR_s);
define('WEEK_s',7*DAY_s);
/** /**
* Gives read access to the calendar, but all events the user is not participating are private! * Gives read access to the calendar, but all events the user is not participating are private!
* Used by addressbook. * Used by addressbook.
@ -292,9 +296,9 @@ class calendar_bo
* filter string all (not rejected), accepted, unknown, tentative, rejected or hideprivate * filter string all (not rejected), accepted, unknown, tentative, rejected or hideprivate
* query string pattern so search for, if unset or empty all matching entries are returned (no search) * query string pattern so search for, if unset or empty all matching entries are returned (no search)
* Please Note: a search never returns repeating events more then once AND does not honor start+end date !!! * Please Note: a search never returns repeating events more then once AND does not honor start+end date !!!
* dayswise boolean on True it returns an array with YYYYMMDD strings as keys and an array with events * daywise boolean on True it returns an array with YYYYMMDD strings as keys and an array with events
* (events spanning multiple days are returned each day again (!)) otherwise it returns one array with * (events spanning multiple days are returned each day again (!)) otherwise it returns one array with
* the events (default), not honored in a search ==> always returns an array of events ! * the events (default), not honored in a search ==> always returns an array of events!
* date_format string date-formats: 'ts'=timestamp (default), 'array'=array, or string with format for date * date_format string date-formats: 'ts'=timestamp (default), 'array'=array, or string with format for date
* offset boolean/int false (default) to return all entries or integer offset to return only a limited result * offset boolean/int false (default) to return all entries or integer offset to return only a limited result
* enum_recuring boolean if true or not set (default) or daywise is set, each recurence of a recuring events is returned, * enum_recuring boolean if true or not set (default) or daywise is set, each recurence of a recuring events is returned,

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

@ -1912,7 +1912,7 @@ ORDER BY cal_user_type, cal_usre_id
} }
/** /**
* Moves a datetime to the beginning og the day within timezone * Moves a datetime to the beginning of the day within timezone
* *
* @param egw_time &time the datetime entry * @param egw_time &time the datetime entry
* @param string tz_id timezone * @param string tz_id timezone