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

Timestamp:

01/27/12 19:21:30 (12 years ago)

Author:

cristiano

Message:

Ticket #2434 - Atualização modulo agenda e API - Correções de serviços

File:

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

trunk/prototype/services/iCal.php

@@ -482 +482 @@
 
                 /* Verifica se este usuario é um usuario interno do ldap */     
-                $intUser = Controller::find( array( 'concept' => 'user', 'service' => 'OpenLDAP' ) , array('uidNumber') ,array( 'filter' => array('OR' , array('=' , 'mail' ,  $mailUser ), array('=' , 'mailAlternateAddress' ,  $mailUser ) )) ); 
-
-                if( !is_array($intUser) || count($intUser) < 1 )
-                     $intUser = Controller::find( array( 'concept' => 'user' ,'service' => 'PostgreSQL') , array('uidNumber') ,array( 'filter' => array('=' , 'mail' ,  $mailUser )) ); 
-
+                 $intUser = Controller::find( array( 'concept' => 'user' ) , array('id','isExternal') ,array( 'filter' => array('OR' , array('=' , 'mail' ,  $mailUser ), array('=' , 'mailAlternateAddress' ,  $mailUser ) )) ); 
 
                 $user = null;    
                 if( $intUser && count($intUser) > 0 )
                 {
-                    $participant['isExternal']  = 0;
+                    $participant['isExternal']  = isset($intUser[0]['isExternal']) ? $intUser[0]['isExternal'] : 0;
                     $participant['user'] = $intUser[0]['id'];
                 }
@@ -525 +521 @@
 
                 /* Verifica se este usuario é um usuario interno do ldap */     
-                $intUser = Controller::find( array( 'concept' => 'user' ,'service' => 'OpenLDAP') , array('uidNumber') ,array( 'filter' => array('OR' , array('=' , 'mail' ,  $mailUser ), array('=' , 'mailAlternateAddress' ,  $mailUser ) )) ); 
-
-                if( !is_array($intUser) || count($intUser) < 1 )
-                     $intUser = Controller::find( array( 'concept' => 'user' ,'service' => 'PostgreSQL') , array('uidNumber') ,array( 'filter' => array('=' , 'mail' ,  $mailUser )) ); 
-
+                $intUser = Controller::find( array( 'concept' => 'user' ) , array('id','isExternal') ,array( 'filter' => array('OR' , array('=' , 'mail' ,  $mailUser ), array('=' , 'mailAlternateAddress' ,  $mailUser ) )) ); 
+      
                 $user = null;    
                 if( $intUser && count($intUser) > 0 )
                 {
-                    $participant['isExternal']  = 0;
+                    $participant['isExternal']  = isset($intUser[0]['isExternal']) ? $intUser[0]['isExternal'] : 0;
                     $participant['user'] = $intUser[0]['id'];
                 }