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

fix bug in OC_Calendar_Repeat

This commit is contained in:
Georg Ehrke 2012-06-11 17:13:20 +02:00
parent 24a1ab8c15
commit 2dd84373c1
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -34,7 +34,7 @@ class OC_Calendar_Repeat{
public static function get_inperiod($id, $from, $until){
$stmt = OCP\DB::prepare( 'SELECT * FROM *PREFIX*calendar_repeat WHERE eventid = ?'
.' AND ((startdate >= ? AND startdate <= ?)'
.' OR (enddate >= ? AND enddate <= ?)');
.' OR (enddate >= ? AND enddate <= ?))');
$result = $stmt->execute(array($id,
$from, $until,
$from, $until));
@ -68,7 +68,7 @@ class OC_Calendar_Repeat{
public static function getcalendar_inperiod($id, $from, $until){
$stmt = OCP\DB::prepare( 'SELECT * FROM *PREFIX*calendar_repeat WHERE calid = ?'
.' AND ((startdate >= ? AND startdate <= ?)'
.' OR (enddate >= ? AND enddate <= ?)');
.' OR (enddate >= ? AND enddate <= ?))');
$result = $stmt->execute(array($id,
$from, $until,
$from, $until));
@ -155,12 +155,27 @@ class OC_Calendar_Repeat{
* @return (bool)
*/
public static function is_cached($id){
if(count(self::get($id)) === 1){
if(count(self::get($id)) != 0){
return true;
}else{
return false;
}
}
/*
* @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
* @return (bool)
*/
public static function is_cached_inperiod($id, $start, $end){
if(count(self::get_inperiod($id, $start, $end)) != 0){
return true;
}else{
return false;
}
}
/*
* @brief checks if a whole calendar is already cached
* @param (int) id - id of the calendar