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

Timestamp:

01/18/12 16:10:57 (12 years ago)

Author:

cristiano

Message:

Ticket #2434 - Alteração da estrutura de diretórios da nova API

Location:

trunk/prototype

Files:

• . (modified) (1 prop)
• modules/calendar/interceptors/Notifications.php (modified) (7 diffs)

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

@@ -2 +2 @@
 require_once ROOTPATH.'/modules/calendar/constants.php';
 require_once ROOTPATH.'/modules/calendar/interceptors/Helpers.php';
-require_once ROOTPATH.'/app/plugins/icalcreator/iCalcreator.class.php';
-require_once ROOTPATH.'/app/templates/parseTPL.php';
+require_once ROOTPATH.'/plugins/icalcreator/iCalcreator.class.php';
+require_once ROOTPATH.'/api/parseTPL.php';
  
 class Notifications extends Helpers 
@@ -140 +140 @@
             
              $subject['notificationType'] = 'Convite de Calendario';
-             $subject['eventTitle'] = $schedulable['summary'];
+             $subject['eventTitle'] = mb_convert_encoding($schedulable['summary'],'ISO-8859-1','ISO-8859-1,UTF-8');
              $subject['startDate'] = date_format( $sTime , 'd/m/Y');
              $subject['startTime'] = ($schedulable['allDay']) ? '' : date_format( $sTime , 'H:i');
@@ -200 +200 @@
           
         $subject['notificationType'] = 'Convite Aceito';
-        $subject['eventTitle'] = $schedulable['summary'];
+        $subject['eventTitle'] = mb_convert_encoding($schedulable['summary'],'ISO-8859-1','ISO-8859-1,UTF-8');
         $subject['startDate'] = date_format( $sTime , 'd/m/Y');
         $subject['startTime'] = ($schedulable['allDay']) ? '' : date_format( $sTime , 'H:i');
@@ -241 +241 @@
        $mail['attachments'][] = $ical;
        $mail['isHtml'] = true;                         
-       $mail['body'] = parseTPL::load_tpl( $data ,ROOTPATH.'/app/templates/'.$template.'.tpl');
-       $mail['subject'] = parseTPL::load_tpl( $subject ,ROOTPATH.'/app/templates/notify_subject.tpl');;
+       $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['to'] = $to;
@@ -293 +293 @@
                     
              $subject['notificationType'] = 'Cancelamento de Calendario';
-             $subject['eventTitle'] = $schedulable['summary'];
+             $subject['eventTitle'] = mb_convert_encoding($schedulable['summary'],'ISO-8859-1','ISO-8859-1,UTF-8');
              $subject['startDate'] = date_format( $sTime , 'd/m/Y');
              $subject['startTime'] = ($schedulable['allDay']) ? '' : date_format( $sTime , 'H:i');
@@ -347 +347 @@
            
              $subject['notificationType'] = 'Cancelamento de Calendario';
-             $subject['eventTitle'] = $schedulable['summary'];
+             $subject['eventTitle'] = mb_convert_encoding($schedulable['summary'],'ISO-8859-1','ISO-8859-1,UTF-8');
              $subject['startDate'] = date_format( $sTime , 'd/m/Y');
              $subject['startTime'] = ($schedulable['allDay']) ? '' : date_format( $sTime , 'H:i');
@@ -421 +421 @@
 
             $subject['notificationType'] = 'Modificação de Calendario';
-            $subject['eventTitle'] = $schedulable['summary'];
+            $subject['eventTitle'] = mb_convert_encoding($schedulable['summary'],'ISO-8859-1','ISO-8859-1,UTF-8');
             $subject['startDate'] = date_format($sTime, 'd/m/Y');
             $subject['startTime'] = ($schedulable['allDay']) ? '' : date_format($sTime, 'H:i');