Changeset 4217 for branches/2.2.0.1/calendar/inc/class.bocalendar.inc.php

Timestamp:

05/04/11 17:11:07 (13 years ago)

Author:

brunocosta

Message:

Ticket #1802 - Opção nos agendamentos para enviar notificações como dono.

File:

• branches/2.2.0.1/calendar/inc/class.bocalendar.inc.php (modified) (6 diffs)

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

@@ -1186 +1186 @@
                                         $this->so->set_category(strval($l_categories[0]));
                                 }
-                                $this->so->set_title($l_cal['title']);
+                                $this->so->set_title($l_cal['title']);
                                 $this->so->set_description($l_cal['description']);
                                 $this->so->set_observations($l_cal['observations']);
+                                $this->so->set_notifications_owner($l_cal['notifications_owner']);
                                 $this->so->set_attachment($l_cal['attachment']);
                                 $this->so->set_ex_participants($l_cal['ex_participants']);
@@ -3110 +3111 @@
 
                         $GLOBALS['phpgw_info']['user']['preferences'] = $GLOBALS['phpgw']->preferences->create_email_preferences();
-                        $sender = $GLOBALS['phpgw_info']['user']['email'];
-
-                        $temp_tz_offset = $this->prefs['common']['tz_offset'];
+                        $preferences = CreateObject('phpgwapi.preferences',(int)$this->owner);
+                        $GLOBALS['phpgw']->accounts->get_account_name((int)$owner,$lid,$fname,$lname);
+
+                        if($new_event['notifications_owner'] == '1'){
+                            $sender = $preferences->email_address((int)$owner);
+                            $sender_name = $fname.' '.$lname;
+                        }else{
+                            $sender = $GLOBALS['phpgw_info']['user']['email'];
+                            $sender_name = $GLOBALS['phpgw_info']['user']['fullname'];
+                        }
+
+                        $temp_tz_offset = $this->prefs['common']['tz_offset'];
                         $temp_timeformat = $this->prefs['common']['timeformat'];
                         $temp_dateformat = $this->prefs['common']['dateformat'];
@@ -3252 +3262 @@
                                         continue;       // dont notify rejected participants
                                 }
-                                if($userid != $GLOBALS['phpgw_info']['user']['account_id'] ||  $msg_type == MSG_ALARM || isset($new_event['attachment']))
+                                if($userid != $owner ||  $msg_type == MSG_ALARM || isset($new_event['attachment']))
                                 {
                                         print_debug('Msg Type',$msg_type);
@@ -3512 +3522 @@
                                         $mail->Body .= "\n--01BD3665.3AF0D360--\n";
                                         $mail->From = $sender;
-                                        $mail->FromName = $GLOBALS['phpgw_info']['user']['fullname'];
+                                        $mail->FromName = $sender_name;
                                         $mail->Sender = $mail->From;
                                         $mail->SenderName = $mail->FromName;
@@ -3605 +3615 @@
                                 
                                 $mail->From = $sender;
-                                $mail->FromName = $GLOBALS['phpgw_info']['user']['fullname'];
+                                $mail->FromName = $sender_name;
                                 $mail->Sender = $mail->From;
                                 $mail->SenderName = $mail->FromName;
@@ -3662 +3672 @@
                                 $mail->Port = $emailadmin['smtpPort'];
                                 $mail->From = $sender;
-                                $mail->FromName = $GLOBALS['phpgw_info']['user']['fullname'];
+                                $mail->FromName = $sender_name;
                                 $mail->Sender = $mail->From;
                                 $mail->SenderName = $mail->FromName;