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

Timestamp:

07/16/12 16:36:21 (12 years ago)

Author:

cristiano

Message:

Ticket #2965 - Problema com hora ao importar evento em Outlook

File:

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

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

@@ -276 +276 @@
         if ((Config::regGet('ical://' . $schedulable['id'] . '/' . $method) === false) || ($method == 'CANCEL')) { //Verifica se o ical ja não esta no reg
             $schedulable['URI']['concept'] = 'schedulable';
-            $ical['source'] = Controller::format(array('service' => 'iCal'), array($schedulable), array('method' => $method));
-            $ical['type'] = 'text/plain';
-            $ical['name'] = 'outlook.ics';
+            $ical = Controller::format(array('service' => 'iCal'), array($schedulable), array('method' => $method , 'compatible' => true ));
             if ($regSet)
                 Config::regSet('ical://' . $schedulable['id'] . '/' . $method, $ical);
@@ -429 +427 @@
      */
     private static function sendMail(&$data, &$ical, $to, &$subject, $template, $from = false) {
-        $ical2 = $ical;
+
+
+    $ical1['type'] = 'text/plain';
+    $ical1['source'] = $ical['compatible'];
+    $ical1['name'] = 'outlook.ics';
+    $ical2['source'] = $ical['ical'];
         $ical2['type'] = 'text/calendar';
         $ical2['name'] = 'thunderbird.ics';
+
+        unset($ical);
         $mail['attachments'][] = $ical2;
-        $mail['attachments'][] = $ical;
+        $mail['attachments'][] = $ical1;
+        unset($ical1);
+        unset($ical2);
         $mail['isHtml'] = true;
         $mail['body'] = parseTPL::load_tpl($data, ROOTPATH . '/modules/calendar/templates/' . $template . '.tpl');