Changeset 7163

Timestamp:

09/04/12 15:08:21 (12 years ago)

Author:

acoutinho

Message:

Ticket #3057 - Inconsistencia no remetente. Criar evento em agenda assinada

Location:

trunk/prototype/modules/calendar

Files:

• interceptors/Notifications.php (modified) (3 diffs)
• js/init.js (modified) (1 diff)

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

@@ -204 +204 @@
     }
 
+    public static function _getAttendeeOrganizer($schedulable) {
+        foreach ($schedulable['participants'] as $v)
+            if ($v['isOrganizer'] == '1')
+                return $v;
+    }
+
     /**
      * Prepara para criação de email de delegação
@@ -332 +338 @@
                 $data['participants'] = '<UL> ';
                 foreach ($schedulable['participants'] as $ii => $participant) {
-                    if (Config::me('mail') !== $participant['user']['mail'])
+                    if ($participant['isOrganizer'] != '1')
                         $part[] = $participant['user']['mail'];
 
@@ -515 +521 @@
         foreach ($params as $i => $v) //Verifica se ouve alteração no evento
             if (isset($schedulableOld[$i]) && $schedulableOld[$i] != $v && $i != 'participants') {
-                $schedulable[$i] = $v;
-                $alt = true;
+                $schedulable[$i] = $v;
+                $alt = true;
             }
 
-        if (($alt === true) && (Config::regGet('noAlarm') === false) && (self::futureEvent($schedulable['startTime'], $schedulable['rangeEnd'], $schedulable['id']))) {
-            $method = 'REQUEST';
-            $notificationType = 'Modificação de Calendario';
-            $part = 'othersAttendees';
-            self::mountStruture($uri['id'], $schedulable, false, $data, $subject, $ical, $part, $method, $notificationType);
-
-            if (isset($part) && $part && count($part) > 0)
-                self::sendMail($data, $ical, implode(',', $part), $subject, 'notify_modify_body');
-        }
+        if (($alt === true) && (Config::regGet('noAlarm') === false) && (self::futureEvent($schedulable['startTime'], $schedulable['rangeEnd'], $schedulable['id']))) {
+            $method = 'REQUEST';
+            $notificationType = 'Modificação de Calendario';
+            $part = 'othersAttendees';
+            self::mountStruture($uri['id'], $schedulable, false, $data, $subject, $ical, $part, $method, $notificationType);
+
+            $from = self::_getAttendeeOrganizer($schedulable);
+
+            if (isset($part) && $part && count($part) > 0)
+                self::sendMail($data, $ical, implode(',', $part), $subject, 'notify_modify_body', $from);
+        }
     }
 
     static private function parseTimeDate($time, $timezone) {
-        return strtotime($time . ' ' . $timezone) . '000';
+        return strtotime($time . ' ' . $timezone) . '000';
     }
 

trunk/prototype/modules/calendar/js/init.js

@@ -483 +483 @@
                         }else{
                             var schedulable = DataLayer.get( "schedulable", evt.id);
-                            schedulable.group = evt.calendar;
+                            schedulable.calendar = evt.calendar;
                             eventDetails( schedulable, true);
                             }