mirror
/
SG-iCalendar
kopia lustrzana https://github.com/friendica/SG-iCalendar
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

fix last occurrence of an event (one was missing)

master
Tanguy Pruvot 2010-10-30 14:19:08 +02:00
rodzic e81a439d4f
commit 7ddf89af77
1 zmienionych plików z 9 dodań i 11 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

20
helpers/SG_iCal_Freq.php
Wyświetl plik

@ -68,7 +68,7 @@ class SG_iCal_Freq {
if( isset($this->rules['count']) ) {
$n = $start;
for($i=0;$i<$this->rules['count'];$i++) {
for($i=0;$i<$this->rules['count']-1;$i++) {
$n = $this->findNext($n);
}
$this->rules['until'] = $n;
@ -99,7 +99,7 @@ class SG_iCal_Freq {
*/
public function nextOccurrence( $offset ) {
$start = ($offset > $this->start) ? $offset : $this->start;
return $this->findNext($offset);
return $this->findNext($start);
}
/**
@ -107,13 +107,11 @@ class SG_iCal_Freq {
* @return int timestamp
*/
public function lastOccurrence() {
$temp_timestamp = $this->findNext($this->start);
$timestamp = 0;
while ($temp_timestamp) {
$timestamp = $temp_timestamp;
$temp_timestamp = $this->findNext($temp_timestamp);
$next = $this->findNext($this->start);
while ($next) {
$next = $this->findNext($next);
}
return $timestamp;
return $next;
}
/**
@ -143,7 +141,7 @@ class SG_iCal_Freq {
$echo = false;
//make sure the offset is valid
if( $offset === false || (isset($this->rules['until']) && $this->rules['until'] <= $offset) ) {
if( $offset === false || (isset($this->rules['until']) && $offset > $this->rules['until']) ) {
if($echo) echo 'STOP: ' . date('r', $offset) . "\n";
return false;
}
@ -196,7 +194,7 @@ class SG_iCal_Freq {
}
}
if( $this->start > $offset && $this->start < $t ) {
if( $offset < $this->start && $this->start < $t ) {
return $this->start;
} else if( $found && ($t != $offset)) {
if( $this->validDate( $t ) ) {
@ -398,7 +396,7 @@ class SG_iCal_Freq {
}
private function validDate( $t ) {
if( isset($this->rules['until']) && $this->rules['until'] <= $t ) {
if( isset($this->rules['until']) && $t > $this->rules['until'] ) {
return false;
}