Changeset 5641 for trunk/prototype/modules/calendar/interceptors/DBMapping.php

Timestamp:

03/06/12 14:28:15 (12 years ago)

Author:

acoutinho

Message:

Ticket #2434 - Correcao de bugs e melhorias no modulo expressoCalendar

File:

• trunk/prototype/modules/calendar/interceptors/DBMapping.php (modified) (5 diffs)

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

@@ -130 +130 @@
                         if(!is_numeric($params['startTime']) )
                                 $params['startTime'] =  strtotime( $params['startTime'] . ' ' .$event['timezone']).'000';
-                        else
-                                $params['rangeStart'] = $params['startTime'] ;
+                        
+                        $params['rangeStart'] = $params['startTime'] ;
                    
                 }if(isset($params['endTime'])){
@@ -137 +137 @@
                         if (!is_numeric($params['endTime']))
                                 $params['endTime'] =   strtotime( $params['endTime'] . ' ' .$event['timezone']).'000';
-                        else
-                                $params['rangeEnd'] = $params['endTime'] ;       
+                        
+                        $params['rangeEnd'] = $params['endTime'] ;       
                                 
                 }    
@@ -376 +376 @@
      //TODO: Remover apos suporte a deepness na api 
     public function deepnessFindCalendarSignature( &$uri , &$result , &$criteria , $original ){         
-       
-      if(isset($original['criteria']['deepness']))
+
+        if(isset($original['criteria']['deepness']))
        {
            foreach ($result as $i => $v)
            {
                 if(isset($v['calendar'])){
-                    $result[$i]['calendar'] = Controller::read( array( 'concept' => 'calendar' , 'id' => $v['calendar'])); 
+                    $result[$i]['calendar'] = Controller::read( array( 'concept' => 'calendar' , 'id' => $v['calendar']), false, false); 
                                         $result[$i]['defaultAlarms'] = Controller::find( array( 'concept' => 'calendarSignatureAlarm' ) , false ,array( 'filter' => array('=', 'calendarSignature'  ,  $v['id']) ));    
                                         //Caso não seja o dono da agenda retorna o objeto permission com as acls
@@ -388 +388 @@
                                                 $permission = Controller::find( array( 'concept' => 'calendarToPermission'), false ,array( 'filter' => array('AND', array('=', 'calendar' ,  $v['calendar']), array('=', 'user', Config::me('uidNumber') ) ) ) ); 
 
-                                                
-        
-                                                
                                                 if(!is_array($permission) || !$permission  ){
-                                                        ob_start();
-                                                        var_dump($permission);
-                                                        
-                                                        $output = ob_get_clean();
-                                                        file_put_contents( "/tmp/acoutinho.log",  $output , FILE_APPEND);
+
                                                         $permission = Controller::find( array( 'concept' => 'calendarToPermission'), false ,array( 'filter' => array('AND', array('=', 'calendar' ,  $v['calendar']), array('=', 'type', '1' ) ) ) );    
-                                                        
-                                                        ob_start();
-                                                var_dump($permission);
-                                                
-                                                $output = ob_get_clean();
-                                                file_put_contents( "/tmp/acoutinho.log",  $output , FILE_APPEND);
-                                                        
+
                                                 }
                                                 $result[$i]['permission'] = $permission[0];
@@ -410 +397 @@
                                 }
            }
-       }
-       
+       }       
    } 
 //Decode Find