Changeset 7959 for trunk

Timestamp:

03/05/13 16:30:10 (11 years ago)

Author:

cristiano

Message:

Ticket #3374 - Inconsistências ao criar eventos em nome de uma agenda assinada

Location:

trunk/prototype

Files:

• modules/calendar/js/calendar.codecs.js (modified) (1 diff)
• services/iCal.php (modified) (3 diffs)

trunk/prototype/modules/calendar/js/calendar.codecs.js

@@ -658 +658 @@
                     statusParticipants[ statusLabels[attend.status] ]++;        
 
-                    if(attend.user.mail == User.me.mail)
+                    if(attend.user.mail == me.mail)
                         isAttendee = true;
 

trunk/prototype/services/iCal.php

@@ -573 +573 @@
                             $schedulable = self::_getSchedulable($uid);
                 $calendar = false;
-
-                            if ($schedulable) { //Caso o evento exista
-                    if (!($calendar = self::_existInMyCalendars($schedulable['id'], $params['owner']) )) {
+                $accpeted = true;
+                            if ($schedulable) {
+                    ///Verifica se o usuario e um participante e se este aceitou o pedido.
+                    foreach ($schedulable['participants'] as $value){
+                        if ($value['user']['id'] == $params['owner'] &&  ($value['status'] == STATUS_UNANSWERED || $value['status'] == STATUS_DECLINED)){
+                            $accpeted  = false;
+                        }
+                    }
+                             //Caso o evento exista
+                    if (!($calendar = self::_existInMyCalendars($schedulable['id'], $params['owner'])) || !$accpeted ) {
                         $calendarToSchedulable = array();
                         $calendarToSchedulable['calendar'] = $params['calendar'];
@@ -1226 +1233 @@
                                 $isOrganizer = true;
 
-                            if (!self::_existInMyCalendars($schedulable['id'], $params['owner'])) {
+                            if (!self::_existInMyCalendars($schedulable['id'], $params['owner']) || $value['status'] == STATUS_UNANSWERED || $value['status'] == STATUS_DECLINED) {
                                 $interation = ICAL_ACTION_UPDATE;
                                 $interation = ( strrpos($value['acl'], ATTENDEE_ACL_PARTICIPATION_REQUIRED) ) ? ICAL_ACTION_IMPORT_REQUIRED : array('action' => ICAL_ACTION_IMPORT, 'type' => 'calendarIds');
                                 break;
                             }
-                        } else {
-                            if (self::_getTime($component, 'dtstamp') > $schedulable['dtstamp'] || $component->getProperty('sequence', false, false) > $schedulable['sequence']) //Organizador esta requisitando que você atualize o evento
-                                $interation = ($isOrganizer) ? ICAL_ACTION_ORGANIZER_UPDATE : ICAL_ACTION_UPDATE;
                             else
-                                $interation = ($isOrganizer) ? ICAL_ACTION_ORGANIZER_NONE : ICAL_ACTION_NONE;
+                            {
+                                if (self::_getTime($component, 'dtstamp') > $schedulable['dtstamp'] || $component->getProperty('sequence', false, false) > $schedulable['sequence']) //Organizador esta requisitando que você atualize o evento
+                                    $interation = ($isOrganizer) ? ICAL_ACTION_ORGANIZER_UPDATE : ICAL_ACTION_UPDATE;
+                                else
+                                    $interation = ($isOrganizer) ? ICAL_ACTION_ORGANIZER_NONE : ICAL_ACTION_NONE;
+
+                            }
                         }
-
-                    }
-
+                      }
                     if (!$isParticipant){
                         if( self::_existInMyCalendars($schedulable['id'], $params['owner']) ){
-
                             $interation = (self::_getTime($component, 'dtstamp') > $schedulable['dtstamp'] ? ICAL_ACTION_UPDATE  :  ICAL_ACTION_NONE);
 
@@ -1250 +1257 @@
 
                         }
-
 
                     }