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

Timestamp:

05/28/12 21:17:51 (12 years ago)

Author:

acoutinho

Message:

Ticket #2795 - Problema ao tentar aceitar convite da agenda para a conta compartilhada

File:

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

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

@@ -92 +92 @@
         if (isset($updated)) {
             $psUpdated = Controller::find(array('concept' => 'participant'), false, array('deepness' => '1', 'filter' => array('IN', 'id', $updated)));
+
             foreach ($psUpdated as $i => $pUpdated) {
                 if ($pUpdated['isOrganizer'] == '1')
@@ -237 +238 @@
      */
     public static function participantDelegatedStatusChange(&$partID, &$schedulable, $organizer, &$type = false) {
-
         $delegatedParams = array();
 
@@ -270 +270 @@
     }
 
-    public static function mountStruture($partID, &$schedulable, $type = false, &$data, &$subject, &$ical, &$part = false, &$method, &$notificationType, $regSet = false) {
+    public static function mountStruture(&$partID, &$schedulable, $type = false, &$data, &$subject, &$ical, &$part = false, &$method, &$notificationType, $regSet = false) {
 
         if ((Config::regGet('ical://' . $schedulable['id'] . '/' . $method) === false) || ($method == 'CANCEL')) { //Verifica se o ical ja não esta no reg
@@ -327 +327 @@
                 $part = self::_getAttendeeById($partID, $schedulable);
                 $data['participant'] = isset($part['user']['name']) ? $part['user']['name'] : $part['user']['mail'];
+                $partID = $part;
                 break;
             case 'othersAttendees':
@@ -344 +345 @@
         $subject['endDate'] = date_format($eTime, 'd/m/Y');
         $subject['endTime'] = ($schedulable['allDay']) ? '' : date_format($eTime, 'H:i');
-        $subject['participant'] = Config::me('uid');
+        $subject['participant'] = (is_array($partID) && isset($partID['user']) )? $partID['user']['uid'] : Config::me('uid');
     }
 
@@ -379 +380 @@
      * @access     public
      */
-    public static function participantStatusChange(&$partID, &$schedulable, &$organizer, $type, $delegatedParams = false) {
+    public static function participantStatusChange(&$partID, &$schedulable, &$organizer, $type, $delegatedParams = false) {     
         $method = 'REPLY';
         $notificationType = 'Convite Aceito';
@@ -412 +413 @@
         }
 
-        self::sendMail($data, $ical, $organizer['user']['mail'], $subject, $tpl, false);
+        self::sendMail($data, $ical, $organizer['user']['mail'], $subject, $tpl, $partID);
     }