Changeset 36 for trunk/calendar/inc/class.bocalendar.inc.php

Timestamp:

06/29/07 15:18:52 (17 years ago)

Author:

niltonneto

Message:

* empty log message *

File:

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

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

@@ -2687 +2687 @@
                         }
 
-                        if(!is_object($GLOBALS['phpgw']->send))
+                        /*if(!is_object($GLOBALS['phpgw']->send))
                         {
                                 $GLOBALS['phpgw']->send = CreateObject('phpgwapi.send');
-                        }
+                        }*/
                 //      $send = &$GLOBALS['phpgw']->send;
                         
@@ -2708 +2708 @@
                         foreach($to_notify as $userid => $statusid) 
                         {
-                        
+                                $mail->ClearAllRecipients();
+                                $mail->ClearAttachments();
+                                
                                 $userid = (int)$userid;
 
@@ -2731 +2733 @@
 
                                         $to = $preferences->email_address($userid);
+                                        
                                         if (empty($to) || $to[0] == '@' || $to[0] == '$')       // we have no valid email-address
                                         {
@@ -2945 +2948 @@
                                                         break;
                                         }
-                                        $mail->AddAddress(implode(",",$to));    
+                                        $mail->AddAddress($to);
                                         $mail->Body = $tmpbody;
                                         $mail->From = $sender;
@@ -2957 +2960 @@
                                         if(!$mail->Send())
                                         {
+                                                
                                                 $returncode=false;
                                         }
@@ -2991 +2995 @@
                                                 if($ex_participant)
                                                         $to[] = $ex_participant;
-                                }
-                                $mail->AddAddress(implode(",",$to));
+                                }               
+                                foreach($to as $i => $to_array)
+                                        $mail->AddAddress($to_array);
                                 $_body = explode("<hr size='1' width='100%'>",$tmpbody);
                                 $tmpbody = $_body[0];
@@ -2998 +3003 @@
                                 $tmpbody.= "<br>".lang("Summary").": ".$this->so->cal->event[title]."<br>";
                                 $tmpbody.= "<br>".lang("Start date").": ".$GLOBALS['phpgw']->common->show_date($starttime)."<br>".lang("End date").": ".$GLOBALS['phpgw']->common->show_date($endtime)."<br>";
-                                $tmpbody.= "<br><br><hr size='1' width='100%'><font color='red'>".lang("This message was sent by server. You must send a message to sender to confirm this event")."</font>";
-                        
+                                $tmpbody.= "<br><br><hr size='1' width='100%'><font color='red'>"
+                                .lang("This message was sent by server. You must send a message to sender to confirm this event")."<br>"
+                                .lang("This is an external event. Even if it added to your expresso its can be changed any time at all")."</font><br>";
+                                
+                                if ($GLOBALS['bocalendar']->so->cal->event[start][month] > 10)
+                                        $event_month=$GLOBALS['bocalendar']->so->cal->event[start][month];
+                                else
+                                        $event_month="0".$GLOBALS['bocalendar']->so->cal->event[start][month];
+                                $tmpbody .="<a href='../index.php?menuaction=calendar.uicalendar.add&date="
+                                .$GLOBALS['bocalendar']->so->cal->event[start][year]
+                                .$event_month
+                                .$GLOBALS['bocalendar']->so->cal->event[start][mday]
+                                ."&hour=".$GLOBALS['bocalendar']->so->cal->event[start][hour]
+                                ."&minute=".$GLOBALS['bocalendar']->so->cal->event[start][min]
+                                ."&title=".$GLOBALS['bocalendar']->so->cal->event['title']
+                                ."&description=".$GLOBALS['bocalendar']->so->cal->event['description']
+                                ."&location=".$GLOBALS['bocalendar']->so->cal->event['location']."'>"
+                                ."<h2>".lang("Add to my expresso")."</h2>";
+                                
                                 //attach extern vcard                   
                                 // define('context','$GLOBALS.bocalendar.so.cal.event');
@@ -3013 +3035 @@
                                 fclose($attach_fd);
                                 $mail->From = $sender;
-                                $mail->FromName = lang("Expresso external user").": ".$GLOBALS['phpgw_info']['user']['fullname'];
+                                $mail->FromName = $GLOBALS['phpgw_info']['user']['fullname'];
                                 $mail->Sender = $mail->From;
                                 $mail->SenderName = $mail->FromName;