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

Timestamp:

10/05/12 11:36:12 (12 years ago)

Author:

acoutinho

Message:

Ticket #3140 - Problemas nas tarefas e atividades (title e formato de emails)

File:

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

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

@@ -275 +275 @@
         $data = array_merge($data, $delegatedParams);
 
-        self::sendMail($data, $ical, $part['user']['mail'], $subject, 'notify_response_delegated_status_body');
+        self::sendMail($data, $ical, $part['user']['mail'], $subject, $schedulable['type'] == '1' ? 'notify_response_delegated_status_body' : 'notify_response_delegated_status_body_task');
     }
 
@@ -296 +296 @@
 
             if ($schedulable['allDay'])
-                $schedulable['endTime'] = $schedulable['endTime'] + 86400000;
+                    $schedulable['endTime'] = $schedulable['endTime'] + 86400000;
         }
 
@@ -365 +365 @@
      */
     public static function participantCreated(&$partID, &$schedulable, $type = false, $delegatedParams = false, $organizer = false) {
-        $method = 'REQUEST';
-        $notificationType = 'Convite de Calendario';
-        $part = 'attendees';
-        self::mountStruture($partID, $schedulable, $type, $data, $subject, $ical, $part, $method, $notificationType, true);
-
-        if ($delegatedParams)
-            $data = array_merge($data, $delegatedParams);
-
-        self::sendMail($data, $ical, $part['user']['mail'], $subject, !$delegatedParams ? 'notify_create_body' : 'notify_create_delegated_body', $organizer);
+        $method = 'REQUEST';
+        $notificationType = 'Convite de Calendario';
+        $part = 'attendees';
+
+        if($schedulable['type'] == '2'){
+            $template = !$delegatedParams ? 'notify_create_body_task' : 'notify_create_delegated_body_task';
+        }else{
+            $template = !$delegatedParams ? 'notify_create_body' : 'notify_create_delegated_body';
+        }
+
+        self::mountStruture($partID, $schedulable, $type, $data, $subject, $ical, $part, $method, $notificationType, true);
+
+        if ($delegatedParams)
+            $data = array_merge($data, $delegatedParams);
+
+        self::sendMail($data, $ical, $part['user']['mail'], $subject, $template, $organizer);
     }
 
@@ -395 +402 @@
         if ($delegatedParams) {
             $data = array_merge($data, $delegatedParams);
-            $tplDelegated = 'notify_delegated_status_body';
+            $tplDelegated = $schedulable['type'] == '1' ? 'notify_delegated_status_body' : 'notify_delegated_status_body_task';
         }
 
         switch ($type) {
             case STATUS_ACCEPTED:
-                $tpl = !$delegatedParams ? 'notify_accept_body' : $tplDelegated;
+                $tpl = $delegatedParams ? $tplDelegated : ($schedulable['type'] == '1' ? 'notify_accept_body' : 'notify_accept_body_task');
                 $subject['notificationType'] = 'Convite Aceito';
                 break;
             case STATUS_TENTATIVE:
-                $tpl = !$delegatedParams ? 'notify_attempt_body' : $tplDelegated;
+                $tpl = $delegatedParams ? $tplDelegated :($schedulable['type'] == '1' ? 'notify_attempt_body' : 'notify_attempt_body_task');
                 $subject['notificationType'] = 'Convite  aceito provisoriamente';
                 break;
             case STATUS_CANCELLED:
-                $tpl = !$delegatedParams ? 'notify_reject_body' : $tplDelegated;
+                $tpl = $delegatedParams ? $tplDelegated :($schedulable['type'] == '1' ? 'notify_reject_body' : 'notify_reject_body_task');
                 $subject['notificationType'] = 'Convite rejeitado';
                 break;
@@ -414 +421 @@
                 if ($delegatedParams)
                     $data = array_merge($data, $delegatedParams);
-                $tpl = 'notify_delegated_body';
+                $tpl = $schedulable['type'] == '1' ? 'notify_delegated_body' : 'notify_delegated_body_task';
                 $subject['notificationType'] = 'Convite delegado';
                 break;
@@ -534 +541 @@
 
             if (isset($part) && $part && count($part) > 0)
-                self::sendMail($data, $ical, implode(',', $part), $subject, 'notify_modify_body', $from);
+                self::sendMail($data, $ical, implode(',', $part), $subject, $schedulableOld['type'] == '1' ?  'notify_modify_body' : 'notify_modify_body_task', $from);
         }
     }