Changeset 5462

Timestamp:

02/01/12 17:03:25 (12 years ago)

Author:

cristiano

Message:

Ticket #2434 - Corrções no sync com caldav

Location:

trunk/prototype/modules/calendar/interceptors

Files:

• DAViCalAdapter.php (modified) (1 diff)
• DBMapping.php (modified) (2 diffs)

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

@@ -72 +72 @@
         {  
             $args =  Controller::parse( array( 'service' => 'iCal' ) , $data , $params);
-                                 
+            ob_start();                     
             include ROOTPATH.'/Sync.php';
+            ob_end_clean();
         }
         

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

@@ -472 +472 @@
 
     public function findExternalPaticipants( &$uri , &$result , &$criteria , $original ) {   
-        $newuri['concept'] = 'user';
-        $newuri['service'] = 'PostgreSQL';
-       
-        $newCriteria = $original['criteria'];
-        $valid = true;
-
+        if(Config::me('uidNumber'))
+        {
+            $newuri['concept'] = 'user';
+            $newuri['service'] = 'PostgreSQL';
+           
+            $newCriteria = $original['criteria'];
+            $valid = true;
+            
             $newCriteria['filter'] = array('AND',$newCriteria['filter'] , array('=' , 'owner', Config::me('uidNumber')) );        
             $externalUsers = Controller::find( $newuri , $original['properties'] ? $original['properties'] : null , $newCriteria );
-
+            
             if(is_array($externalUsers))
             {
-                foreach ($externalUsers as $i => $v)
+                 foreach ($externalUsers as $i => $v)
                     $externalUsers[$i]['isExternal'] = '1';
             }
@@ -490 +492 @@
 
             if(!is_array($result))
-                    $result = array();
+                $result = array();
 
             return array_merge($result, $externalUsers);    
-        
+        }
        
     }