Changeset 3429 for branches/2.2/calendar/inc/class.bocalendar.inc.php

Timestamp:

10/28/10 15:16:29 (13 years ago)

Author:

eduardoalex

Message:

Ticket #1234 - adicionada correcao na escrita do horario do evento

File:

• branches/2.2/calendar/inc/class.bocalendar.inc.php (modified) (1 diff)

branches/2.2/calendar/inc/class.bocalendar.inc.php

@@ -2738 +2738 @@
                 function create_vcard($event_arrays)
                 {
-                    if(!is_array($event_arrays))
-                        return null;
-                    $tmpattach="BEGIN:VCALENDAR\n"
-                        ."PRODID:-//Expresso Livre//Calendar//EN\n"
-                        ."VERSION:1.0\n";
-                    foreach ($event_arrays as $event_array)
-                    {
-                        $sy = $event_array['start']['year'];
-                        $sm = $event_array['start']['month'];
-                        $sd = $event_array['start']['mday'];
-                        $sh = $event_array['start']['hour'];
-                        $sn = $event_array['start']['min'];
-                        $dtstart = sprintf("%04d%02d%02dT%02d%02d00Z", $sy, $sm, $sd, $sh, $sn);
-                        
-                        $ey = $event_array['end']['year'];
-                        $em = $event_array['end']['month'];
-                        $ed = $event_array['end']['mday'];
-                        $eh = $event_array['end']['hour'];
-                        $en = $event_array['end']['min'];
-                        $dtend = sprintf("%04d%02d%02dT%02d%02d00Z", $ey, $em, $ed, $eh, $en);
-
-                        // Necessário espaços após quebra-de-linha, na descrição, caso contrário 
-                        // ocorrerá erro ao importar o agendamento no Outlook (erro lunar).
-                        $description = str_replace("\n","\n ", $event_array['description']);
-                        
-                        $tmpattach.="BEGIN:VEVENT\r\n"
-                        ."DTSTART:".$dtstart."\r\n"
-                        ."DTEND:".$dtend."\r\n"
-                        ."LAST-MODIFIED:".gmdate("Ymd\THis\Z")."\r\n" //Hora no formato UTC
-                        ."UID:Expresso-".$event_array['id'].$event_array['uid']."\r\n"
-                        ."DESCRIPTION:".$description."\r\n"
-                        ."SUMMARY:".$event_array['title']."\r\n"
-                        ."LOCATION:".$event_array['location']."\r\n"
-                        ."END:VEVENT\r\n";
-                    }
+            if(!is_array($event_arrays))
+                                return null;
+
+                        $tmpattach="BEGIN:VCALENDAR\n"
+                        ."PRODID:-//Expresso Livre//Calendar//EN\n"
+                        ."VERSION:1.0\n";
+            foreach ($event_arrays as $event)
+            {
+                                // It translates int to string
+                                if (!is_object($event) && !is_array($event) || !array_key_exists  ('end', $event))
+                                        $event = $event_arrays;
+
+                                //set to GMT
+                                //Aqui estou pegando o horário do evento e setando para GMT de acordo com o fuso horário estabelecido nas configurações do expresso.
+                                $start_time = mktime($event['start']['hour'],$event['start']['min'],$event['start']['sec'],$event['start']['month'],$event['start']['mday'],$event['start']['year']) - $GLOBALS['phpgw']->datetime->tz_offset;
+                                $end_time = mktime($event['end']['hour'],$event['end']['min'],$event['end']['sec'],$event['end']['month'],$event['end']['mday'],$event['end']['year']) - $GLOBALS['phpgw']->datetime->tz_offset;
+                                
+                                $start_time = date("Ymd\THis\Z", $start_time);
+                                $end_time = date("Ymd\THis\Z", $end_time);
+        
+                                // Necessário espaços após quebra-de-linha, na descrição, caso contrário 
+                                // ocorrerá erro ao importar o agendamento no Outlook (erro lunar).
+                                $description = str_replace("\n","\n ", $event['description']);
+                                
+                                $tmpattach.="BEGIN:VEVENT\r\n"
+                                ."DTSTART:".$start_time."\r\n"
+                                ."DTEND:".$end_time."\r\n"
+                                ."LAST-MODIFIED:".gmdate("Ymd\THis\Z")."\r\n" //Hora no formato UTC
+                                ."UID:Expresso-".$event['id'].$event['uid']."\r\n"
+                                ."DESCRIPTION:".$description."\r\n"
+                                ."SUMMARY:".$event['title']."\r\n"
+                                ."LOCATION:".$event['location']."\r\n"
+                                ."END:VEVENT\r\n";
+                        }
                     $tmpattach.="END:VCALENDAR\r\n";
                     return $tmpattach;