Changeset 5845

Timestamp:

03/28/12 18:01:34 (12 years ago)

Author:

acoutinho

Message:

Ticket #2434 - Erro ao importar um novo evento agenda antiga

File:

• trunk/calendar/inc/class.bocalendar.inc.php (modified) (8 diffs)

trunk/calendar/inc/class.bocalendar.inc.php

@@ -2939 +2939 @@
                         $importAccount['mail'] = $GLOBALS['phpgw_info']['user']['email'];
 
-            if(!is_array($event_arrays))
+                    if(!is_array($event_arrays))
                                 return null;
 
@@ -2949 +2949 @@
 
                     //$offset = ((int)substr(date('O',$GLOBALS['phpgw']->datetime->users_localtime), 0, 3));
-                    $offset = (($GLOBALS['phpgw']->datetime->tz_offset)/60)/60;
-        
+                    
+                    //Recupera o offset do cliente com base na diferenca entre o horario do cliente (timezone da preferencia)
+                    //e o unixtime
+                    //$offset = ((($GLOBALS['phpgw']->datetime->users_localtime) -  ($GLOBALS['phpgw']->datetime->gmtnow))/60)/60;
+                    
+                        $timezone = date('e');
+
                         foreach ($event_arrays as $event_array)
                         {
@@ -2956 +2961 @@
                             $sm = $event_array['start']['month'];
                             $sd = $event_array['start']['mday'];
-                            $sh = $event_array['start']['hour'] -= $offset;
+                            $sh = $event_array['start']['hour'];
                             $sn = $event_array['start']['min'];
-                            $dtstart = sprintf("%04d%02d%02dT%02d%02d00Z", $sy, $sm, $sd, $sh, $sn);
+                            $dtstart = sprintf("%04d%02d%02dT%02d%02d00", $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'] -= $offset;
+                            $eh = $event_array['end']['hour'];
                             $en = $event_array['end']['min'];
-                            $dtend = sprintf("%04d%02d%02dT%02d%02d00Z", $ey, $em, $ed, $eh, $en);
+                            $dtend = sprintf("%04d%02d%02dT%02d%02d00", $ey, $em, $ed, $eh, $en);
 
                             // Necessário espaços após quebra-de-linha, na descrição, caso contrário
@@ -2972 +2977 @@
                             $tmpattach.="BEGIN:VEVENT\r\n";
                                                         
-                                                        if(isset($event_array['organizer']) && $event_array['owner'] != -2)
-                                                        {
+                            if(isset($event_array['organizer']) && $event_array['owner'] != -2)
+                            {
                                 $ldap = $this->getLdap();  
                                 $justthese = array("mail","cn");
@@ -2979 +2984 @@
                                 $search = ldap_search($ldap, $GLOBALS['phpgw_info']['server']['ldap_context'], $filter, $justthese);
                                 $entry = ldap_get_entries($ldap, $search);                                        
-                                                                $organizer = 'ORGANIZER;CN='.$entry[0]['cn'][0].':mailto:'.$entry[0]['mail'][0]."\r\n";
-                                                        }   
-                                                        else{   
-                                                                $email = explode('<', $event_array['organizer']);
-                                                                $email2 = explode('>', $email[1]);
+                                        $organizer = 'ORGANIZER;CN='.$entry[0]['cn'][0].':mailto:'.$entry[0]['mail'][0]."\r\n";
+                                }   
+                                else{   
+                                        $email = explode('<', $event_array['organizer']);
+                                        $email2 = explode('>', $email[1]);
                                 $organizer = 'ORGANIZER;CN='.rtrim($email[0]).':mailto:'.$email2[0]."\r\n";
                                                         }
@@ -2989 +2994 @@
                             if(!$externo)
                             {
-                                                            $tmpattach.=
-                                "DTSTART:".$dtstart."\r\n"
-                                ."DTEND:".$dtend."\r\n"
+                                $tmpattach.=
+                                "DTSTART;TZID=".$timezone.":".$dtstart."\r\n"
+                                ."DTEND;TZID=".$timezone.":".$dtend."\r\n"
                                 ."LAST-MODIFIED:".gmdate("Ymd\THis\Z")."\r\n" //Hora no formato UTC
                                                                 .$organizer
                                 ."UID:".$event_array['uid']."\r\n"
-                                                                .$this->mb_wordwrap($this->getvCalendarParticipants($event_array['participants'],$event_array['id']),74,"\r\n ")
-                                                                .$this->mb_wordwrap($this->getvCalendarExternalParticipants($event_array['id']),74,"\r\n ")
+                                .$this->mb_wordwrap($this->getvCalendarParticipants($event_array['participants'],$event_array['id']),74,"\r\n ")
+                                .$this->mb_wordwrap($this->getvCalendarExternalParticipants($event_array['id']),74,"\r\n ")
                                 ."DESCRIPTION:".$description."\r\n"
                                 ."SUMMARY:".$event_array['title']."\r\n"
@@ -3004 +3009 @@
                              else
                             {
-                                                                $tmpattach.=
-                                "DTSTART:".$dtstart."\r\n"
-                                ."DTEND:".$dtend."\r\n"
+                                $tmpattach.=
+                                "DTSTART;TZID=".$timezone.":".$dtstart."\r\n"
+                                ."DTEND;TZID=".$timezone.":".$dtend."\r\n"
                                 ."DTSTAMP:".gmdate("Ymd\THis\Z")."\r\n" //Hora no formato UTC
                                 .$organizer
@@ -3042 +3047 @@
                             
                         }
-                    $tmpattach.="END:VCALENDAR\r\n\r\n\r\n";
+                    $tmpattach.="END:VCALENDAR\r\n\r\n\r\n";    
                     return $tmpattach;
                 }