Changeset 5947 for trunk/prototype/services/iCal.php

Timestamp:

04/13/12 17:25:00 (12 years ago)

Author:

acoutinho

Message:

Ticket #2626 - Inconsistencia no organizador de um evento quando criado a partir de uma agenda compartilhada

File:

• trunk/prototype/services/iCal.php (modified) (2 diffs)

trunk/prototype/services/iCal.php

@@ -512 +512 @@
                                  if($schedulable ) //Caso o evento exista
                                  {
-                                                                 $isOrganizer = false;
-                                                                 $isParticipant = false;
-                                                                 
-                                                                  foreach($schedulable['participants'] as $value)
-                                                                        if($value['user']['id'] == Config::me('uidNumber')){
-                                                                                $isParticipant = true;
-                                                                                if($value['isOrganizer'])
-                                                                                        $isOrganizer = true;
-
-                                                                                if(!self::_existInMyCalendars($schedulable['id'])){
-                                                                                        $interation = ICAL_ACTION_UPDATE; 
-                                                                                        $interation = ( strrpos($value['acl'], ATTENDEE_ACL_PARTICIPATION_REQUIRED) ) ? ICAL_ACTION_IMPORT_REQUIRED : ICAL_ACTION_IMPORT;
-                                                                                        break;
-                                                                                }                                   
-                                                                        }else
+                                    $isOrganizer = false;
+                                    $isParticipant = false;
+
+                                    foreach($schedulable['participants'] as $value)
+                                        if($value['user']['id'] == Config::me('uidNumber')){
+                                                $isParticipant = true;
+                                                if($value['isOrganizer'])
+                                                        $isOrganizer = true;
+
+                                                if(!self::_existInMyCalendars($schedulable['id'])){
+                                                        $interation = ICAL_ACTION_UPDATE; 
+                                                        $interation = ( strrpos($value['acl'], ATTENDEE_ACL_PARTICIPATION_REQUIRED) ) ? ICAL_ACTION_IMPORT_REQUIRED : ICAL_ACTION_IMPORT;
+                                                        break;
+                                                }                                   
+                                        }else
                                     {
                                         if( self::_getTime($component , 'dtstamp') > $schedulable['dtstamp'] || $component->getProperty( 'sequence' , false , false ) > $schedulable['sequence']) //Organizador esta requisitando que você atualize o evento
@@ -989 +989 @@
         static private function _existInMyCalendars( $id )
         {
-           $sig = Controller::find(array('concept' => 'calendarSignature'), array('user','calendar'), array('filter' => array( '=' , 'user' , Config::me('uidNumber'))));       
+           $sig = Controller::find(array('concept' => 'calendarSignature'), array('user','calendar', 'isOwner'), array('filter' => array('AND', array( '=' , 'user' , Config::me('uidNumber') ) , array('=' , 'isOwner' , '1' ))));       
            $calendars = array();
            foreach ($sig as $val)