steffen: server/kolab-resource-handlers/kolab-resource-handlers/freebusy recurrence.class.php, 1.12, 1.13

cvs at intevation.de cvs at intevation.de
Wed Jan 26 09:23:22 CET 2005


Author: steffen

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

Modified Files:
	recurrence.class.php 
Log Message:
monthly on daynumber (Issue243)

Index: recurrence.class.php
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/freebusy/recurrence.class.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- recurrence.class.php	26 Jan 2005 07:32:31 -0000	1.12
+++ recurrence.class.php	26 Jan 2005 08:23:20 -0000	1.13
@@ -140,8 +140,11 @@
       if( $this->type == 'daynumber') {
 	// On numbered days
 	foreach( $this->daynumber as $dayno ) {
+	  $t_month = gmdate('m',strtotime('-15 days', $t)); 
 	  $tmp = strtotime( '+'.($dayno-16).' days', $t);
+	  $tmp_month = gmdate('m',$tmp); // make sure same month
 	  if( $tmp >= $this->initial_start && $tmp < $endstamp &&
+	      $t_month == $tmp_month &&
 	      !$this->isExcluded( $tmp, $tmp+$duration) ) {
 	    myLog("Adding recurrence ".gmdate("D, M d Y H:i:s",$tmp)." -> "
 		  .gmdate("D, M d Y H:i:s",$tmp+$duration), RM_LOG_DEBUG );





More information about the commits mailing list