steffen: server/kolab-resource-handlers/kolab-resource-handlers/freebusy recurrence.class.php, 1.15, 1.16

[cvs at intevation.de]

Author: steffen

Update of /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/freebusy
In directory doto:/tmp/cvs-serv1144

Modified Files:
	recurrence.class.php 
Log Message:
Issue243 (Nth weekday of month recurrence problem) + test case

Index: recurrence.class.php
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/freebusy/recurrence.class.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- recurrence.class.php	9 Feb 2005 12:59:34 -0000	1.15
+++ recurrence.class.php	21 Feb 2005 11:13:57 -0000	1.16
@@ -39,7 +39,7 @@
   function setType( $type ) { $this->type = $type; }
   function setInterval( $interval ) { $this->interval = $interval; }
   function setDaynumber( $num ) { $this->daynumber = is_array($num)?$num:array($num); }
-  function setDay( $day ) { $this->day = $day; }
+  function setDay( $day ) { $this->day = is_array($day)?$day:array($day); }
   function setMonth( $month ) { $this->month = is_array($month)?$month:array($month); }
   function setExclusionDates( $ex ) { 
     // Prescale dates for easy comparison
@@ -165,9 +165,8 @@
 	$count++;
       } else if( $this->type == 'weekday' ) {
 	// On named weekdays
-
 	// Find beginning of first week
-	$tmp = strtotime('-$offset days',$t);
+	$tmp = strtotime("-$offset days",$t);
 	$firstday = (int)gmdate('w',$tmp);
 	for( $i = 0; $i < count($this->day); $i++ ) {
 	  $dayno = $this->daynumber[$i];