mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

use DateTime as type of parameter in the functions is_cached_inperiod and get_inperiod

This commit is contained in:
Georg Ehrke 2012-06-15 11:39:19 +02:00
parent e4529301ff
commit 22a33b509f
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/calendar/lib/app.php
View File

@ -378,8 +378,8 @@ class OC_Calendar_App{
'description' => isset($vevent->DESCRIPTION)?htmlspecialchars($vevent->DESCRIPTION->value):'',
'lastmodified'=>$lastmodified,
'allDay'=>$allday);
if(OC_Calendar_Object::isrepeating($id) && OC_Calendar_Repeat::is_cached_inperiod($event['id'], OC_Calendar_Object::getUTCforMDB($start), OC_Calendar_Object::getUTCforMDB($end))){
$cachedinperiod = OC_Calendar_Repeat::get_inperiod($id, OC_Calendar_Object::getUTCforMDB($start), OC_Calendar_Object::getUTCforMDB($end));
if(OC_Calendar_Object::isrepeating($id) && OC_Calendar_Repeat::is_cached_inperiod($event['id'], $start, $end)){
$cachedinperiod = OC_Calendar_Repeat::get_inperiod($id, $start, $end);
foreach($cachedinperiod as $cachedevent){
$dynamicoutput = array();
if($allday){

12
apps/calendar/lib/repeat.php
View File

@ -27,8 +27,8 @@ class OC_Calendar_Repeat{
/*
* @brief returns the cache of an event in a specific peroid
* @param (int) $id - id of the event
* @param (string) $from - start for period in UTC
* @param (string) $until - end for period in UTC
* @param (DateTime) $from - start for period in UTC
* @param (DateTime) $until - end for period in UTC
* @return (array)
*/
public static function get_inperiod($id, $from, $until){
@ -36,8 +36,8 @@ class OC_Calendar_Repeat{
.' AND ((startdate >= ? AND startdate <= ?)'
.' OR (enddate >= ? AND enddate <= ?))');
$result = $stmt->execute(array($id,
$from, $until,
$from, $until));
OC_Calendar_Object::getUTCforMDB($from), OC_Calendar_Object::getUTCforMDB($until),
OC_Calendar_Object::getUTCforMDB($from), OC_Calendar_Object::getUTCforMDB($until)));
$return = array();
while($row = $result->fetchRow()){
$return[] = $row;
@ -164,8 +164,8 @@ class OC_Calendar_Repeat{
/*
* @brief checks if an event is already cached in a specific period
* @param (int) id - id of the event
* @param (string) $from - start for period in UTC
* @param (string) $until - end for period in UTC
* @param (DateTime) $from - start for period in UTC
* @param (DateTime) $until - end for period in UTC
* @return (bool)
*/
public static function is_cached_inperiod($id, $start, $end){