Changeset 857 for trunk/calendar

Timestamp:

05/18/09 11:24:22 (15 years ago)

Author:

amuller

Message:

Ticket #510 - Arrumado problema de quebra de linha na descricao do evento ao exportar

File:

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

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

@@ -2641 +2641 @@
                         return $want_update > 0;
                 }
+                function normDec($num)
+                {
+                        if ($num > 9)
+                                return $num;
+                        else
+                                return "0".$num;
+                }
 
         function create_vcard($event_array)
@@ -2654 +2661 @@
                         if (!is_object($event) && !is_array($event) || !array_key_exists  ('end', $event))
                                 $event = $event_array;
-                        if ( $event['end']['month'] < 10 )
-                                $end_event_month="0".$event['end']['month'];
-                        else
-                                $end_event_month=$event['end']['month'];
-                        if ( $event['start']['month'] < 10 )
-                                $start_event_month="0".$event['start']['month'];
-                        else
-                                $start_event_month=$event['start']['month'];
-                        if ( $event['end']['mday'] < 10 )
-                                $end_event_day="0".$event['end']['mday'];
-                        else
-                                $end_event_day=$event['end']['mday'];
-                        if ( $event['start']['mday'] < 10 )
-                                $start_event_day="0".$event['start']['mday'];
-                        else
-                                $start_event_day=$event['start']['mday'];
-                        if ( $event['start']['hour'] < 10)
-                                $start_event_hour="0".$event['start']['hour'];
-                        else
-                                $start_event_hour=$event['start']['hour'];
-                        if ( $event['end']['hour'] < 10)
-                                $end_event_hour="0".$event['end']['hour'];
-                        else
-                                $end_event_hour=$event['end']['hour'];
-                                
-                        if ( $event['start']['min'] < 10)
-                                $start_event_min="0".$event['start']['min'];
-                        else
-                                $start_event_min=$event['start']['min'];
-                        if ( $event['end']['min'] < 10)
-                                $end_event_min="0".$event['end']['min'];
-                        else
-                                $end_event_min=$event['end']['min'];    
-                
-
+
+                        $endE_month=$this->normDec($event['end']['month']);
+                        $startE_month=$this->normDec($event['start']['month']);
+                        $endE_day=$this->normDec($event['end']['mday']);
+                        $startE_day=$this->normDec($event['start']['mday']);
+                        $startE_hour=$this->normDec($event['start']['hour']);
+                        $endE_hour=$this->normDec($event['end']['hour']);
+                        $startE_min=$this->normDec($event['start']['min']);
+                        $endE_min=$this->normDec($event['end']['min']);
+
+                        $nl_array   = array("\r\n", "\n", "\r");
                         $tmpattach.="BEGIN:VEVENT\n"
-                        ."DTSTART:".$event['start'][year].$start_event_month.$start_event_day."T".$start_event_hour.$start_event_min."00Z\n"
-                        ."DTEND:".$event[end][year].$end_event_month.$end_event_day."T".$end_event_hour.$end_event_min."00Z\n"
+                        ."DTSTART:".$event['start'][year].$startE_month.$startE_day."T".$startE_hour.$startE_min."00Z\n"
+                        ."DTEND:".$event[end][year].$endE_month.$endE_day."T".$endE_hour.$endE_min."00Z\n"
                         ."UID:Expresso-".$event[id].$event[uid]."\n"
                         ."LAST-MODIFIED:".time()."\n"
-                        ."DESCRIPTION:".$event[description]."\n"
+                        ."DESCRIPTION:".str_replace($nl_array,"\\n",$event[description])."\n"
                         ."SUMMARY:".$event[title]."\n"
                         ."LOCATION:".$event[location]."\n"
@@ -2701 +2684 @@
                         $tmpattach.="END:VCALENDAR\n";
                         return $tmpattach;
-}
+        }
 
                 /*!