Changeset 5998

Timestamp:

04/23/12 15:34:17 (12 years ago)

Author:

cristiano

Message:

Ticket #2640 - Problemas com eventos no módulo ExpressoCalendar?

Location:

trunk/prototype

Files:

• modules/calendar/interceptors/DBMapping.php (modified) (2 diffs)
• services/PostgreSQL.php (modified) (1 diff)
• services/iCal.php (modified) (4 diffs)

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

@@ -761 +761 @@
 
         $calendarsToSchedulable = self::schedulable2calendarToObject($uri['id']);
-        if( !self::ownerSchedulable($uri['id']) )
-        {           
+        
+        if( !self::ownerSchedulable($uri['id']) && !self::isAllowDeleteInCalendar($calendarsToSchedulable[0]['calendar_id']))
+        {
+            
              foreach ($calendarsToSchedulable as $i => $v)
              {
@@ -1038 +1040 @@
                 .' AND calendar_to_calendar_object.calendar_object_id = '.addslashes($Schedulable));
     }
-                   
+                
+    protected static function isAllowDeleteInCalendar( $calendar ) {
+         $f = Controller::find(array('concept' => 'calendarToPermission') , false , array('filter' => array('AND' , array('=', 'user' , Config::me('uidNumber') ) , array('=', 'calendar' , $calendar))));       
+         return (strpos($f[0]['acl'], CALENDAR_ACL_REMOVE) === false) ? false : true;        
+    }
+    
 }
 

trunk/prototype/services/PostgreSQL.php

@@ -34 +34 @@
 
     public function delete ( $uri, $justthese = false, $criteria = false ){
+            if(!isset($uri['id']) && !is_int($uri['id'])) return false; //Delete chamado apenas passando id inteiros
             $map = Config::get($uri['concept'], 'PostgreSQL.mapping');
-            if(!self::parseCriteria ( $criteria , $map)) return false; //Validador para não apagar tabela inteira
             $criteria = ($criteria !== false) ? $this->parseCriteria ( $criteria , $map , ' WHERE '.$map['id'].' = \''.addslashes( $uri['id'] ).'\'') : ' WHERE '.$map['id'].' = \''.addslashes( $uri['id'] ).'\'';
             return $this->execSql('DELETE FROM '.(Config::get($uri['concept'],'PostgreSQL.concept')).$criteria);

trunk/prototype/services/iCal.php

@@ -62 +62 @@
                                if($rv)
                                {
-                                   if($ir == 'frequency')
+                                   if($ir == 'frequency' && $rv !== 'none')
                                       $repeat['FREQ'] =  $rv;
                                    else if($ir == 'endTime' )
@@ -76 +76 @@
                                }
                            }
-                          
-                           $vevent->setProperty('rrule' , $repeat);
+                                            
+                           if(isset($repeat['FREQ']))
+                                $vevent->setProperty('rrule' , $repeat);
                        }
                        
@@ -135 +136 @@
                         $isResponseDelegated = false;
                         if(isset($pv['delegatedFrom']) && $pv['delegatedFrom'] == 0){
-                                if($pv['isOrganizer'] == 1)
-                                   $vevent->setProperty( 'organizer' , $pv['user']['mail'], array( 'CN' => $pv['user']['name'] ));  
+                                if($pv['isOrganizer'] == 1){
+                                   if($pv['user']['id'] == Config::me('uidNumber'))
+                                        $pv['user']['mail'] = str_replace('@correiolivre.caixa','@caixa.gov.br',$pv['user']['mail']);                                   
+                                
+                                   $vevent->setProperty( 'organizer' , $pv['user']['mail'], array( 'CN' => $pv['user']['name']));
+                                }
+                                
                                 else
                                 {
@@ -1073 +1079 @@
 }
 ?>
+
+?>