[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kolab-commits
Subject:    thomas: server/kolab-resource-handlers/kolab-resource-handlers/freebusy
From:       cvs () kolab ! org
Date:       2007-03-20 16:20:57
Message-ID: 20070320162057.BBF301006A4 () lists ! intevation ! de
[Download RAW message or body]

Author: thomas

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

Modified Files:
	freebusy.class.php.in 
Log Message:
Don't assume that all day events only last exactly one day, fixes issue1659.


Index: freebusy.class.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/freebusy/freebusy.class.php.in,v
 retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- freebusy.class.php.in	23 Nov 2006 17:34:33 -0000	1.10
+++ freebusy.class.php.in	20 Mar 2007 16:20:55 -0000	1.11
@@ -262,7 +262,7 @@
       $initial_start = $event['start-date'];
       $initial_end = $event['end-date'];
       if( $event['allday'] ) {
-	$initial_end = strtotime( '+1 day', $initial_start );
+	$initial_end = strtotime( '+1 day', $initial_end );
 	myLog("Detected all-day event $uid", RM_LOG_DEBUG);
       }
       $extra = array( 'X-UID'     => base64_encode($uid) );
@@ -453,8 +453,7 @@
     
     // Convert our date-time values to timestamps
     if( strpos( $event_hash['start-date'], 'T' ) === false &&
-	strpos( $event_hash['end-date'], 'T' ) === false &&
-	$event_hash['start-date'] == $event_hash['end-date'] ) {
+	strpos( $event_hash['end-date'], 'T' ) === false ) {
       $event_hash['allday'] = true;
     } else {
       $event_hash['allday'] = false;      
@@ -489,4 +488,4 @@
   var $imap_serverstring;  
 };
 
-?>
\ No newline at end of file
+?>


_______________________________________________
Kolab-commits mailing list
Kolab-commits@kolab.org
https://kolab.org/mailman/listinfo/kolab-commits


[prev in list] [next in list] [prev in thread] [next in thread]