Changeset 7068 for trunk/prototype/services/iCal.php

Timestamp:

08/20/12 11:15:00 (12 years ago)

Author:

acoutinho

Message:

Ticket #3054 - Inconsistencia ao importar alguma tarefa individual

File:

• trunk/prototype/services/iCal.php (modified) (9 diffs)

trunk/prototype/services/iCal.php

@@ -58 +58 @@
                             $sTime = new DateTime('@' . (int) ($v['startTime'] / 1000), $timezone);
                             $sTime->setTimezone($apTimezoneOBJ);
-                            $eTime = new DateTime('@' . (int) ($v['endTime'] / 1000), $timezone);
-                            $eTime->setTimezone($apTimezoneOBJ);
 
                             if (( isset($v['repeat']) ) && ( isset($v['repeat']['frequency']) && $v['repeat']['frequency'] && $v['repeat']['frequency'] != 'none' )) 
@@ -65 +63 @@
                             
 
-                            if (isset($v['allDay']) && $v['allDay'] == 1) {
-                                $vevent->setProperty('dtstart', $sTime->format(DATE_RFC822), array("VALUE" => "DATE"));
-                                $vevent->setProperty('dtend', $eTime->format(DATE_RFC822), array("VALUE" => "DATE"));
-                                $vevent->setProperty('X-MICROSOFT-CDO-ALLDAYEVENT', 'TRUE');
-                            } else {
-                                $vevent->setProperty('dtstart', $sTime->format(DATE_RFC822), array('TZID' => $apTimezone));
-                                $vevent->setProperty('dtend', $eTime->format(DATE_RFC822), array('TZID' => $apTimezone));
-                                $vevent->setProperty('X-MICROSOFT-CDO-ALLDAYEVENT', 'FALSE');
+                            if (isset($v['allDay']) && $v['allDay'] == 1)
+                {
+                    $vevent->setProperty('dtstart', $sTime->format(DATE_RFC822), array("VALUE" => "DATE"));
+                    $vevent->setProperty('X-MICROSOFT-CDO-ALLDAYEVENT', 'TRUE');
+                            } else
+                {
+                    $vevent->setProperty('dtstart', $sTime->format(DATE_RFC822), array('TZID' => $apTimezone));
+                    $vevent->setProperty('X-MICROSOFT-CDO-ALLDAYEVENT', 'FALSE');
                             }
                                             
@@ -137 +135 @@
                 }
 
+                ob_start();
+                print_r( "\n dtStart \n");
+                print_r($sTime->format(DATE_RFC822));
+                print_r( "\n dtEnd \n");
+                print_r( $eTime->format(DATE_RFC822));
+                $output = ob_get_clean();
+                file_put_contents( "/tmp/acoutinho.log",  $output , FILE_APPEND);
+
                 if(isset($v['due']) && $v['due'] != '' && (int)$v['due'] > 0){
                     $dueTime = new DateTime('@' . (int) ($v['due'] / 1000), $timezone);
@@ -182 +188 @@
                             break;
                     }
-                }       
+                }
+
+        ob_start();
+        print_r( "\n Ical Gerado \n");
+        print_r( $ical->createCalendar());
+        $output = ob_get_clean();
+        file_put_contents( "/tmp/acoutinho.log",  $output , FILE_APPEND);
 
                 return $ical->createCalendar();
@@ -282 +294 @@
             $sTime = new DateTime('@' . (int) ($v['startTime'] / 1000), $timezone);
             $sTime->setTimezone($apTimezoneOBJ);
-            $eTime = new DateTime('@' . (int) ($v['endTime'] / 1000), $timezone);
-            $eTime->setTimezone($apTimezoneOBJ);
 
             if (isset($v['allDay']) && $v['allDay'] == 1) {
                 $todo->setProperty('dtstart', $sTime->format(DATE_RFC822), array("VALUE" => "DATE"));
-                $todo->setProperty('dtend', $eTime->format(DATE_RFC822), array("VALUE" => "DATE"));
                 //$todo->setProperty('X-MICROSOFT-CDO-ALLDAYEVENT', 'TRUE');
             } else {
                 $todo->setProperty('dtstart', $sTime->format(DATE_RFC822), array('TZID' => $apTimezone));
-                $todo->setProperty('dtend', $eTime->format(DATE_RFC822), array('TZID' => $apTimezone));
                 //$todo->setProperty('X-MICROSOFT-CDO-ALLDAYEVENT', 'FALSE');
             }
@@ -372 +380 @@
     public function createAlarms($alarms, &$vevent)
     {   
-            foreach ($alarms as $ia => $va)
+            foreach ($alarms as $va)
             {
                 $valarm = new valarm();
@@ -1741 +1749 @@
         $interation['schedulable://' . $eventID] = $schedulable;
 
-
-
-
-
         return $interation;
     }
@@ -1784 +1788 @@
 
         /* Data de Termino */
-        $endTime = $component->getProperty('dtend', false, true);
-
-        $tzid = isset($endTime['params']['TZID']) ? $endTime['params']['TZID'] : $params['X-WR-TIMEZONE'];
-        
-        if($tzid)
-            $tzid = self::nomalizeTZID($tzid);
-
-        if (isset($endTime['params']['VALUE']) && $endTime['params']['VALUE'] === 'DATE')
-            $schedulable['endTime'] = self::date2timestamp($endTime['value']) - self::_getTzOffset('UTC', $schedulable['timezone'], '@' . self::date2timestamp($endTime['value'])) . '000';
-        else if ($tzid && !isset($endTime['value']['tz'])) /* Caso não tenha um tz na data mais exista um parametro TZID deve ser aplicado o timezone do TZID a data */
-            $schedulable['endTime'] = self::date2timestamp($endTime['value']) - self::_getTzOffset('UTC', $tzid, '@' . self::date2timestamp($endTime['value'])) . '000';
-        else {
-            $schedulable['endTime'] = self::date2timestamp($endTime['value']) . '000';
-            if (strpos($params['prodid'], 'Outlook') !== false) {
-                //Se o ics veio em utc não aplicar horario de verão
-                $eTime = new DateTime('@' . (int) ($schedulable['endTime'] / 1000), new DateTimeZone('UTC'));
-                $eTime->setTimezone($objTimezone);
-                if ($eTime->format('I'))
-                    $schedulable['endTime'] = $schedulable['endTime'] - 3600000;
-            }
-        }
+        if($due = $component->getProperty('due', false, true)){
+
+        $tzid = isset($due['params']['TZID']) ? $due['params']['TZID'] : $params['X-WR-TIMEZONE'];
+
+        if($tzid)
+            $tzid = self::nomalizeTZID($tzid);
+
+        if (isset($due['params']['VALUE']) && $due['params']['VALUE'] === 'DATE')
+            $schedulable['due'] = self::date2timestamp($due['value']) - self::_getTzOffset('UTC', $schedulable['timezone'], '@' . self::date2timestamp($due['value'])) . '000';
+        else if ($tzid && !isset($endTime['value']['tz'])) /* Caso não tenha um tz na data mais exista um parametro TZID deve ser aplicado o timezone do TZID a data */
+            $schedulable['due'] = self::date2timestamp($due['value']) - self::_getTzOffset('UTC', $tzid, '@' . self::date2timestamp($due['value'])) . '000';
+        else {
+            $schedulable['due'] = self::date2timestamp($due['value']) . '000';
+            if (strpos($params['prodid'], 'Outlook') !== false) {
+            //Se o ics veio em utc não aplicar horario de verão
+            $dueTime = new DateTime('@' . (int) ($schedulable['due'] / 1000), new DateTimeZone('UTC'));
+            $dueTime->setTimezone($objTimezone);
+
+            if ($dueTime->format('I'))
+                $schedulable['due'] = $schedulable['due'] - 3600000;
+            }
+        }
+        $schedulable['endTime'] = $schedulable['due'];
+    }else
+        $schedulable['endTime'] = $schedulable['startTime'];
 
         $schedulable['type'] = '2'; //type schedulable
@@ -2003 +2011 @@
         $interation['schedulable://' . $todoID] = $schedulable;
 
-        return $interation;
+    return $interation;
     }