new getAllOccurrences() method which also set cache, now use cache in findNext()

helpers/SG_iCal_Freq.php

@@ -80,6 +80,24 @@ class SG_iCal_Freq {
 		}
 	}
 
+	
+	/**
+	 * Returns all timestamps array(), build the cache if not made before
+	 * @return array
+	 */
+	public function getAllOccurrences() {
+		if (empty($this->cache)) {
+			//build cache
+			$i=0; $this->cache[0] = $this->start;
+			$next = $this->findNext($this->start);
+			while ($next) {
+				$i++; $this->cache[$i] = $next;
+				$next = $this->findNext($next);
+			}
+		}
+		return $this->cache;
+	}
+
 	/**
 	 * Returns the previous (most recent) occurrence of the rule from the
 	 * given offset
@@ -88,12 +106,11 @@ class SG_iCal_Freq {
 	 */
 	public function previousOccurrence( $offset ) {
 		if (!empty($this->cache)) {
-			reset($this->cache);
+			$t2=$this->cache[0];
-			while( ($t2 = next($this->cache)) < $offset) {
+			foreach($this->cache as $ts) {
-				if( $t2 == false ){
+				if ($ts >= $offset)
-					break;
+					return $t2;
-				}
+				$t2 = $ts;
-				$ts = $t2;
 			}
 		} else {
 			$ts = $this->start;
@@ -168,6 +185,14 @@ class SG_iCal_Freq {
 	 * @return int
 	 */
 	public function findNext($offset) {
+		
+		if (!empty($this->cache)) {
+			foreach($this->cache as $ts) {
+				if ($ts > $offset)
+					return $ts;
+			}
+		}
+		
 		$debug = false;
 
 		//make sure the offset is valid