Changeset 1419

Timestamp:

09/17/09 17:39:22 (15 years ago)

Author:

eduardoalex

Message:

Ticket #421 - Ajuste no tratamento do referral para catalogo externo

Location:

trunk/contactcenter/inc

Files:

• class.bo_global_ldap_catalog.inc.php (modified) (5 diffs)
• class.bo_ldap_manager.inc.php (modified) (2 diffs)
• class.ui_data.inc.php (modified) (5 diffs)

trunk/contactcenter/inc/class.bo_global_ldap_catalog.inc.php

@@ -539 +539 @@
                         
                 */
-                function get_single_entry ( $id_contact, $fields )
+                function get_single_entry ( $id_contact, $fields, $external=false )
                 {
                         if (!is_array($fields)) 
@@ -564 +564 @@
                                 return false;
                         }
-                        $id_contact = preg_replace("/dc=(.*)/i",$this->src_info['dn'],$id_contact);
+                        if(!$external)
+                                $id_contact = preg_replace("/dc=(.*)/i",$this->src_info['dn'],$id_contact);
+                        
                         $resource = @ldap_read($ldap, $id_contact, 'objectClass='.$this->src_info['obj']);
                         $n_entries = @ldap_count_entries($ldap, $resource);
@@ -578 +580 @@
                         }
 
-//                      print_r($contact);
+                        
                         
                 //      $contact_data = $this->fields;
@@ -1164 +1166 @@
                 }
                 
-                function get_multiple_entries ( $id_contacts, $fields, $other_data = false )
+                function get_multiple_entries ( $id_contacts, $fields, $other_data = false, $external=false )
                 {
                         if (!is_array($id_contacts) or !is_array($fields) or ($other_data != false and !is_array($other_data)))
@@ -1184 +1186 @@
                         foreach ($id_contacts as $id)
                         {
-                                $contacts[$id] = $this->get_single_entry($id,$fields);
+                                $contacts[$id] = $this->get_single_entry($id,$fields,$external);
                         }
                         

trunk/contactcenter/inc/class.bo_ldap_manager.inc.php

@@ -285 +285 @@
                         include(PHPGW_INCLUDE_ROOT . '/contactcenter/setup/external_catalogs.inc.php' );
                         //include('external_catalogs.inc.php' );
-
+                        
                         if (!$external_srcs[$id_source])
                         {
                                 return null;
                         }
-
+                        
                         // calls test_connection first. If succeeded continue, return error message otherwise.
                         if (!($response = $this->test_connection($external_srcs[$id_source]['host'], $external_srcs[$id_source]['acc'], $external_srcs[$id_source]['pw'], 10)))
@@ -468 +468 @@
                                 // and whose attribute phpgwAccountVisible value is different from -1
                                 $filter = '(&(!(objectClass='.$objectClass.')) (!(phpgwAccountVisible=-1)))';
-                        }
-                        $context = preg_replace("/dc=(.*)/i",$this->srcs[$id_source]['dn'],$context);
+                                $context = preg_replace("/dc=(.*)/i",$this->srcs[$id_source]['dn'],$context);   
+                        }
+                        
                         $result_res = @ldap_list($resource,  $context, $filter, array(), 0, 0);
                         if (!$result_res)

trunk/contactcenter/inc/class.ui_data.inc.php

@@ -484 +484 @@
                                 $parent = substr($level, 0, $last_dot);
                                 $child = substr($level, $last_dot+1, strlen($level));
-                        
                                 if (!($tree[$child] = $this->bo->get_catalog_tree($level)))
                                 {
@@ -1186 +1185 @@
                                 $fields['connections'] = 'default';
                                 // ?aqui alterar a chamada desse método para receber o base dn?
-                                $contacts = &$this->bo->catalog->get_multiple_entries($ids,$fields);
+                                if($external)
+                                        $contacts = &$this->bo->catalog->get_multiple_entries($ids,$fields,false,true);
+                                else
+                                        $contacts = &$this->bo->catalog->get_multiple_entries($ids,$fields);
                                 
                                 
@@ -1206 +1208 @@
                                         if ($index !== 'error'){
                                                 $final[3][$i][0] = $contact['companies']['company1']['company_name']?$contact['companies']['company1']['company_name']:'none';
-                                                $final[3][$i][1] = $contact['names_ordered'] ? urldecode( $contact['names_ordered'] ) : 'none';
+                                                if($this->page_info['actual_catalog']['class']!='bo_global_ldap_catalog'){
+                                                        $final[3][$i][1] = $contact['names_ordered'] ? urldecode($contact['names_ordered'])  : 'none';
+                                                }
+                                                else {
+                                                        $contact['names_ordered'][0] = urldecode($contact['names_ordered'][0]);
+                                                        $final[3][$i][1] = $contact['names_ordered'] ? $contact['names_ordered']  : 'none';
+                                                }
                                                 $final[3][$i][2] = $contact['companies']['company1']['title']? urldecode( $contact['companies']['company1']['title'] ) :'none';
 
@@ -1268 +1276 @@
 
                                                 $final[4][$i] = $contact['photo'] ? 1  : 0;
+                                        //      print_r($final[3][$i]);
+                                        //      exit;
                                                 $i++;
                                         }
@@ -1274 +1284 @@
                                                 // coloca mensagem de erro no vetor que retorna para o browser
                                         }
+                                        
                                 }
                                 $lnk_compose = "location.href=('../expressoMail1_2/index.php?to=";