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

Timestamp:

04/11/12 14:15:00 (12 years ago)

Author:

acoutinho

Message:

Ticket #2612 - Evento com erro ao importar via ExpressoMail?

File:

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

trunk/prototype/services/iCal.php

@@ -226 +226 @@
                                         //Aparentemente é para retornar um ical com o evento atualizado para o attende
                                     } 
-                                    if(isset($params['status']))
+
+                                                                        if(isset($params['status']))
                                     {
-                                        $pID = self::_getParticipantByMail( Config::me('mail') , $schedulable['participants'] );
-                                        $interation['participant://'.$pID]['status'] = $params['status'];
-                                    }
+                                                                                $pID = self::_getParticipantByMail( Config::me('mail') , $schedulable['participants'] );
+                                                                                //Verifica a importação de eventos em que não participo
+                                                                                if($pID){
+                                                                                        $interation['participant://'.$pID]['status'] = $params['status'];
+                                                                                }
+                                                                        }
                                 }
     
@@ -478 +482 @@
         }
                 
-         return $return;   
+                return $return;   
     }
     
@@ -506 +510 @@
                              case 'REQUEST':
                                  $schedulable = self::_getSchedulable($uid);
-
                                  if($schedulable ) //Caso o evento exista
                                  {
-                                     $isOrganizer = false;
-                                     
-                                      foreach($schedulable['participants'] as $value)
-                                        if($value['user']['id'] == Config::me('uidNumber')){
-                                            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
@@ -528 +533 @@
                                            $interation = ($isOrganizer) ? ICAL_ACTION_ORGANIZER_NONE : ICAL_ACTION_NONE;    
                                     }
+                                                                        if(!$isParticipant)
+                                                                                $interation = ICAL_ACTION_ORGANIZER_NONE;
                                  }else
                                    $interation =  ICAL_ACTION_IMPORT;