Changeset 6038

Timestamp:

04/26/12 11:53:21 (12 years ago)

Author:

acoutinho

Message:

Ticket #2658 - Inconsistencias na Envio e recebimento de sugestao de novo horario

File:

• trunk/prototype/modules/calendar/interceptors/Notifications.php (modified) (4 diffs)

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

@@ -125 +125 @@
         $schedulableReference = $schedulable;
 
-        $referenceSuggestion = array('startTime' => $params['startTime'],
-            'endTime' => $params['endTime'],
+        $referenceSuggestion = array('startTime' => strtotime($params['startTime'] . ' ' . $schedulable['timezone']) . '000',
+            'endTime' => strtotime($params['endTime'] . ' ' . $schedulable['timezone']) . '000',
             'allDay' => $params['allDay']
         );
+
         $schedulable = array_merge($schedulable, $referenceSuggestion);
 
@@ -281 +282 @@
         else
             $ical = Config::regGet('ical://' . $schedulable['id'] . '/' . $method);
-        
+
         if (!is_numeric($schedulable['endTime']))
-            $schedulable['startTime'] = self::parseTimeDate( $schedulable['startTime'], $schedulable['timezone'] );
-        
-        if (!is_numeric($schedulable['endTime'])){
-            $schedulable['endTime'] =    self::parseTimeDate( $schedulable['endTime'], $schedulable['timezone'] ); 
-
-            if($schedulable['allDay'])
-                $schedulable['endTime'] =  $schedulable['endTime']  + 86400000;
-        }
-        
+            $schedulable['startTime'] = self::parseTimeDate($schedulable['startTime'], $schedulable['timezone']);
+
+        if (!is_numeric($schedulable['endTime'])) {
+            $schedulable['endTime'] = self::parseTimeDate($schedulable['endTime'], $schedulable['timezone']);
+
+            if ($schedulable['allDay'])
+                $schedulable['endTime'] = $schedulable['endTime'] + 86400000;
+        }
+
         $timezone = new DateTimeZone('UTC');
         $sTime = new DateTime('@' . (int) ($schedulable['startTime'] / 1000), $timezone);
         $eTime = new DateTime('@' . (int) ($schedulable['endTime'] / 1000), $timezone);
-        
+
         if (isset($schedulable['timezone'])) {
             $sTime->setTimezone(new DateTimeZone($schedulable['timezone']));
@@ -511 +512 @@
             $method = 'REQUEST';
             $notificationType = 'Modificação de Calendario';
-            $part = 'othersAttendees';    
+            $part = 'othersAttendees';
             self::mountStruture($uri['id'], $schedulable, false, $data, $subject, $ical, $part, $method, $notificationType);
 
@@ -518 +519 @@
         }
     }
-    
-   static private function parseTimeDate($time, $timezone){
-        return strtotime( $time . ' ' .$timezone).'000';         
-   }    
+
+    static private function parseTimeDate($time, $timezone) {
+        return strtotime($time . ' ' . $timezone) . '000';
+    }
+
 }
+
 ?>