Ticket #1543: expresso-comunidade-tag-2.0.9.patch

calendar/inc/class.bocalendar.inc.php

@@ -2643 +2643 @@
 
                 function create_vcard($event_array)
                 {
+                        $sender = $GLOBALS['phpgw_info']['user']['email']; 
+                        $uid_dono = $GLOBALS['phpgw_info']['user']['account_lid']; 
                         if(!is_array($event_array))
                                 return null;
                         
@@ -2671 +2673 @@
                         ."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"
+                        //."UID:Expresso-".$event_array['id'].$event_array['uid']."\r\n"
+                        ."UID:Expresso-".$event[id]."@".$uid_dono."\n"  
                         ."DESCRIPTION:".$description."\r\n"
                         ."SUMMARY:".$event_array['title']."\r\n"
                         ."LOCATION:".$event_array['location']."\r\n"
+                        ."ORGANIZER;RSVP=TRUE;PARTSTAT=ACCEPTED;ROLE=CHAIR:mailto:".$sender."\n"
+                        ."ATTENDEE;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT:mailto:".$event[ex_participants]."\n"
                         ."END:VEVENT\r\n"
                         ."END:VCALENDAR\r\n";
                         
@@ -2832 +2837 @@
                         $mail->Port = $emailadmin['smtpPort'];
                         $mail->From = $GLOBALS['phpgw']->preferences->values['email'];
                         $mail->FromName = $GLOBALS['phpgw_info']['user']['fullname'];
-                        $mail->IsHTML(true);
+                        //$mail->IsHTML(true);
+                        $mail->IsCalendar(true);
 
                         // Aqui e enviado o email
                         foreach($to_notify as $userid => $statusid) 
@@ -3077 +3083 @@
                                                         break;
                                         }
                                         $mail->AddAddress($to);
-                                        $mail->Body = $tmpbody;
+                                        //$mail->Body = $tmpbody;
+                                        $tmpattach_n = $this->create_vcard($GLOBALS['bocalendar']->so->cal->event);
+                                        $tmpattach_a = str_replace("Expresso-","",$tmpattach_n);
+                                        $tmpattach=str_replace("ATTENDEE;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;ROLE=REQPARTICIPANT:mailto:","ATTENDEE;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT:mailto:".$to,$tmpattach_a);
+                                        $mail->Body = "This is a multi-part message in MIME format.";
+                                        $mail->Body .= "\n--01BD3665.3AF0D360\n";
+                                        $mail->Body .= "Content-Type: text/html; charset=\"iso-8859-1\"\nContent-Transfer-Encoding: 8bit\n";
+                                        $mail->Body .= $tmpbody;
+                                        $mail->Body .= "\n--01BD3665.3AF0D360\n";
+                                        $mail->Body.="Content-Type:text/calendar; method=REQUEST; charset=US-ASCII\nContent-Transfer-Encoding:7bit\n\n";
+                                        $mail->Body .= $tmpattach;
+                                        $mail->Body .= "\n--01BD3665.3AF0D360--\n";
                                         $mail->From = $sender;
                                         $mail->FromName = $GLOBALS['phpgw_info']['user']['fullname'];
                                         $mail->Sender = $mail->From;
@@ -3103 +3120 @@
                         if(count($to_notify) && $this->ex_participants){
                                 $mail->ClearAllRecipients();
                                 $var = explode(",",trim($this->ex_participants));
-                                $to = array();
+                                $mail->IsHTML(true);
+                                $to = array();
                                 if(!$subject) {
                                         $details['startdate'] = $GLOBALS['phpgw']->common->show_date($starttime);
                                         $details['enddate']   = $GLOBALS['phpgw']->common->show_date($endtime);

phpgwapi/inc/class.phpmailer.inc.php

@@ -233 +233 @@
      * @param bool $bool
      * @return void
      */
+    function Iscalendar($bool) {
+        if($bool == true)
+            $this->ContentType = "multipart/alternative;\n  boundary=\"01BD3665.3AF0D360\"\n";
+        else
+            $this->ContentType = "text/plain";
+    }  
     function IsHTML($bool) {
         if($bool == true)
             $this->ContentType = "text/html";