Ignore:
Timestamp:
10/08/13 16:20:46 (11 years ago)
Author:
douglas
Message:

Ticket #0000 - Copiadas as alterações do Trunk. Versão final 2.5.1.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/2.5/prototype/modules/calendar/interceptors/Notifications.php

    r8003 r8232  
    3434        if (Config::regGet('noAlarm') !== false) 
    3535            return; //Escapa notificações caso a flag de noAlarm esteja ativa. 
    36   
    37   
     36 
     37 
    3838 
    3939        $organizers = array(); //Cache Organizadores 
     
    9999            $psUpdated = Controller::find(array('concept' => 'participant'), false, array('deepness' => '1', 'filter' => array('IN', 'id', $updated))); 
    100100 
    101   
     101 
    102102            foreach ($psUpdated as $i => $pUpdated) { 
    103103                if ($pUpdated['isOrganizer'] == '1' && $pUpdated['delegatedFrom'] == '0'){ 
     
    491491 
    492492            if (count($part) > 0) 
    493         {  
    494             $from = false;  
    495             foreach($schedulable['participants'] as $v)  
    496             {  
    497                 if($v['isOrganizer'] == 1)  
    498                     $from =  $v;  
    499             }  
    500   
    501             self::sendMail($data, $ical, implode(',', $part), $subject, 'notify_cancel_body' , $from );  
    502         }  
     493        { 
     494            $from = false; 
     495            foreach($schedulable['participants'] as $v) 
     496            { 
     497                if($v['isOrganizer'] == 1) 
     498                    $from =  $v; 
     499            } 
     500 
     501            self::sendMail($data, $ical, implode(',', $part), $subject, 'notify_cancel_body' , $from ); 
     502        } 
    503503        } 
    504504    } 
     
    522522            $method = 'CANCEL'; 
    523523            $notificationType = 'Cancelamento de Calendario'; 
    524             $part = 'me';  
    525             self::mountStruture($schedulable['id'], $schedulable, false, $data, $subject, $ical, $part, $method, $notificationType);  
    526   
    527         $from = false;  
    528         foreach($schedulable['participants'] as $v)  
    529         {  
    530             if($v['isOrganizer'] == 1)  
    531                 $from =  $v;  
    532         }  
    533             self::sendMail($data, $ical, $participant['user']['mail'], $subject, 'notify_cancel_body' , $from);  
     524            $part = 'me'; 
     525            self::mountStruture($schedulable['id'], $schedulable, false, $data, $subject, $ical, $part, $method, $notificationType); 
     526 
     527        $from = false; 
     528        foreach($schedulable['participants'] as $v) 
     529        { 
     530            if($v['isOrganizer'] == 1) 
     531                $from =  $v; 
     532        } 
     533            self::sendMail($data, $ical, $participant['user']['mail'], $subject, 'notify_cancel_body' , $from); 
    534534        } 
    535535    } 
Note: See TracChangeset for help on using the changeset viewer.