Changeset 5615 for trunk/prototype/modules/calendar/interceptors

Timestamp:

03/02/12 19:52:21 (12 years ago)

Author:

acoutinho

Message:

Ticket #2434 - Remocao do importe de arquivos da agenda na inicializacao do modulo expressoMail e correcoes de bugs

Location:

trunk/prototype/modules/calendar/interceptors

Files:

• DBMapping.php (modified) (1 diff)
• Helpers.php (modified) (1 diff)

trunk/prototype/modules/calendar/interceptors/DBMapping.php

@@ -10 +10 @@
         $params['type_id'] = EVENT_ID;
         
-                $params['startTime'] =  strtotime( $params['startTime'] . ' ' .$params['timezone']).'000';
-        
-                $params['endTime'] =   strtotime( $params['endTime'] . ' ' .$params['timezone']).'000';
+        
+                if(!is_numeric($params['startTime']) )
+                        $params['startTime'] =  strtotime( $params['startTime'] . ' ' .$params['timezone']).'000';
                 
-                if($params['allDay'])
-                        $params['endTime'] =  $params['endTime']  + 86400000;
-
+                if (!is_numeric($params['endTime'])){
+                        $params['endTime'] =   strtotime( $params['endTime'] . ' ' .$params['timezone']).'000';
+                        
+                        if($params['allDay'])
+                                $params['endTime'] =  $params['endTime']  + 86400000;
+                }
     //        if( !isset( $new['repeat'] ))
     //            $new['range_end'] = '7287926400'; // 12/12/2200

trunk/prototype/modules/calendar/interceptors/Helpers.php

@@ -5 +5 @@
     public static function futureEvent( $startTime , $rangeEnd )
     {
-        //Verifica data   
-        list( $y1  , $m1 , $d1) = explode( '-' , $rangeEnd ); 
+        //Verifica data  
+                $range = new DateTime( '@'.(int)($rangeEnd / 1000) , new DateTimeZone('UTC') );
+        list( $y1  , $m1 , $d1) = explode( '-' , $range->format('y-m-d')); 
                 
         $rangeEndMicrotime = gmmktime(0, 0, 0, $m1 , $d1, $y1);