Changeset 5804 for trunk/prototype/modules/calendar/interceptors/Notifications.php

Timestamp:

03/23/12 16:39:10 (12 years ago)

Author:

acoutinho

Message:

Ticket #2434 - Implementada funcionalidade de criacao de agenda para contas compartilhadas e imposicao de agendas

File:

• trunk/prototype/modules/calendar/interceptors/Notifications.php (modified) (4 diffs)

trunk/prototype/modules/calendar/interceptors/Notifications.php

@@ -148 +148 @@
 
                 $data['nowStartDate'] = date_format( $sTime , 'd/m/Y');
-        $data['nowStartTime'] = ($schedulableReference['allDay']) ? '' : date_format( $sTime , 'H:i');
-        $data['nowEndDate'] = date_format( $eTime , 'd/m/Y');
-        $data['nowEndTime'] = ($schedulableReference['allDay']) ? '' :  date_format( $eTime , 'H:i');
+                $data['nowStartTime'] = ($schedulableReference['allDay']) ? '' : date_format( $sTime , 'H:i');
+                $data['nowEndDate'] = date_format( $eTime , 'd/m/Y');
+                $data['nowEndTime'] = ($schedulableReference['allDay']) ? '' :  date_format( $eTime , 'H:i');
                 $data['userRequest'] = Config::me('uid');
                 
@@ -161 +161 @@
                 $params['body'] = parseTPL::load_tpl( $data ,ROOTPATH.'/modules/calendar/templates/notify_suggestion_body.tpl');
                 $params['subject'] = parseTPL::load_tpl( $subject ,ROOTPATH.'/modules/calendar/templates/notify_subject.tpl');;
-                $params['from'] = Config::me('mail');   
+                $params['from'] ='"'.Config::me('cn').'" <'.Config::me('mail').'>';   
                 $params['to'] = $organizer['user']['mail'];
                 
@@ -192 +192 @@
                 $params['subject'] = parseTPL::load_tpl( $subject ,ROOTPATH.'/modules/calendar/templates/notify_subject.tpl');;
                 $params['to'] = $params['from'];
-                $params['from'] = Config::me('mail');   
+                $params['from'] = $params['from'] ='"'.Config::me('cn').'" <'.Config::me('mail').'>';
         }
         
@@ -435 +435 @@
        $mail['body'] = parseTPL::load_tpl( $data ,ROOTPATH.'/modules/calendar/templates/'.$template.'.tpl');
        $mail['subject'] = parseTPL::load_tpl( $subject ,ROOTPATH.'/modules/calendar/templates/notify_subject.tpl');;
-       $mail['from'] = Config::me('mail');   
+       $mail['from'] = '"'.Config::me('cn').'" <'.Config::me('mail').'>';
        $mail['to'] = $to;
        Controller::create( array( 'service' => 'SMTP' ), $mail );