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

Timestamp:

12/17/12 14:22:24 (11 years ago)

Author:

cristiano

Message:

Ticket #3239 - Inconsistência na importação de eventos com repetição

File:

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

trunk/prototype/services/iCal.php

@@ -1 +1 @@
 <?php
 
-require_once ROOTPATH . '/plugins/icalcreator/iCalUtilityFunctions.class.php';
+//require_once ROOTPATH . '/plugins/icalcreator/iCalUtilityFunctions.class.php';
 require_once ROOTPATH . '/plugins/icalcreator/iCalcreator.class.php';
 require_once ROOTPATH . '/modules/calendar/constants.php';
@@ -31 +31 @@
     protected function createIcal($data, $params = false )
     {
-        $ical = new icalCreator();
+        $ical = new vcalendar();
                 $ical->setProperty('method', isset($params['method']) ? $params['method'] : 'PUBLISH' );
 
@@ -136 +136 @@
                    $date = $r->next();
 
-                    $timezone = &$ical->newComponent('vtimezone');
+                    $timezone = $ical->newComponent('vtimezone');
                     $timezone->setProperty('tzid',$apTimezone );
 
-                    $standard  = &$timezone->newComponent( "standard" );
+                    $standard  = $timezone->newComponent( "standard" );
                     $standard->setProperty( "tzoffsetfrom", $timezoneDayligth['standardFrom'] );
                     $standard->setProperty( "tzoffsetto", $timezoneDayligth['standardTo'] );
@@ -154 +154 @@
                     $standard->setProperty('rrule', $rrule);
 
-                    $daylight  = &$timezone->newComponent( "daylight" );
+                    $daylight  = $timezone->newComponent( "daylight" );
 
                     $daylight->setProperty( "tzoffsetfrom", $timezoneDayligth['daylightFrom'] );
@@ -261 +261 @@
     protected function createCompatibleIcal($data, $params = false )
     {
-        $ical = new icalCreator();
+        $ical = new vcalendar();
                 $ical->setProperty('method', isset($params['method']) ? $params['method'] : 'PUBLISH' );
 
@@ -527 +527 @@
     public function parse($data, $params = false) {
         Config::regSet('noAlarm', TRUE); //Evita o envio de notificação
-        $vcalendar = new icalCreator( );
+        $vcalendar = new vcalendar( );
         $vcalendar->parse(trim($data));
         $vcalendar->sort();
@@ -1168 +1168 @@
 
     public function analize($data, $params = false) {
-        $vcalendar = new icalCreator( );
+        $vcalendar = new vcalendar( );
         $vcalendar->parse(trim($data));
         $vcalendar->sort();
@@ -1611 +1611 @@
             $repeat = array();
             $repeat['schedulable'] = $eventID;
-            foreach ($rrule as $i => $v) {
+            $repeat['startTime'] = $schedulable['startTime'];
+            foreach ($rrule as $i => $v) {
                 if (strtolower($i) == 'freq')
                     $repeat['frequency'] = $v;
                 else if (strtolower($i) == 'until')
-                    $repeat['endTime'] = $v;
+            {
+                $repeat['endTime'] = strtotime($v['year'].'-'.$v['month'].'-'.$v['day'].' '.$v['hour'].':'.$v['min'].':'.$v['sec'].' '.$v['tz']) .'000' ;
+            }
                 else
                     $repeat[strtolower($i)] = $v;
@@ -1622 +1625 @@
             $interation['repeat://' . $repeatID] = $repeat;
         }
-
 
         $schedulable['calendar'] = $params['calendar'];