steffen: server/kolab-resource-handlers/kolab-resource-handlers/freebusy recurrence.class.php, 1.9, 1.10
cvs at intevation.de
cvs at intevation.de
Fri Jan 21 01:20:01 CET 2005
Author: steffen
Update of /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/freebusy
In directory doto:/tmp/cvs-serv5276/kolab-resource-handlers/freebusy
Modified Files:
recurrence.class.php
Log Message:
Recurrence stuff (Issue243 etc.)
Index: recurrence.class.php
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/freebusy/recurrence.class.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- recurrence.class.php 16 Jan 2005 08:17:49 -0000 1.9
+++ recurrence.class.php 21 Jan 2005 00:19:59 -0000 1.10
@@ -98,12 +98,12 @@
$delta_days = (int)gmdate('w',$this->initial_start);
for( $t = strtotime("-$delta_days days", $this->initial_start); $t < $endstamp;
$t = strtotime( '+'.$this->interval.' weeks', $t) ) {
+ myLog("t=".gmdate("D, M d Y H:i:s",$t), RM_LOG_DEBUG);
foreach( $this->day as $day ) {
- $tmp = strtotime( "+$delta_days days", $t );
- $tmp = strtotime( '+'.$this->dayname2number($day).' days', $tmp);
+ $tmp = strtotime( '+'.$this->dayname2number($day).' days', $t);
if( $tmp >= $this->initial_start && $tmp < $endstamp ) {
- myLog("Adding recurrence ".gmdate("M d Y H:i:s",$tmp)." -> "
- .gmdate("M d Y H:i:s",$tmp+$duration), RM_LOG_DEBUG );
+ 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 );
$this->setBusy( $tmp, null, $duration );
} else {
break;
@@ -131,8 +131,8 @@
foreach( $this->daynumber as $dayno ) {
$tmp = strtotime( '+'.($dayno-16).' days', $t);
if( $tmp >= $this->initial_start && $tmp < $endstamp ) {
- myLog("Adding recurrence ".gmdate("M d Y H:i:s",$tmp)." -> "
- .gmdate("M d Y H:i:s",$tmp+$duration), RM_LOG_DEBUG );
+ 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 );
$this->setBusy( $tmp, null, $duration );
} else {
break;
@@ -153,8 +153,8 @@
//myLog("daynumber=$dayno, wday=$wday", RM_LOG_DEBUG);
//myLog('tmp2 = '.gmdate('M d Y H:i:s',$tmp2), RM_LOG_DEBUG);
if( $tmp2 >= $this->initial_start && $tmp2 < $endstamp ) {
- myLog("Adding recurrence ".gmdate("M d Y H:i:s",$tmp2)." -> "
- .gmdate("M d Y H:i:s",$tmp2+$duration), RM_LOG_DEBUG );
+ myLog("Adding recurrence ".gmdate("D, M d Y H:i:s",$tmp2)." -> "
+ .gmdate("D, M d Y H:i:s",$tmp2+$duration), RM_LOG_DEBUG );
$this->setBusy( $tmp2, null, $duration );
} else if($tmp2 >= $endstamp ) {
break;
@@ -183,8 +183,8 @@
foreach( $this->daynumber as $dayno ) {
$tmp = strtotime( '+'.($dayno-1).' days', $t);
if( $this->initial_start <= $tmp && $tmp < $endstamp ) {
- myLog("Adding recurrence ".gmdate("M d Y H:i:s",$tmp)." -> "
- .gmdate("M d Y H:i:s",$tmp+$duration), RM_LOG_DEBUG );
+ 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 );
$this->setBusy( $tmp, null, $duration );
} else if($tmp >= $endstamp ) {
break;
@@ -201,8 +201,8 @@
$tmp = strtotime( "$year-$month-$dayno $time+0000");
//myLog("tmp= ".gmdate("M d Y H:i:s",$tmp), RM_LOG_DEBUG );
if( $this->initial_start <= $tmp && $tmp < $endstamp ) {
- myLog("Adding recurrence ".gmdate("M d Y H:i:s",$tmp)." -> "
- .gmdate("M d Y H:i:s",$tmp+$duration), RM_LOG_DEBUG );
+ 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 );
$this->setBusy( $tmp, null, $duration );
} else {
break;
@@ -219,8 +219,8 @@
$tmp = strtotime( "$dayno $wday", strtotime( "1 $month $year") );
$tmp = strtotime( gmdate('Y-m-d',$tmp)." $time+0000");
if( $this->initial_start <= $tmp && $tmp < $endstamp ) {
- myLog("Adding recurrence ".gmdate("M d Y H:i:s",$tmp)." -> "
- .gmdate("M d Y H:i:s",$tmp+$duration), RM_LOG_DEBUG );
+ 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 );
$this->setBusy( $tmp, null, $duration );
} else {
break;
@@ -244,7 +244,7 @@
case 'wednesday': return 3;
case 'thursday': return 4;
case 'friday': return 5;
- case 'saturdayday': return 6;
+ case 'saturday': return 6;
default:
myLog("Recurrence::dayname2number($day): Invalid day", RM_LOG_ERROR);
return -1;
More information about the commits
mailing list