Changeset 1419 for trunk/contactcenter/inc/class.ui_data.inc.php

Timestamp:

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

Author:

eduardoalex

Message:

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

File:

• trunk/contactcenter/inc/class.ui_data.inc.php (modified) (5 diffs)

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=";